From f2c1e10b8ac3531ab5a48e23c23b702cd24b3f73 Mon Sep 17 00:00:00 2001 From: Konstantin Menyaev Date: Wed, 1 Feb 2023 09:00:01 +0300 Subject: [PATCH 0001/2890] package/tinyalsa: add option to enable utility tools Add option to enable useful tools, like tinyplay, tinymix, etc. Signed-off-by: Konstantin Menyaev Signed-off-by: Thomas Petazzoni --- package/tinyalsa/Config.in | 9 +++++++++ package/tinyalsa/tinyalsa.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/tinyalsa/Config.in b/package/tinyalsa/Config.in index d9ce22c8a7fd..b4d4aeb276d9 100644 --- a/package/tinyalsa/Config.in +++ b/package/tinyalsa/Config.in @@ -13,5 +13,14 @@ config BR2_PACKAGE_TINYALSA https://github.com/tinyalsa/tinyalsa +if BR2_PACKAGE_TINYALSA + +config BR2_PACKAGE_TINYALSA_TOOLS + bool "tinyalsa tools" + help + Build utility tools (tinyplay, tinycap, tinymix, tinypcminfo) + +endif #BR2_PACKAGE_TINYALSA + comment "tinyalsa needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index b5c39e35d665..fe6d373ec81a 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -9,6 +9,12 @@ TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3-Clause TINYALSA_LICENSE_FILES = NOTICE TINYALSA_INSTALL_STAGING = YES -TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled + +ifeq ($(BR2_PACKAGE_TINYALSA_TOOLS),y) +TINYALSA_CONF_OPTS += -Dutils=enabled +else +TINYALSA_CONF_OPTS += -Dutils=disabled +endif $(eval $(meson-package)) From cc0d6bdd66e477ee0e3de0538e37d49bdfd7a9e6 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 15 Feb 2023 14:47:12 -0800 Subject: [PATCH 0002/2890] package/openjdk{-bin}: bump versions to 11.0.18+10 and 17.0.6+10 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- ...ARCv2-ISA-processors-support-to-Zero.patch | 20 +++++++++---------- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) rename package/openjdk/{17.0.1+12 => 17.0.6+10}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (83%) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 4d3942125f61..241ca34a0437 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,10 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48 OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz -sha256 302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz +sha256 a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289 OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz +sha256 9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz -sha256 79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz +sha256 4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz +sha256 04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 608a0bc3ac1f..c3eb0b05e60f 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_8 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.6_10 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.14.1_1 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.18_10 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 83% rename from package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 1ef523a41962..dfd3b07beac7 100644 --- a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 5120918aed2..f7a99955874 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644 arm*) VAR_CPU=arm VAR_CPU_ARCH=arm -@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], +@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], HOTSPOT_$1_CPU_DEFINE=PPC64 # The cpu defines below are for zero, we don't support them directly. @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { - static Elf32_Half running_arch_code=EM_RISCV; +@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 293787792d73..0a67e7a3ecc1 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz -sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz +sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz +sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 42d52d57c479..0fe506bbfd05 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.2+8 +OPENJDK_VERSION_MINOR = 0.6+10 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.14.1+1 +OPENJDK_VERSION_MINOR = 0.18+10 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) From 4d7f902eb127eb9dd1334cda04a2008d14945a7d Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 15 Feb 2023 21:09:01 +0100 Subject: [PATCH 0003/2890] configs/bananapi_m2_ultra_defconfig: bump Linux to 6.1 and U-Boot to 2023.01 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/bananapi_m2_ultra_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 2ec0e60e8d77..0f267021f8c7 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Ultra" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-ultra/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-r40-bananapi-m2-ultra" @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 60ab36a931f5d88cccb08575076e68d5e3757ae9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 15 Feb 2023 21:09:02 +0100 Subject: [PATCH 0004/2890] DEVELOPERS: add Giulio Benetti as maintainer for board bananapi-m2-ultra Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2eff5b23efc7..caa73698f958 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1135,9 +1135,11 @@ F: package/webp/ F: package/xapian/ N: Giulio Benetti +F: board/bananapi/bananapi-m2-ultra/ F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig +F: configs/bananapi_m2_ultra_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ From 497e60a2fa7e11644a41cf4a9441f7fde6c782ac Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 16 Feb 2023 22:25:51 +0100 Subject: [PATCH 0005/2890] configs/imx6ullevk_defconfig: bump Linux to 6.1.12 and U-Boot to 2023.01 Let's also reorder BR2_UBOOT_ options by moving BR2_TARGET_UBOOT_FORMAT_DTB_IMX after BR2_TARGET_UBOOT_NEEDS_OPENSSL since this reflects the order in boot/uboot/Config.in file. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/imx6ullevk_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/imx6ullevk_defconfig b/configs/imx6ullevk_defconfig index c6e2981697f2..b507d1c0d61f 100644 --- a/configs/imx6ullevk_defconfig +++ b/configs/imx6ullevk_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -22,10 +22,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From 9e09ac2c02d1ff8d3872ebc72e915e9baa7fbd0d Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 16 Feb 2023 22:25:52 +0100 Subject: [PATCH 0006/2890] configs/freescale_imx6ullevk_defconfig: bump Linux and U-Boot to lf-5.15.71-2.2.0 Let's also enable BR2_TARGET_UBOOT_NEEDS_OPENSSL required by uboot to build correctly. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/freescale_imx6ullevk_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index 7a8965be18e2..db4fa69f7164 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.15.71-2.2.0)/linux-imx-lf-5.15.71-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -15,8 +15,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.15.71-2.2.0)/uboot-imx-lf-5.15.71-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y From 1d7dd1b79145a34f861d30d09750f6e988e10fd5 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 16 Feb 2023 22:25:53 +0100 Subject: [PATCH 0007/2890] DEVELOPERS: add Giulio Benetti to board imx6ullevk for both mainline and NXP(Freescale) versions Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index caa73698f958..599cfe68864b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1136,10 +1136,13 @@ F: package/xapian/ N: Giulio Benetti F: board/bananapi/bananapi-m2-ultra/ +F: board/freescale/imx6ullevk/ F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig F: configs/bananapi_m2_ultra_defconfig +F: configs/freescale_imx6ullevk_defconfig +F: configs/imx6ullevk_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ From 792f1975175cb995600f7e3ac092fc3c741aa096 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 20 Feb 2023 18:22:38 -0700 Subject: [PATCH 0008/2890] package/{rust, rust-bin}: bump to version 1.67.1 Link to Rust 1.67.1 announcement: https://blog.rust-lang.org/2023/02/09/Rust-1.67.1.html Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 252 +++++++++--------- package/rust-bin/rust-bin.mk | 2 +- ...-unsoundness-in-bootstrap-cache-code.patch | 43 --- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 5 files changed, 131 insertions(+), 174 deletions(-) delete mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d00e6342e806..11cfae5e9b1d 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc -sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc -sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc -sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b7b8e8b70cae457092661894efa5a4861ef4f0e20f2f617d05d6f17b1f780a68 rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b686a2d0d1648e1b84def715dd65a85a3d2802b33ecf65808bdb2ed639aec7d3 rust-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c9df968487707eb63207f63086daed4fe1484829fb6221bd9414de2700424995 rust-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 4f56194a354b1413fb973d25f1c895aaa8e85211d316755508d6848e3a4fe18b rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 852e5a714ea8d2737f2cd5b0d6a12ecfa712b75238c643ba8138b490fc39fc43 rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0a5bc85383d5d9d077dccaad1fb213d9498b6137112aaaabced6eb079fe12c9e rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 574851ff8503df9cb0dd04e6a1cd0ce5d709b5ea8b9c1265b314b9e182c818da rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 50e98fefef58218bd2c09c826308d43abe11b05f528b08ecca3d2657d7996630 rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 6e8629ace0c1b9cc0c2bc6225e6716df852370e5c7e907815ff8e6241e427699 rust-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 7dbb718bdb09adad7e36b9a413e571863913682495527f7f2d6507ea2c068542 rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 35027409400faaaa38ea2855b92dea6b553b2e656dff735da730f67ac02e57e6 rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 dcd3926c151cdd33d4de2860f021c86a18556809c4d06cbddebc1b377638710a rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 da42d5b07984dac9a41719511eeb47cbb6c5e70b32a6eacba96c9f860ced0307 rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 3b95c9595db3e10077c4eca8f63d80414bf3a50c1f0f6b2ac33f1992ee0940db rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 767761d99846174dfb7dfb579e2e2be63800478858a82f3f7050cc9555209a89 rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 1e53306124de9f282452bd6085e86918e5e9f6f1940fc79809a1b284272e2d2b rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 3e8bb4265c8c6d8984b69eeefe015131ea140148a58179b3abec5653d93bea7d rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 cbfce327b623e341c1243f0d29ef2f60e5fb205d406c79eb8be1433652c3c9a5 rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 b6d00c4e338744ce1bf5b314f1056472acf1eb416f65057a8b3ca0a992fb04df rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 8a7e46b15adb0718b4e4ee33cd46529117411e8d73c29043778b05e7412c2b46 rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 6102f98617dd37874f3d755d0a325b45d47c6e1715c39d5e9bc037992e4d3cd6 rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 720958bc039c9ff00e7e399adf45f044484c5695a71bde0d07e0c895a819fe74 rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 22cbbf0b22d9b0894cfbd6e1dd6b95b71c7ad02cee4e477d375dcf81af8d1337 rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.asc +sha256 49beb678732f34a0bfc22f94900c3d4a17ec05effdb7377864042df73b2a2819 rust-std-1.67.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409 rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.asc +sha256 a2c6e55a8a2987d0c306d2c164347a70ab7a6a18f6562039a772b33e25934972 rust-std-1.67.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 048b3da190212b742f7a052618b57683dc96ee2b6c25fc7f5ae751143cb79bad rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.asc +sha256 b9ef413b764a92d42e07a2e588268ece09994d2cd1ab2a93858c27f85a250349 rust-std-1.67.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 ef7fe3160de629f0d38788f2c270f87b0631480e5b0d848595b460528de719e4 rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 15fdb3e8b39c8a122e9beee0c4c909ee8ec356e57aaaaae5f2b9e94f58d73c87 rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 6ccfd98fd920cc2f1199bcf9a842430c27f6fcd2cc46c18421e487309ff7811e rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 78477c45f5b848b156adaf0e0f6f2954ae73e2903321d1636c155020175eaaf5 rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 94410897626546dde806a114299c3c32abb6b4b294af5daea5c4d136751fe063 rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 b3f1a338e69428f1611f059c67b8afafa78ce5c7ed0799f8a90795390261d3a4 rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 26efe78c09ed36da34964c0d023cf9aa404766ab790a94d9becd373b8879cb5a rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 135f5e6ab6d8f077a14521d387d3f31831abdb840ca4e6a15b6f0d0d5b7dbc81 rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 364c47ed22e4268edf238d221c40007d7d8792a66ca325d3937596a9c911ea48 rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 63a7e6a6c889a3d01bb3c66a3def3e41963511ea52e13906669da5b29b2fd9da rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 04573298d9e815c1e8c47a2f9548ea55d4a2afc538eceaa6a704d44a5e1f7e3e rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 addf0b0beb1966787e599f32849f18c28d5cb65515272b7d9608d4a1dddee2e7 rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9 rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 89741cd2ac00c3a3f565bcccdf442cc1f9ec58ea419f1f0d09e911be0ff86c87 rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index d62ce39cfccf..bb66de5ec59d 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.67.0 +RUST_BIN_VERSION = 1.67.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch deleted file mode 100644 index 3eae34642fdc..000000000000 --- a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 -From: Michael Goulet -Date: Mon, 12 Dec 2022 18:29:33 +0000 -Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= - =?UTF-8?q?ap=20cache=20code?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) -Signed-off-by: Sebastian Weyer ---- - src/bootstrap/cache.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs -index be5c9bb0788..05f25af68ea 100644 ---- a/src/bootstrap/cache.rs -+++ b/src/bootstrap/cache.rs -@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { - - impl Deref for Interned { - type Target = T::Target; -- fn deref(&self) -> &'static Self::Target { -+ fn deref(&self) -> &Self::Target { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } -+ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } - } - } - - impl, U: ?Sized> AsRef for Interned { -- fn as_ref(&self) -> &'static U { -+ fn as_ref(&self) -> &U { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } -+ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } - } - } - --- -2.25.1 - diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 2a260ca64fe0..1b4b08ceccd4 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc -sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.asc +sha256 77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682 rustc-1.67.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d14ad3a3e784..814a3c1dd43a 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.67.0 +RUST_VERSION = 1.67.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From 6a789cd0d1badf7f68749b304f7b2e3d9f9ca2c2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 21 Feb 2023 00:42:00 +0100 Subject: [PATCH 0009/2890] package/highway: bump to version 1.0.3 - Dropped patch upstreamed in: https://github.com/google/highway/commit/1cab22047a6ef750ef2bc38ad47d6e765d6d376a - Add an upstream patch, not in 1.0.3 release: https://github.com/google/highway/commit/411300d0eec10d5635cbdd064299630c507348e1 - Add a new patch, to fix armv7 builds with vfp < v4. Proposed upstream in: https://github.com/google/highway/pull/1143 - Add a comment about -DHWY_CMAKE_ARM7=OFF since the name is a bit misleading. It should better be ARMV7 or ARMV7_VFPV4. For change log since 1.0.2, see: - https://github.com/google/highway/releases/tag/1.0.3 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...Check-for-the-presence-of-sys-auxv.h.patch | 62 --------- ...Fix-compilation-for-armv7-with-gcc-8.patch | 46 +++++++ ...for-armv7-targets-with-vfp-v4-and-gc.patch | 118 ++++++++++++++++++ package/highway/highway.hash | 2 +- package/highway/highway.mk | 5 +- 5 files changed, 169 insertions(+), 64 deletions(-) delete mode 100644 package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch create mode 100644 package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch create mode 100644 package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch deleted file mode 100644 index df8679861352..000000000000 --- a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Wed, 23 Nov 2022 23:27:11 +0100 -Subject: [PATCH] Check for the presence of - -Not all gcc versions are providing . Checking for -HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not -sufficient and fail to build in some situations (it was observed for -some gcc armv7m toolchains). - -This patch adds a check for and include it only if present. - -Signed-off-by: Julien Olivain ---- - CMakeLists.txt | 3 +++ - hwy/detect_targets.h | 2 +- - hwy/targets.cc | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6b14ab..df6b5ab 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,6 +84,9 @@ check_cxx_source_compiles( - HWY_RISCV - ) - -+include(CheckIncludeFile) -+check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) -+ - if (HWY_ENABLE_CONTRIB) - # Glob all the traits so we don't need to modify this file when adding - # additional special cases. -diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h -index 7f7e179..f0c6f94 100644 ---- a/hwy/detect_targets.h -+++ b/hwy/detect_targets.h -@@ -392,7 +392,7 @@ - #define HWY_HAVE_RUNTIME_DISPATCH 1 - // On Arm, currently only GCC does, and we require Linux to detect CPU - // capabilities. --#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #define HWY_HAVE_RUNTIME_DISPATCH 1 - #else - #define HWY_HAVE_RUNTIME_DISPATCH 0 -diff --git a/hwy/targets.cc b/hwy/targets.cc -index 2fde4db..abd6a94 100644 ---- a/hwy/targets.cc -+++ b/hwy/targets.cc -@@ -42,7 +42,7 @@ - #include - #endif // HWY_COMPILER_MSVC - --#elif HWY_ARCH_ARM && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #include - #include - #endif // HWY_ARCH_* --- -2.38.1 - diff --git a/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch new file mode 100644 index 000000000000..0634460453a2 --- /dev/null +++ b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch @@ -0,0 +1,46 @@ +From 94cda9cc8cd12345a6dbe70e40f3119d5bf7ee78 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:25:36 +0100 +Subject: [PATCH] Fix compilation for armv7 with gcc < 8 + +Highway uses the construct __attribute__((target(+neon-vfpv4)) for +Armv7. The target "+neon-vfpv4" was introduced in gcc 8, in commit [1]. +When using a gcc < 8 (for example, like [2]), compilation fails with +message: + + In file included from /build/highway-1.0.3/hwy/foreach_target.h:81:0, + from /build/highway-1.0.3/hwy/per_target.cc:20: + /build/highway-1.0.3/hwy/per_target.cc: At global scope: + /build/highway-1.0.3/hwy/per_target.cc:23:22: error: attribute(target("+neon-vfpv4")) is unknown + +This commit protects the definition of HWY_TARGET_STR only when gcc +version 8 or greater is used for armv7. + +[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e87afe54b86c478ae63569e51e7abb67d3fe3fce +[2] https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/arm-linux-gnueabihf/gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz + +Signed-off-by: Julien Olivain +--- + hwy/ops/set_macros-inl.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hwy/ops/set_macros-inl.h b/hwy/ops/set_macros-inl.h +index 051dbb3..00b4b1b 100644 +--- a/hwy/ops/set_macros-inl.h ++++ b/hwy/ops/set_macros-inl.h +@@ -230,7 +230,12 @@ + // Can use pragmas instead of -march compiler flag + #if HWY_HAVE_RUNTIME_DISPATCH + #if HWY_ARCH_ARM_V7 ++#if HWY_COMPILER_GCC_ACTUAL >= 800 ++// The __attribute__((target(+neon-vfpv4)) was introduced in gcc >= 8. ++// In case we have a gcc < 8, we can still compile by keeping ++// HWY_TARGET_STR undefined. + #define HWY_TARGET_STR "+neon-vfpv4" ++#endif + #else + #define HWY_TARGET_STR "+crypto" + #endif // HWY_ARCH_ARM_V7 +-- +2.39.2 + diff --git a/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch new file mode 100644 index 000000000000..f29b385501ae --- /dev/null +++ b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch @@ -0,0 +1,118 @@ +From 93d4579f90dd6ad26fd0dcda6420b3bb2fdcbc02 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Mon, 20 Feb 2023 23:22:28 +0100 +Subject: [PATCH] Fix compilation for armv7 targets with vfp < v4 and gcc >= 8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using a armv7 gcc >= 8 toolchain (like [1]) with Highway +configured with -DHWY_CMAKE_ARM7=OFF and HWY_ENABLE_CONTRIB=ON, +compilation fails with error: + + In file included from /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:33, + from /build/highway-1.0.3/hwy/highway.h:358, + from /build/highway-1.0.3/hwy/contrib/sort/shared-inl.h:104, + from /build/highway-1.0.3/hwy/contrib/sort/traits128-inl.h:27, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:23, + from /build/highway-1.0.3/hwy/foreach_target.h:81, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:20: + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h: In function 'void hwy::N_NEON::StoreU(Vec128, Full128, uint64_t*)': + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h:11052:1: error: inlining failed in call to 'always_inline' 'void vst1q_u64(uint64_t*, uint64x2_t)': target specific option mismatch + 11052 | vst1q_u64 (uint64_t * __a, uint64x2_t __b) + | ^~~~~~~~~ + /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:2786:12: note: called from here + 2786 | vst1q_u64(unaligned, v.raw); + | ~~~~~~~~~^~~~~~~~~~~~~~~~~~ + +The same errors happen when configured with HWY_ENABLE_EXAMPLES=ON, +or from client libraries like libjxl (at other places). + +The issue is that Highway Arm NEON ops have a dependency on the +Advanced SIMD (Neon) v2 and the VFPv4 floating-point instructions. +The SIMD (Neon) v1 and VFPv3 instructions are not supported. + +There was several attempts to fix variants of this issues. +See #834 and #1032. + +HWY_NEON target is selected only if __ARM_NEON is defined. See: +https://github.com/google/highway/blob/1.0.3/hwy/detect_targets.h#L251 + +This test is not sufficient since __ARM_NEON will be predefined in +any cases when Neon is enabled (neon-vfpv3, neon-vfpv4). + +The issue is that HWY_CMAKE_ARM7=ON implies VFPv4 / NEON SIMD v2. +When setting HWY_CMAKE_ARM7=OFF, "neon-vfpv4" will not be forced, +but the code is still using intrinsics assuming VFPv4. Gcc will fail +with error because code cannot be generated for the selected +architecture. + +This issue can be avoided by adding "-DHWY_DISABLED_TARGETS=HWY_NEON" in +CXXFLAGS. The problem with this solution is that every client program will +also need to do the same. This goes against the very purpose of +"hwy/detect_targets.h". + +Technically, Armv7-a processors with VFPv4 can be detected using some +ACLE (Arm C Language Extensions [2]) predefined macros: + +Basically, we want Highway to define HWY_NEON only when the target +supports SIMDv2/VFPv4 or higher. An older target with vfpv3 only +(e.g. Cortex-A8, A9, ...) would NOT define HWY_NEON, and therefore +would fallback on HWY_SCALAR implementation. + +However, not all compiler completely support ACLE. There is also +several versions too. So we cannot easily rely on macros like +"__ARM_VFPV4__" (which clang predefine, but not gcc). + +The alternative solution proposed in this patch, is to declare the +HWY_NEON target architecture as broken, when we detect the target is +Armv7-A, but mandatory features for vfpv4 (namely half-float, FMA) +are missing. Half-floats are tested using the macro __ARM_NEON_FP, +and the FMA with the macro __ARM_FEATURE_FMA. See ACLE [2]. The +intent of declaring the target as broken, rather than selecting +HWY_NEON only if vfpv4 features are detected is to remain a bit +conservative, since the detection is slithly inaccurate. + +For a given compiler/cflags, predefined macros for Arm/ACLE can be +reviewed with commands like: + + arm-linux-gnueabihf-gcc -mcpu=cortex-a9 -mfpu=neon-vfpv3 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + arm-linux-gnueabihf-gcc -mcpu=cortex-a7 -mfpu=neon-vfpv4 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a9 -mfpu=neon-vfpv3 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + +The different values of __ARM_NEON_FP can be seen, depending which +"-mfpu" is passed. Same for __ARM_FEATURE_FMA. + +[1] https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2022.08-1.tar.bz2 +[2] https://github.com/ARM-software/acle/ + +Signed-off-by: Julien Olivain +--- + hwy/detect_targets.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h +index 2beca95..40ae7fe 100644 +--- a/hwy/detect_targets.h ++++ b/hwy/detect_targets.h +@@ -154,6 +154,16 @@ + (defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN)) + #define HWY_BROKEN_TARGETS (HWY_NEON) + ++// armv7-a without a detected vfpv4 is not supported ++// (for example Cortex-A8, Cortex-A9) ++// vfpv4 always have neon half-float _and_ FMA. ++#elif HWY_ARCH_ARM_V7 && \ ++ (__ARM_ARCH_PROFILE == 'A') && \ ++ !defined(__ARM_VFPV4__) && \ ++ !((__ARM_NEON_FP & 0x2 /* half-float */) && \ ++ (__ARM_FEATURE_FMA == 1)) ++#define HWY_BROKEN_TARGETS (HWY_NEON) ++ + // SVE[2] require recent clang or gcc versions. + #elif (HWY_COMPILER_CLANG && HWY_COMPILER_CLANG < 1100) || \ + (HWY_COMPILER_GCC_ACTUAL && HWY_COMPILER_GCC_ACTUAL < 1000) +-- +2.39.2 + diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 3ff468443e06..16a928217666 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e highway-1.0.3.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk index ed7f6ca8713f..56d63a83f94e 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.2 +HIGHWAY_VERSION = 1.0.3 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 HIGHWAY_LICENSE_FILES = LICENSE @@ -35,6 +35,9 @@ endif ifeq ($(BR2_ARM_FPU_VFPV4),y) HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON else +# Highway Armv7 Neon support requires in fact vfpv4 / neon v2. When we +# are in a vfpv3 case (e.g. Cortex-A8, Cortex-A9) this flag need to be +# set to off. HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF endif From 3927054736881e5807b86fe9b1e5b275d941d6fd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 20 Feb 2023 20:25:34 +0100 Subject: [PATCH 0010/2890] package/kodi-pvr-iptvsimple: bump version to 19.3.0-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 47dd2022588f..de71703c53fc 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 57710d3add72301d47a9eef016916ee5f61b7b8604c73450d67b9ba962eff60c kodi-pvr-iptvsimple-19.2.2-Matrix.tar.gz +sha256 421a883054dd31ad512866236c364e5a564d7db9fa595dadc3e37b9169b7fe79 kodi-pvr-iptvsimple-19.3.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 5b91c35c0c63..e5976a7d3a00 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.2.2-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.3.0-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md From 6ab0431b70e3d963ff3bbc8f10a1871d9f628789 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 20 Feb 2023 20:18:22 +0100 Subject: [PATCH 0011/2890] package/{mesa3d, mesa3d-headers}: bump version to 22.3.5 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 9177adceda5b..ad1999a30dc9 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 22.3.4 +MESA3D_HEADERS_VERSION = 22.3.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e4de997f0ec4..50c5bcc7fc6b 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html -sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz -sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.html +sha256 3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9 mesa-22.3.5.tar.xz +sha512 a4cad9b7e6501678fac279bd88a37e522633c7128afa8df04982f469c930e3557bb1d05b4b0f5ae16704d8d04e50c90a7489943a48861df17dd947704c329b85 mesa-22.3.5.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index cf2352a355f9..1e919d73f2f1 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 22.3.4 +MESA3D_VERSION = 22.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 07634619d9738154e46e9b309d0697d223639167 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 19 Feb 2023 23:20:47 +0100 Subject: [PATCH 0012/2890] package/ssdp-responder: bump to v2.0 ChangeLog: - https://github.com/troglobit/ssdp-responder/releases/tag/v2.0 - https://github.com/troglobit/ssdp-responder/blob/v2.0/ChangeLog.md Critical Fixes: - Fix periodic busy loop causing intermittent 100% CPU load - Fix invalid uuid:uuid:... in description.xml (dup uuid:) Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/ssdp-responder/ssdp-responder.hash | 2 +- package/ssdp-responder/ssdp-responder.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.hash b/package/ssdp-responder/ssdp-responder.hash index 425ad86e08a9..8b4f3e4e4528 100644 --- a/package/ssdp-responder/ssdp-responder.hash +++ b/package/ssdp-responder/ssdp-responder.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 974c244abd4ba8c87532867a84756182a1460c99072ffb1eb91c5a1f73311d89 ssdp-responder-1.9.tar.gz +sha256 d8888f2ac59febfb3b2473a1402041014052ad4dc1eeb4168c78aeca1692aae3 ssdp-responder-2.0.tar.gz sha256 68d6fdc22e337f725fe719bf9ae6d92b1d8d0ca4cff8219b303ab76706670a8d LICENSE diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 519396690818..20e72193861a 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSDP_RESPONDER_VERSION = 1.9 +SSDP_RESPONDER_VERSION = 2.0 SSDP_RESPONDER_SITE = https://github.com/troglobit/ssdp-responder/releases/download/v$(SSDP_RESPONDER_VERSION) SSDP_RESPONDER_LICENSE = ISC SSDP_RESPONDER_LICENSE_FILES = LICENSE From a86bbb4ae4a6f5580e4cbfad8ecf8ebf81b6e053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 16 Feb 2023 11:07:50 +0100 Subject: [PATCH 0013/2890] configs/qemu_arm_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and follow CONFIG_SYS_TEXT_BASE renaming. Signed-off-by: Vincent Stehlé Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- board/qemu/arm-ebbr/u-boot.fragment | 2 +- configs/qemu_arm_ebbr_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/arm-ebbr/u-boot.fragment b/board/qemu/arm-ebbr/u-boot.fragment index bfc382cde902..66fe910f169a 100644 --- a/board/qemu/arm-ebbr/u-boot.fragment +++ b/board/qemu/arm-ebbr/u-boot.fragment @@ -31,5 +31,5 @@ CONFIG_PARTITION_TYPE_GUID=y CONFIG_RNG_OPTEE=y CONFIG_RTC_EMULATION=y CONFIG_SCMI_FIRMWARE=y -CONFIG_SYS_TEXT_BASE=0x60000000 CONFIG_TEE=y +CONFIG_TEXT_BASE=0x60000000 diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index f3e2d42a54b5..8fbb3069bc6e 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" @@ -42,7 +42,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 2215548546af47f3cfce89a15bfc31f736cd74bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 16 Feb 2023 11:07:51 +0100 Subject: [PATCH 0014/2890] configs/qemu_aarch64_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and rename config fragment to make it clearer that it is not a complete config file. Signed-off-by: Vincent Stehlé Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- .../qemu/aarch64-ebbr/{u-boot.config => u-boot.fragment} | 0 configs/qemu_aarch64_ebbr_defconfig | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename board/qemu/aarch64-ebbr/{u-boot.config => u-boot.fragment} (100%) diff --git a/board/qemu/aarch64-ebbr/u-boot.config b/board/qemu/aarch64-ebbr/u-boot.fragment similarity index 100% rename from board/qemu/aarch64-ebbr/u-boot.config rename to board/qemu/aarch64-ebbr/u-boot.fragment diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index d293ad0e6083..e3157089a972 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -39,9 +39,9 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.config" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Host tools From e464dc4033d0437c337e8cf0998a95c9deeeee12 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Thu, 16 Feb 2023 09:47:13 +0100 Subject: [PATCH 0015/2890] package/zstd: bump to version 1.5.4 The LICENSE text has changed, nominally the copyright owner changed from "Facebook" to "Meta Platforms, Inc. and affiliates", reflecting the name change of that company. Add upstream patch to fix zstd-dll build. Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- ...-dll-build-missing-dependencies-3496.patch | 321 ++++++++++++++++++ package/zstd/zstd.hash | 6 +- package/zstd/zstd.mk | 2 +- 3 files changed, 325 insertions(+), 4 deletions(-) create mode 100644 package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch diff --git a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch new file mode 100644 index 000000000000..60737159c6f9 --- /dev/null +++ b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch @@ -0,0 +1,321 @@ +From e47c7c0d5a923dcdc3b302f9944eb4a70b7ee0be Mon Sep 17 00:00:00 2001 +From: Yonatan Komornik <11005061+yoniko@users.noreply.github.com> +Date: Sun, 12 Feb 2023 12:32:31 -0800 +Subject: [PATCH] Fix zstd-dll build missing dependencies (#3496) + +* Fixes zstd-dll build (https://github.com/facebook/zstd/issues/3492): +- Adds pool.o and threading.o dependency to the zstd-dll target +- Moves custom allocation functions into header to avoid needing to add dependency on common.o +- Adds test target for zstd-dll +- Adds github workflow that buildis zstd-dll + +[nolange79: backport from upstream c78f434aa4f5f1097c8edb975f4c1635817a5a71] +Signed-off-by: Norbert Lange +--- + .github/workflows/dev-short-tests.yml | 9 +++- + contrib/linux-kernel/zstd_common_module.c | 3 -- + lib/common/allocations.h | 55 +++++++++++++++++++++++ + lib/common/pool.c | 2 +- + lib/common/zstd_common.c | 35 --------------- + lib/common/zstd_internal.h | 5 --- + lib/compress/zstd_compress.c | 1 + + lib/compress/zstd_cwksp.h | 1 + + lib/compress/zstdmt_compress.c | 1 + + lib/decompress/zstd_ddict.c | 1 + + lib/decompress/zstd_decompress.c | 1 + + programs/Makefile | 2 +- + tests/Makefile | 8 +++- + 13 files changed, 76 insertions(+), 48 deletions(-) + create mode 100644 lib/common/allocations.h + +diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml +index 132dbb99..3ae2e9da 100644 +--- a/.github/workflows/dev-short-tests.yml ++++ b/.github/workflows/dev-short-tests.yml +@@ -55,6 +55,14 @@ jobs: + run: | + make c89build V=1 + ++ build-zstd-dll: ++ runs-on: ubuntu-latest ++ steps: ++ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3 ++ - name: build zstd bin against a dynamic lib (debuglevel for more dependencies) ++ run: | ++ make -C lib lib-mt-release ++ DEBUGLEVEL=2 make -C programs zstd-dll + + gcc-7-libzstd: + runs-on: ubuntu-latest +@@ -328,7 +336,6 @@ jobs: + make -j -C programs allVariants MOREFLAGS=-O0 + ./tests/test-variants.sh + +- + qemu-consistency: + name: QEMU ${{ matrix.name }} + runs-on: ubuntu-20.04 +diff --git a/contrib/linux-kernel/zstd_common_module.c b/contrib/linux-kernel/zstd_common_module.c +index 2fead39e..466828e3 100644 +--- a/contrib/linux-kernel/zstd_common_module.c ++++ b/contrib/linux-kernel/zstd_common_module.c +@@ -24,9 +24,6 @@ EXPORT_SYMBOL_GPL(HUF_readStats_wksp); + EXPORT_SYMBOL_GPL(ZSTD_isError); + EXPORT_SYMBOL_GPL(ZSTD_getErrorName); + EXPORT_SYMBOL_GPL(ZSTD_getErrorCode); +-EXPORT_SYMBOL_GPL(ZSTD_customMalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customCalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customFree); + + MODULE_LICENSE("Dual BSD/GPL"); + MODULE_DESCRIPTION("Zstd Common"); +diff --git a/lib/common/allocations.h b/lib/common/allocations.h +new file mode 100644 +index 00000000..a3153c4b +--- /dev/null ++++ b/lib/common/allocations.h +@@ -0,0 +1,55 @@ ++/* ++ * Copyright (c) Meta Platforms, Inc. and affiliates. ++ * All rights reserved. ++ * ++ * This source code is licensed under both the BSD-style license (found in the ++ * LICENSE file in the root directory of this source tree) and the GPLv2 (found ++ * in the COPYING file in the root directory of this source tree). ++ * You may select, at your option, one of the above-listed licenses. ++ */ ++ ++/* This file provides custom allocation primitives ++ */ ++ ++#define ZSTD_DEPS_NEED_MALLOC ++#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ ++ ++#include "mem.h" /* MEM_STATIC */ ++#define ZSTD_STATIC_LINKING_ONLY ++#include "../zstd.h" /* ZSTD_customMem */ ++ ++#ifndef ZSTD_ALLOCATIONS_H ++#define ZSTD_ALLOCATIONS_H ++ ++/* custom memory allocation functions */ ++ ++MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) ++ return customMem.customAlloc(customMem.opaque, size); ++ return ZSTD_malloc(size); ++} ++ ++MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) { ++ /* calloc implemented as malloc+memset; ++ * not as efficient as calloc, but next best guess for custom malloc */ ++ void* const ptr = customMem.customAlloc(customMem.opaque, size); ++ ZSTD_memset(ptr, 0, size); ++ return ptr; ++ } ++ return ZSTD_calloc(1, size); ++} ++ ++MEM_STATIC void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) ++{ ++ if (ptr!=NULL) { ++ if (customMem.customFree) ++ customMem.customFree(customMem.opaque, ptr); ++ else ++ ZSTD_free(ptr); ++ } ++} ++ ++#endif /* ZSTD_ALLOCATIONS_H */ +diff --git a/lib/common/pool.c b/lib/common/pool.c +index f3d9d085..d5ca5a78 100644 +--- a/lib/common/pool.c ++++ b/lib/common/pool.c +@@ -10,9 +10,9 @@ + + + /* ====== Dependencies ======= */ ++#include "../common/allocations.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "zstd_deps.h" /* size_t */ + #include "debug.h" /* assert */ +-#include "zstd_internal.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "pool.h" + + /* ====== Compiler specifics ====== */ +diff --git a/lib/common/zstd_common.c b/lib/common/zstd_common.c +index 32085524..3f04c22a 100644 +--- a/lib/common/zstd_common.c ++++ b/lib/common/zstd_common.c +@@ -14,7 +14,6 @@ + * Dependencies + ***************************************/ + #define ZSTD_DEPS_NEED_MALLOC +-#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ + #include "error_private.h" + #include "zstd_internal.h" + +@@ -47,37 +46,3 @@ ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); } + /*! ZSTD_getErrorString() : + * provides error code string from enum */ + const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); } +- +- +- +-/*=************************************************************** +-* Custom allocator +-****************************************************************/ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) +- return customMem.customAlloc(customMem.opaque, size); +- return ZSTD_malloc(size); +-} +- +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) { +- /* calloc implemented as malloc+memset; +- * not as efficient as calloc, but next best guess for custom malloc */ +- void* const ptr = customMem.customAlloc(customMem.opaque, size); +- ZSTD_memset(ptr, 0, size); +- return ptr; +- } +- return ZSTD_calloc(1, size); +-} +- +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) +-{ +- if (ptr!=NULL) { +- if (customMem.customFree) +- customMem.customFree(customMem.opaque, ptr); +- else +- ZSTD_free(ptr); +- } +-} +diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h +index 37836dc7..1f942f27 100644 +--- a/lib/common/zstd_internal.h ++++ b/lib/common/zstd_internal.h +@@ -350,11 +350,6 @@ typedef struct { + const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBuilder */ + int ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */ + +-/* custom memory allocation functions */ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem); +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem); +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem); +- + + /* ZSTD_invalidateRepCodes() : + * ensures next compression will not use repcodes from previous block. +diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c +index b55f684c..173ce242 100644 +--- a/lib/compress/zstd_compress.c ++++ b/lib/compress/zstd_compress.c +@@ -11,6 +11,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* INT_MAX, ZSTD_memset, ZSTD_memcpy */ + #include "../common/mem.h" + #include "hist.h" /* HIST_countFast_wksp */ +diff --git a/lib/compress/zstd_cwksp.h b/lib/compress/zstd_cwksp.h +index 97676693..9113cdbd 100644 +--- a/lib/compress/zstd_cwksp.h ++++ b/lib/compress/zstd_cwksp.h +@@ -14,6 +14,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_internal.h" + + #if defined (__cplusplus) +diff --git a/lib/compress/zstdmt_compress.c b/lib/compress/zstdmt_compress.c +index 7a2c7172..bf2de4a7 100644 +--- a/lib/compress/zstdmt_compress.c ++++ b/lib/compress/zstdmt_compress.c +@@ -20,6 +20,7 @@ + + + /* ====== Dependencies ====== */ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memset, INT_MAX, UINT_MAX */ + #include "../common/mem.h" /* MEM_STATIC */ + #include "../common/pool.h" /* threadpool */ +diff --git a/lib/decompress/zstd_ddict.c b/lib/decompress/zstd_ddict.c +index ad5c34a7..309ec0d0 100644 +--- a/lib/decompress/zstd_ddict.c ++++ b/lib/decompress/zstd_ddict.c +@@ -14,6 +14,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/cpu.h" /* bmi2 */ + #include "../common/mem.h" /* low level memory routines */ +diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c +index d487966c..3f3ca57c 100644 +--- a/lib/decompress/zstd_decompress.c ++++ b/lib/decompress/zstd_decompress.c +@@ -55,6 +55,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/mem.h" /* low level memory routines */ + #define FSE_STATIC_LINKING_ONLY +diff --git a/programs/Makefile b/programs/Makefile +index fcff41dc..8507abef 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -225,7 +225,7 @@ zstd-noxz : zstd + .PHONY: zstd-dll + zstd-dll : LDFLAGS+= -L$(LIBZSTD) + zstd-dll : LDLIBS += -lzstd +-zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c ++zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c pool.c threading.c + zstd-dll : zstd + + +diff --git a/tests/Makefile b/tests/Makefile +index 3eed19ea..778c7d67 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -95,7 +95,7 @@ allnothread: fullbench fuzzer paramgrill datagen decodecorpus + dll: fuzzer-dll zstreamtest-dll + + .PHONY: zstd zstd32 zstd-nolegacy # only external makefile knows how to build or update them +-zstd zstd32 zstd-nolegacy: ++zstd zstd32 zstd-nolegacy zstd-dll: + $(MAKE) -C $(PRGDIR) $@ MOREFLAGS+="$(DEBUGFLAGS)" + + .PHONY: libzstd +@@ -328,13 +328,17 @@ test-all: test test32 test-decodecorpus-cli + test-zstd: ZSTD = $(PRGDIR)/zstd + test-zstd: zstd + ++.PHONY: test-zstd-dll ++test-zstd-dll: ZSTD = $(PRGDIR)/zstd ++test-zstd-dll: zstd-dll ++ + test-zstd32: ZSTD = $(PRGDIR)/zstd32 + test-zstd32: zstd32 + + test-zstd-nolegacy: ZSTD = $(PRGDIR)/zstd-nolegacy + test-zstd-nolegacy: zstd-nolegacy + +-test-zstd test-zstd32 test-zstd-nolegacy: datagen ++test-zstd test-zstd32 test-zstd-nolegacy test-zstd-dll: datagen + file $(ZSTD) + EXE_PREFIX="$(QEMU_SYS)" ZSTD_BIN="$(ZSTD)" DATAGEN_BIN=./datagen ./playTests.sh $(ZSTDRTTEST) + +-- +2.39.1 + diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index eca44b89f03c..ca4e2fa0b9c9 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,6 +1,6 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 -sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz.sha256 +sha256 0f470992aedad543126d06efab344dc5f3e171893810455787d38347343a4424 zstd-1.5.4.tar.gz # License files (locally computed) -sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE +sha256 7055266497633c9025b777c78eb7235af13922117480ed5c674677adc381c9d8 LICENSE sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 73bb97a793d3..45e8bf1bc2a1 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.2 +ZSTD_VERSION = 1.5.4 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From e3706f1e0b7008674169809166c414825a551d04 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 13 Feb 2023 13:40:23 +0100 Subject: [PATCH 0016/2890] package/network-manager: bump version to 1.42.0 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 3895c1ffc36d..270699d63af5 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum -sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.42/NetworkManager-1.42.0.sha256sum +sha256 2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4 NetworkManager-1.42.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 138ff46e4a39..30015309302a 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.40 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 +NETWORK_MANAGER_VERSION_MAJOR = 1.42 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES From b851097ba6db559042183eb31dc48dc1533fac04 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 13 Feb 2023 16:10:39 +0100 Subject: [PATCH 0017/2890] package/networkd-dispatcher: bump to version 2.2.4 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/networkd-dispatcher/networkd-dispatcher.hash | 2 +- package/networkd-dispatcher/networkd-dispatcher.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash index ffb4fa846a6b..f50dd75163dc 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.hash +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 61270b4c2f39c36da4b0a62724a3cc01f6732493fed0f166ee675bafedff11df networkd-dispatcher-2.2.3.tar.bz2 +sha256 993086fa2dab11ba6b54a121adaccbd4c679ce3c8b3193cfa5c00500c28cbdf9 networkd-dispatcher-2.2.4.tar.bz2 sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk index 2b1aa257ce77..a3e0319c1052 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.mk +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETWORKD_DISPATCHER_VERSION = 2.2.3 +NETWORKD_DISPATCHER_VERSION = 2.2.4 NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) NETWORKD_DISPATCHER_LICENSE = GPL-3.0 From db97a1d196da07d2c1d1f41061dcac851c110915 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 14 Feb 2023 13:25:41 -0700 Subject: [PATCH 0018/2890] package/python-maturin: bump to version 0.14.13 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index b104b1fbbeab..d1344f274440 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 59157a06c0a482aec750d64746f2b23e556ce3ec62d9cdce74fcb7b4658b722b maturin-0.14.9.tar.gz +sha256 7ed1234824ef2b0c919c6d24550540bf044fe992612b322a6abda1253f5bb500 maturin-0.14.13.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 3484e09d2270..7781a1070b67 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.9 +PYTHON_MATURIN_VERSION = 0.14.13 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/90/f9/f4242c0e8bc5def9a7135c12574449dbb411ecc595cf72202ca97a79c2ad +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/a9/a9/bcff9592d7ad68052432e6369bd310606e2ddeb9bcc0b52d5f69e4140290 PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From ec7258f3f4ea4442cd1f8c78a066a062a4d0cbd0 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 7 Feb 2023 23:09:38 +0100 Subject: [PATCH 0019/2890] package/openmpi: bump to version 4.1.4 Notable changes in this commit: - change from v4.0.x to v4.1.x "current" version series, - move the sha256 hash out of the "Locally computed" section, as the value comes from the download page, - the LICENSE file hash changed, as the file was updated (copyright years updated and new contributors added), - the IME (Infinite Memory Engine), introduced in v4.1.x, is disabled to workaround a failure when cross-compiled, - the package now requires a toolchain with atomic support, and needs to link against libatomic when needed. For change log since v4.0.0, see: - https://github.com/open-mpi/ompi/blob/v4.1.4/NEWS#L61 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/openmpi/Config.in | 2 ++ package/openmpi/openmpi.hash | 10 +++++----- package/openmpi/openmpi.mk | 17 ++++++++++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/package/openmpi/Config.in b/package/openmpi/Config.in index 4413c55f9c55..e64eb81c3e36 100644 --- a/package/openmpi/Config.in +++ b/package/openmpi/Config.in @@ -1,5 +1,6 @@ comment "openmpi needs a toolchain w/ dynamic library, NPTL, wchar, C++" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_sparc depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP @@ -8,6 +9,7 @@ config BR2_PACKAGE_OPENMPI bool "openmpi" depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index a399adc75870..745ed7c58053 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ -# From: https://www.open-mpi.org/software/ompi/v4.0/ -md5 e3da67df1e968c8798827e0e5fe9a510 openmpi-4.0.0.tar.bz2 -sha1 fee1d0287abfb150bae16957de342752c9bdd4e8 openmpi-4.0.0.tar.bz2 +# From: https://www.open-mpi.org/software/ompi/v4.1/ +md5 f057e12aabaf7dd5a6a658180fca404e openmpi-4.1.4.tar.bz2 +sha1 357c61a8e06e103d987c0e4a054e8780a034c8b1 openmpi-4.1.4.tar.bz2 +sha256 92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d openmpi-4.1.4.tar.bz2 # Locally computed -sha256 2f0b8a36cfeb7354b45dda3c5425ef8393c9b04115570b615213faaa3f97366b openmpi-4.0.0.tar.bz2 -sha256 8298a80ed5f09cfd007bae1c0e7d67d1c2810c6389876778dad070c31a691dac LICENSE +sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index 8bdc3fa188fb..f14b55ced53a 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -4,14 +4,21 @@ # ################################################################################ -OPENMPI_VERSION_MAJOR = 4.0 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).0 +OPENMPI_VERSION_MAJOR = 4.1 +OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).4 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause OPENMPI_LICENSE_FILES = LICENSE OPENMPI_INSTALL_STAGING = YES +# The macro searching for IME (Infinite Memory Engine) filesystem +# brings "-I/usr/local/include" in the CPPFLAGS, even if not +# found. This makes the configuration fail. See: +# https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 +# Disable explicitly to avoid the issue. +OPENMPI_CONF_OPTS = --without-ime + # Enabling Fortran support requires pre-seeding the configure script # with various values that cannot be guessed, so we provide cache # files for various architectures. @@ -43,6 +50,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) OPENMPI_CFLAGS += -O0 endif -OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +OPENMPI_LIBS += -latomic +endif + +OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" LIBS="$(OPENMPI_LIBS)" $(eval $(autotools-package)) From f6c05b47f71a6e140a0743dda276267f653f94f3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 17:10:36 -0700 Subject: [PATCH 0020/2890] package/cmake: disable ccache for host-cmake The upcoming ccache update will depend on host-cmake, so we must ensure host-cmake doesn't use ccache when being built. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/cmake/cmake.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 053658fad60d..dc92c8bb4ea0 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -40,9 +40,16 @@ CMAKE_CONF_OPTS = \ HOST_CMAKE_CFLAGS = $(shell echo $(HOST_CFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%") HOST_CMAKE_CXXFLAGS = $(shell echo $(HOST_CXXFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%") +# We may be a ccache dependency, so we can't use ccache +HOST_CMAKE_CONFIGURE_OPTS = \ + $(HOST_CONFIGURE_OPTS) \ + CC="$(HOSTCC_NOCCACHE)" \ + GCC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + define HOST_CMAKE_CONFIGURE_CMDS (cd $(@D); \ - $(HOST_CONFIGURE_OPTS) \ + $(HOST_CMAKE_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CMAKE_CFLAGS)" \ ./bootstrap --prefix=$(HOST_DIR) \ --parallel=$(PARALLEL_JOBS) -- \ From 7087e5286d8419f4625f5f6e52aa84567c6b7ed0 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 17:10:37 -0700 Subject: [PATCH 0021/2890] package/ccache: bump to version 4.7.4 Migrate to cmake package infrastructure. Add new host-hiredis host-zstd dependencies. Add new ccache dependency exclusions to pkg-generic. Migrate HOST_CCACHE_PATCH_CONFIGURATION to handle updated source files/format. License hashes changed due to migrating urls to https: https://github.com/ccache/ccache/commit/a0f32f161f1b8b9c5d287ca8abe88e3fd1e940a2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ccache/ccache.hash | 6 +++--- package/ccache/ccache.mk | 38 +++++++++++++++++--------------------- package/pkg-generic.mk | 2 +- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 16cfad602c9a..9b11f026ec14 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400 ccache-3.7.12.tar.xz -sha256 ec6b1a326ff93b2cc21df88a697ae470ff6927a55b8929e7e491b315e1563361 GPL-3.0.txt -sha256 4f63223bcdee822d55a6768cc8399ffe06401d7a03cfe79e1dc305f50dc22c59 LICENSE.adoc +sha256 df0c64d15d3efaf0b4f6837dd6b1467e40eeaaa807db25ce79c3a08a46a84e36 ccache-4.7.4.tar.xz +sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt +sha256 56cf64f68b7b8150300acd79899941615523ea5c56c120e92f5b175b7cc78e3c LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 97aa8b1c75df..6b7d57b40ccc 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,27 +4,19 @@ # ################################################################################ -CCACHE_VERSION = 3.7.12 +CCACHE_VERSION = 4.7.4 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt - -# Force ccache to use its internal zlib. The problem is that without -# this, ccache would link against the zlib of the build system, but we -# might build and install a different version of zlib in $(O)/host -# afterwards, which ccache will pick up. This might break if there is -# a version mismatch. A solution would be to add host-zlib has a -# dependency of ccache, but it would require tuning the zlib .mk file -# to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy -# path: tell ccache to use its internal copy of zlib, so that ccache -# has zero dependency besides the C library. -HOST_CCACHE_CONF_OPTS += --with-bundled-zlib +HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd # We are ccache, so we can't use ccache -HOST_CCACHE_CONF_ENV = \ - CC="$(HOSTCC_NOCCACHE)" \ - CXX="$(HOSTCXX_NOCCACHE)" +HOST_CCACHE_CONF_OPTS += \ + -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER \ + -DZSTD_FROM_INTERNET=OFF \ + -DHIREDIS_FROM_INTERNET=OFF # Patch host-ccache as follows: # - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR @@ -33,13 +25,17 @@ HOST_CCACHE_CONF_ENV = \ # BR2_CCACHE_DIR. # - Change hard-coded last-ditch default to match path in .config, to avoid # the need to specify BR_CACHE_DIR when invoking ccache directly. -# CCache replaces "%s" with the home directory of the current user, -# So rewrite BR_CACHE_DIR to take that into consideration for SDK purpose -HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,\%s/%,$(BR_CACHE_DIR)) +# CCache replaces "home_dir" with the home directory of the current user, +# so rewrite BR_CACHE_DIR to take that into consideration for SDK purpose +HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,%,$(BR_CACHE_DIR)) define HOST_CCACHE_PATCH_CONFIGURATION - sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache.c - sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/conf.c + sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/Config.cpp + sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/Config.cpp + sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/Config.cpp endef HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION @@ -62,7 +58,7 @@ endef HOST_CCACHE_POST_INSTALL_HOOKS += HOST_CCACHE_DO_INITIAL_SETUP endif -$(eval $(host-autotools-package)) +$(eval $(host-cmake-package)) ifeq ($(BR2_CCACHE),y) ccache-stats: host-ccache diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 82187d7db9d2..d460251f48ed 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -792,7 +792,7 @@ $(2)_EXTRACT_DEPENDENCIES += \ endif ifeq ($$(BR2_CCACHE),y) -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-hiredis host-pkgconf host-zstd,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif From 0fd1f8a892a89d1b6d27b8e9884d645f71192813 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Tue, 21 Feb 2023 18:27:16 +0100 Subject: [PATCH 0022/2890] package/openfpgaloader: bump to version 0.10.0 Also adds libgpiod support. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/openfpgaloader/Config.in | 10 ++++++++++ package/openfpgaloader/openfpgaloader.hash | 2 +- package/openfpgaloader/openfpgaloader.mk | 9 ++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index 054278c256d6..4ba01d12d3bd 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -24,6 +24,16 @@ config BR2_PACAKGE_OPENFPGALOADER_CMSIS comment "openfpgaloader CMSIS-DAP needs udev /dev management and a toolchain w/ NPTL threads" depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS_NPTL +config BR2_PACKAGE_OPENFPGALOADER_LIBGPIOD + bool "libgpiod support" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 # libgpiod + select BR2_PACKAGE_LIBGPIOD + help + openfpgaloader libgpiod support + +comment "openfpgaloader libgpiod needs kernel headers >= 4.8" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + endif comment "openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9" diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash index 6c9d8a2b9135..a8b537782cc1 100644 --- a/package/openfpgaloader/openfpgaloader.hash +++ b/package/openfpgaloader/openfpgaloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a862a209d696becff915a77512e6a8c22f92d73480a45cc12273d9ad1db60d23 openfpgaloader-0.6.1.tar.gz +sha256 966b4629df86b1d520ddd8a4e0a3fc00060b26b5ab4e172b596bd9d4659a196e openfpgaloader-0.10.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index 0c39aad68717..042b16612e45 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENFPGALOADER_VERSION = 0.6.1 +OPENFPGALOADER_VERSION = 0.10.0 OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,v$(OPENFPGALOADER_VERSION)) OPENFPGALOADER_LICENSE = Apache-2.0 OPENFPGALOADER_LICENSE_FILES = LICENSE @@ -24,4 +24,11 @@ else OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=OFF endif +ifeq ($(BR2_PACAKGE_OPENFPGALOADER_LIBGPIOD),y) +OPENFPGALOADER_DEPENDENCIES += libgpiod +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=ON +else +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=OFF +endif + $(eval $(cmake-package)) From 48d9042e5d2e0bc8bd0efc3a2516b156c4b89190 Mon Sep 17 00:00:00 2001 From: Casey Reeves Date: Thu, 19 Jan 2023 19:50:40 +0100 Subject: [PATCH 0023/2890] boot/arm-trusted-firmware: allow using Barebox as BL33 Since version 2022.04.0, Barebox now supports a generic image built for platforms, to be used as BL33 to generate FIP images. This patch makes it available as a choice of BL33 to be used with ATF and is based on the similar work put into U-Boot as BL33. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 21 +++++++++++++++++++ .../arm-trusted-firmware.mk | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index a9b9bbcc5a1f..cb54c6c9d866 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -129,6 +129,27 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE endchoice +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 + bool "Use Barebox as BL33" + depends on BR2_TARGET_BAREBOX + help + This option allows to embed the Barebox generic BL33 image in + the ARM Trusted Firmware. It ensures that the Barebox package + gets built before ATF, and that the appropriate BL33 + variable pointing to the generic bl33 image is passed + when building ATF. + +if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE + string "Barebox BL33 image name" + default "*-generic-bl33.img" + help + Name of the Barebox BL33 image to include in ATF, it must + have been installed to BINARIES_DIR by the Barebox package. + +endif + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 bool "Use U-Boot as BL33" depends on BR2_TARGET_UBOOT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 1164c8141061..648f62ed85c4 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -105,6 +105,12 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee endif endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33),y) +ARM_TRUSTED_FIRMWARE_BAREBOX_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE)) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_BAREBOX_BIN) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += barebox +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y) ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2 # Since the flash device name vary between platforms, we use the variable From 7692d5beb2d9e4d0b463f0f26a177829e5bcc1ec Mon Sep 17 00:00:00 2001 From: AndreiCherniaev Date: Mon, 9 Jan 2023 16:33:52 +0900 Subject: [PATCH 0024/2890] boot/grub2: add details on grub.cfg location Signed-off-by: AndreiCherniaev Signed-off-by: Thomas Petazzoni --- boot/grub2/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in index 92b5dd501b72..f05f33ccc7b5 100644 --- a/boot/grub2/Config.in +++ b/boot/grub2/Config.in @@ -27,6 +27,10 @@ config BR2_TARGET_GRUB2 Amongst others, GRUB2 offers EFI support, which GRUB Legacy doesn't provide. + The file boot/grub2/grub.cfg is used by default as the Grub + configuration file. It can be overridden using a rootfs + overlay or post-build script. + For additional notes on using Grub 2 with Buildroot, see boot/grub2/readme.txt From 9793454bd2f0ada2b3928896aaf90b4d753d0399 Mon Sep 17 00:00:00 2001 From: Diego Hurtado de Mendoza Date: Wed, 22 Feb 2023 10:49:16 +0100 Subject: [PATCH 0025/2890] package/hackrf: bump to version 2023.01.1 https://github.com/greatscottgadgets/hackrf/releases/tag/v2023.01.1 Signed-off-by: Diego Hurtado de Mendoza Signed-off-by: Thomas Petazzoni --- package/hackrf/hackrf.hash | 2 +- package/hackrf/hackrf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hackrf/hackrf.hash b/package/hackrf/hackrf.hash index 16ccb9dcfb23..0426009dd373 100644 --- a/package/hackrf/hackrf.hash +++ b/package/hackrf/hackrf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bacd4e7937467ffa14654624444c8b5c716ab470d8c1ee8d220d2094ae2adb3e hackrf-2022.09.1.tar.xz +sha256 32a03f943a30be4ba478e94bf69f14a5b7d55be6761007f4a4f5453418206a11 hackrf-2023.01.1.tar.xz sha256 49b60a6288f90f49074228cc1fae0fb16871ba36b756013abdf7c2fc92f01fad COPYING diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 4317da60bc87..0d7533815dd3 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -4,7 +4,7 @@ # ################################################################################ -HACKRF_VERSION = 2022.09.1 +HACKRF_VERSION = 2023.01.1 HACKRF_SITE = https://github.com/greatscottgadgets/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause From 8beed8ac56a51d4d6a9dd81b81b8025cb7f8d99b Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 29 Dec 2022 19:45:20 +0100 Subject: [PATCH 0026/2890] package/rtl8192eu: bump to 2022-12-29 version on branch 5.11.2.1 Drop local patch since it's been merged[0]. [0]: https://github.com/clnhub/rtl8192eu-linux/pull/69 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...e-due-to-redefition-of-local-sha256-.patch | 108 ------------------ package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 3 files changed, 2 insertions(+), 110 deletions(-) delete mode 100644 package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch diff --git a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch deleted file mode 100644 index 52ef8c900554..000000000000 --- a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 1f968bd58656f200347bd398b34aa9f1b6393302 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 28 Dec 2022 18:54:48 +0100 -Subject: [PATCH] Fix build failure due to redefition of local sha256 data - types and functions - -Linux provides sha256_init() and 'struct sha256_state' in file -include/crypto/sha2.h so this leads to a build failure due to redefinition. -To avoid this let's prepend to all local exposed functions and data types -rtl_. sha256_process() and sha256_done() are not required to be renamed but -let's change them for consistency. - -[Upstream status: https://github.com/clnhub/rtl8192eu-linux/pull/69] -Signed-off-by: Giulio Benetti ---- - core/crypto/sha256-internal.c | 16 ++++++++-------- - core/crypto/sha256_i.h | 8 ++++---- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/core/crypto/sha256-internal.c b/core/crypto/sha256-internal.c -index 4d61cb1..537bb2e 100644 ---- a/core/crypto/sha256-internal.c -+++ b/core/crypto/sha256-internal.c -@@ -26,17 +26,17 @@ - int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len, - u8 *mac) - { -- struct sha256_state ctx; -+ struct rtl_sha256_state ctx; - size_t i; - - if (TEST_FAIL()) - return -1; - -- sha256_init(&ctx); -+ rtl_sha256_init(&ctx); - for (i = 0; i < num_elem; i++) -- if (sha256_process(&ctx, addr[i], len[i])) -+ if (rtl_sha256_process(&ctx, addr[i], len[i])) - return -1; -- if (sha256_done(&ctx, mac)) -+ if (rtl_sha256_done(&ctx, mac)) - return -1; - return 0; - } -@@ -82,7 +82,7 @@ static const unsigned long K[64] = { - #endif - - /* compress 512-bits */ --static int sha256_compress(struct sha256_state *md, unsigned char *buf) -+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) - { - u32 S[8], W[64], t0, t1; - u32 t; -@@ -125,7 +125,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) - - - /* Initialize the hash state */ --void sha256_init(struct sha256_state *md) -+void rtl_sha256_init(struct rtl_sha256_state *md) - { - md->curlen = 0; - md->length = 0; -@@ -146,7 +146,7 @@ void sha256_init(struct sha256_state *md) - @param inlen The length of the data (octets) - @return CRYPT_OK if successful - */ --int sha256_process(struct sha256_state *md, const unsigned char *in, -+int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, - unsigned long inlen) - { - unsigned long n; -@@ -186,7 +186,7 @@ int sha256_process(struct sha256_state *md, const unsigned char *in, - @param out [out] The destination of the hash (32 bytes) - @return CRYPT_OK if successful - */ --int sha256_done(struct sha256_state *md, unsigned char *out) -+int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out) - { - int i; - -diff --git a/core/crypto/sha256_i.h b/core/crypto/sha256_i.h -index a502d2b..93a8858 100644 ---- a/core/crypto/sha256_i.h -+++ b/core/crypto/sha256_i.h -@@ -11,15 +11,15 @@ - - #define SHA256_BLOCK_SIZE 64 - --struct sha256_state { -+struct rtl_sha256_state { - u64 length; - u32 state[8], curlen; - u8 buf[SHA256_BLOCK_SIZE]; - }; - --void sha256_init(struct sha256_state *md); --int sha256_process(struct sha256_state *md, const unsigned char *in, -+void rtl_sha256_init(struct rtl_sha256_state *md); -+int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, - unsigned long inlen); --int sha256_done(struct sha256_state *md, unsigned char *out); -+int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out); - - #endif /* SHA256_I_H */ --- -2.34.1 - diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index 0cb9961345ed..2d6498f19d4f 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 827e9592336744cbcfca5de988d8f4e14a62690302d3cabf72aa4bedebded2b7 rtl8192eu-94bce7798bbb18de6d8b1646dedb2511f24867d3.tar.gz +sha256 72d1d97c6d2038885e5666f3271609b4dcbe45633c19a5606dc59745ff8ab543 rtl8192eu-865656c3a1d1aee8c4ba459ce7608756d17c712f.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index d967db90b85d..da6fe42e996a 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = 94bce7798bbb18de6d8b1646dedb2511f24867d3 +RTL8192EU_VERSION = 865656c3a1d1aee8c4ba459ce7608756d17c712f RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 From 97c40266b1b69e101ce035c8aa73bf2665c5c256 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 1 Jan 2023 15:32:32 +0100 Subject: [PATCH 0027/2890] package/qemu: add option to install blobs Binary blobs are BIOS of some sorts for the various machines emulated by QEMU. There is no option to individually install blobs; it's an all-or-nothing option. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in | 11 +++++++++++ package/qemu/qemu.mk | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 154b98a54158..a446c0cf6871 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -58,6 +58,17 @@ config BR2_PACKAGE_QEMU_SYSTEM if BR2_PACKAGE_QEMU_SYSTEM +config BR2_PACKAGE_QEMU_BLOBS + bool "Install binary blobs" + default y + help + Say 'y' here (the default) to install binary blobs (such as + BIOS or firmwares for the different machines simulated by + QEMU). Say 'n' to not install those blobs. + + Note: Some machines may be unbootable without those blobs. + If unsure, say 'y'. + config BR2_PACKAGE_QEMU_SLIRP bool "Enable user mode networking (SLIRP)" select BR2_PACKAGE_SLIRP diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 58b4ff10a559..d514a2285cf0 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -246,6 +246,12 @@ ifeq ($(BR2_STATIC_LIBS),y) QEMU_OPTS += --static endif +ifeq ($(BR2_PACKAGE_QEMU_BLOBS),y) +QEMU_OPTS += --enable-install-blobs +else +QEMU_OPTS += --disable-install-blobs +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS From f78c5cb5cae93a9e63dad4361d78e1787759382f Mon Sep 17 00:00:00 2001 From: Raphael Pavlidis Date: Sat, 24 Dec 2022 18:19:20 +0100 Subject: [PATCH 0028/2890] package/shadow: new package shadow provides utilities to deal with user accounts. The shadow package includes the necessary programs for converting UNIX password files to the shadow password format, plus programs for managing user and group accounts. Especially it is useful if rootless podman container should be used, which requires newuidmap and newgidmap. Co-authored-by: Nicolas Carrier [Nicolas.Carrier@orolia.com provided the test case] Signed-off-by: Raphael Pavlidis Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/shadow/Config.in | 62 +++++++++ package/shadow/shadow.hash | 3 + package/shadow/shadow.mk | 135 +++++++++++++++++++ support/testing/tests/package/test_shadow.py | 55 ++++++++ 6 files changed, 257 insertions(+) create mode 100644 package/shadow/Config.in create mode 100644 package/shadow/shadow.hash create mode 100644 package/shadow/shadow.mk create mode 100644 support/testing/tests/package/test_shadow.py diff --git a/DEVELOPERS b/DEVELOPERS index 599cfe68864b..d052e59122a6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2429,6 +2429,7 @@ F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py N: Raphael Pavlidis +F: package/shadow/ F: package/slirp4netns/ F: package/sway/ F: package/x11r7/xwayland/ diff --git a/package/Config.in b/package/Config.in index 6c5238a9b025..7c3230512978 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2701,6 +2701,7 @@ menu "System tools" source "package/sdbus-cpp/Config.in" source "package/sdbusplus/Config.in" source "package/seatd/Config.in" + source "package/shadow/Config.in" source "package/smack/Config.in" source "package/start-stop-daemon/Config.in" source "package/supervisor/Config.in" diff --git a/package/shadow/Config.in b/package/shadow/Config.in new file mode 100644 index 000000000000..e3580c2cf5a8 --- /dev/null +++ b/package/shadow/Config.in @@ -0,0 +1,62 @@ +menuconfig BR2_PACKAGE_SHADOW + bool "shadow" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + help + Utilities to deal with user accounts. + + https://github.com/shadow-maint/shadow + +if BR2_PACKAGE_SHADOW + +config BR2_PACKAGE_SHADOW_SHADOWGRP + bool "shadowgrp" + help + Enable shadow group support. + +config BR2_PACKAGE_SHADOW_ACCOUNT_TOOLS_SETUID + bool "account-tools-setuid" + depends on BR2_USE_MMU # linux-pam + depends on BR2_ENABLE_LOCALE # linux-pam + depends on BR2_USE_WCHAR # linux-pam + depends on !BR2_STATIC_LIBS # linux-pam + select BR2_PACKAGE_LINUX_PAM + help + Install the user and group management tools (e.g. groupadd) + with setuid and authenticate the callers via PAM. + +comment "account-tools-setuid needs a toolchain w/ dynamic library, wchar, locale" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_ENABLE_LOCALE + +config BR2_PACKAGE_SHADOW_UTMPX + bool "utmpx" + help + Enable loggin in utmpx / wtmpx. + +config BR2_PACKAGE_SHADOW_SUBORDINATE_IDS + bool "subordinate-ids" + help + Support subordinate ids. Helpful to use container solution + like podman without root. + +config BR2_PACKAGE_SHADOW_SHA_CRYPT + bool "sha-crypt" + default y + help + Allow the SHA256 and SHA512 password encryption algorithms. + +config BR2_PACKAGE_SHADOW_BCRYPT + bool "bcrypt" + help + Allow the bcrypt password encryption algorithm. + +config BR2_PACKAGE_SHADOW_YESCRYPT + bool "yescrypt" + help + Allow the yescrypt password encryption algorithm. + +endif # BR2_PACKAGE_SHADOW + +comment "shadow needs a toolchain w/ headers >= 4.14, dynamic library" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash new file mode 100644 index 000000000000..2e5c4a81689c --- /dev/null +++ b/package/shadow/shadow.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9afe245d79a2e7caac5f1ed62519b17416b057ec89df316df1c3935502f9dd2c shadow-4.13.tar.xz +sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk new file mode 100644 index 000000000000..d8f913a6483f --- /dev/null +++ b/package/shadow/shadow.mk @@ -0,0 +1,135 @@ +################################################################################ +# +# shadow +# +################################################################################ + +SHADOW_VERSION = 4.13 +SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) +SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz +SHADOW_LICENSE = BSD-3-Clause +SHADOW_LICENSE_FILES = COPYING +SHADOW_CPE_ID_VENDOR = debian + +SHADOW_CONF_OPTS = \ + --disable-man \ + --without-btrfs \ + --without-nscd \ + --without-skey \ + --without-sssd \ + --without-su \ + --without-tcb + +ifeq ($(BR2_PACKAGE_SHADOW_SHADOWGRP),y) +SHADOW_CONF_OPTS += --enable-shadowgrp +else +SHADOW_CONF_OPTS += --disable-shadowgrp +endif + +ifeq ($(BR2_PACKAGE_SHADOW_ACCOUNT_TOOLS_SETUID),y) +SHADOW_CONF_OPTS += --enable-account-tools-setuid +define SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS + /usr/sbin/chgpasswd f 4755 0 0 - - - - - + /usr/sbin/chpasswd f 4755 0 0 - - - - - + /usr/sbin/groupadd f 4755 0 0 - - - - - + /usr/sbin/groupdel f 4755 0 0 - - - - - + /usr/sbin/groupmod f 4755 0 0 - - - - - + /usr/sbin/newusers f 4755 0 0 - - - - - + /usr/sbin/useradd f 4755 0 0 - - - - - + /usr/sbin/userdel f 4755 0 0 - - - - - + /usr/sbin/usermod f 4755 0 0 - - - - - +endef +else +SHADOW_CONF_OPTS += --disable-account-tools-setuid +endif + +ifeq ($(BR2_PACKAGE_SHADOW_UTMPX),y) +SHADOW_CONF_OPTS += --enable-utmpx +else +SHADOW_CONF_OPTS += --disable-utmpx +endif + +ifeq ($(BR2_PACKAGE_SHADOW_SUBORDINATE_IDS),y) +SHADOW_CONF_OPTS += --enable-subordinate-ids +define SHADOW_SUBORDINATE_IDS_PERMISSIONS + /usr/bin/newuidmap f 4755 0 0 - - - - - + /usr/bin/newgidmap f 4755 0 0 - - - - - +endef +else +SHADOW_CONF_OPTS += --disable-subordinate-ids +endif + +ifeq ($(BR2_PACKAGE_ACL),y) +SHADOW_CONF_OPTS += --with-acl +SHADOW_DEPENDENCIES += acl +else +SHADOW_CONF_OPTS += --without-acl +endif + +ifeq ($(BR2_PACKAGE_ATTR),y) +SHADOW_CONF_OPTS += --with-attr +SHADOW_DEPENDENCIES += attr +else +SHADOW_CONF_OPTS += --without-attr +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +SHADOW_CONF_OPTS += --with-audit +SHADOW_DEPENDENCIES += audit +else +SHADOW_CONF_OPTS += --without-audit +endif + +ifeq ($(BR2_PACKAGE_CRACKLIB),y) +SHADOW_CONF_OPTS += --with-libcrack +SHADOW_DEPENDENCIES += cracklib +else +SHADOW_CONF_OPTS += --without-libcrack +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +SHADOW_CONF_OPTS += --with-selinux +SHADOW_DEPENDENCIES += libselinux libsemanage +else +SHADOW_CONF_OPTS += --without-selinux +endif + +# linux-pam is also used without account-tools-setuid enabled +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +SHADOW_CONF_OPTS += --with-libpam +SHADOW_DEPENDENCIES += linux-pam +else +SHADOW_CONF_OPTS += --without-libpam +endif + +ifeq ($(BR2_PACKAGE_SHADOW_SHA_CRYPT),y) +SHADOW_CONF_OPTS += --with-sha-crypt +else +SHADOW_CONF_OPTS += --without-sha-crypt +endif + +ifeq ($(BR2_PACKAGE_SHADOW_BCRYPT),y) +SHADOW_CONF_OPTS += --with-bcrypt +else +SHADOW_CONF_OPTS += --without-bcrypt +endif + +ifeq ($(BR2_PACKAGE_SHADOW_YESCRYPT),y) +SHADOW_CONF_OPTS += --with-yescrypt +else +SHADOW_CONF_OPTS += --without-yescrypt +endif + +define SHADOW_PERMISSIONS + /usr/bin/chage f 4755 0 0 - - - - - + /usr/bin/chfn f 4755 0 0 - - - - - + /usr/bin/chsh f 4755 0 0 - - - - - + /usr/bin/expiry f 4755 0 0 - - - - - + /usr/bin/gpasswd f 4755 0 0 - - - - - + /usr/bin/newgrp f 4755 0 0 - - - - - + /usr/bin/passwd f 4755 0 0 - - - - - + $(SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS) + $(SHADOW_SUBORDINATE_IDS_PERMISSIONS) +endef + +$(eval $(autotools-package)) diff --git a/support/testing/tests/package/test_shadow.py b/support/testing/tests/package/test_shadow.py new file mode 100644 index 000000000000..c5151b4fdb76 --- /dev/null +++ b/support/testing/tests/package/test_shadow.py @@ -0,0 +1,55 @@ +import os + +from infra.basetest import BRTest, BASIC_TOOLCHAIN_CONFIG + + +class TestShadow(BRTest): + username = 'user_test' + config = BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_arm=y + BR2_PACKAGE_SHADOW=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="65536" + """ + timeout = 60 + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.ext4") + self.emulator.boot(arch="armv7", + kernel="builtin", + kernel_cmdline=["root=/dev/mmcblk0", + "rootfstype=ext4"], + options=["-drive", f"file={img},if=sd,format=raw"]) + self.emulator.login() + + def test_nologin(self): + self.login() + + self.assertRunOk("! nologin") + cmd = 'test "$(nologin)" = "This account is currently not available."' + self.assertRunOk(cmd) + + def test_useradd_del(self): + username = self.username + self.login() + + self.assertRunOk(f'userdel {username} || true') + self.assertRunOk(f'groupdel {username} || true') + self.assertRunOk(f'useradd -s /bin/sh {username}') + self.assertRunOk(f'test $(su {username} -c "whoami") = {username}') + self.assertRunOk(f'userdel {username}') + + def test_usermod(self): + username = self.username + new_home = '/tmp' + self.login() + + self.assertRunOk(f'userdel {username} || true') + self.assertRunOk(f'groupdel {username} || true') + self.assertRunOk(f'useradd -s /bin/sh {username}') + self.assertRunOk(f'usermod {username} --home {new_home}') + self.assertRunOk(f'test $(su {username} -c \'echo $HOME\') = {new_home}') + self.assertRunOk(f'userdel {username}') + From 463d0dd49454669e7d72179319aeb967686c129e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Zwing?= Date: Wed, 1 Feb 2023 20:21:57 +0100 Subject: [PATCH 0029/2890] package/wine: bump to version 8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Multiple library checks are obsolete, either due to removal or due to built-in solutions. License file changed due to update of copyright year. Signed-off-by: André Zwing Signed-off-by: Thomas Petazzoni --- ...a-avoid-mpg123-functions-with-suffix.patch | 21 ----------- ...d-avoid-mpg123-functions-with-suffix.patch | 21 ----------- package/wine/wine.hash | 4 +-- package/wine/wine.mk | 35 ++----------------- 4 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch delete mode 100644 package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch diff --git a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch b/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 8332db4b381d..000000000000 --- a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 75b70efdaa2d4baa064271098878b79f66df155f -Author: André Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - l3codeca.acm: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/75b70efdaa2d4baa064271098878b79f66df155f] -Signed-off-by: André Zwing - -diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in -index 451794b2624..31765766d4e 100644 ---- a/dlls/l3codeca.acm/Makefile.in -+++ b/dlls/l3codeca.acm/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = l3codeca.acm - IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mpegl3.c diff --git a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch b/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 16f2ba2898c8..000000000000 --- a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 8d441659f7c7ae359e06a99e7abaae57792356a0 -Author: André Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - mp3dmod: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/8d441659f7c7ae359e06a99e7abaae57792356a0] -Signed-off-by: André Zwing - -diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in -index dabbb1dfeae..3ba343a4d34 100644 ---- a/dlls/mp3dmod/Makefile.in -+++ b/dlls/mp3dmod/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = mp3dmod.dll - IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mp3dmod.c diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 9a7a1c342afc..b87964da1223 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b wine-7.0.tar.xz +sha256 0272c20938f8721ae4510afaa8b36037457dd57661e4d664231079b9e91c792e wine-8.0.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 7c360930e51d56c8fa12fe1df8ed348ac77a9ad73f9582a303919469399b3ce4 LICENSE +sha256 793d045546467c8f49e35fbd6e02859e57e78f8bb53571e8200bffd0e966dfa8 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index a1c65bef4e09..a629bf0dd674 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 7.0 +WINE_VERSION = 8.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/7.0 +WINE_SITE = https://dl.winehq.org/wine/source/8.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -27,7 +27,6 @@ WINE_CONF_OPTS = \ --without-mingw \ --without-opencl \ --without-oss \ - --without-vkd3d \ --without-vulkan # Wine uses a wrapper around gcc, and uses the value of --host to @@ -131,20 +130,6 @@ else WINE_CONF_OPTS += --without-v4l2 endif -ifeq ($(BR2_PACKAGE_OPENAL),y) -WINE_CONF_OPTS += --with-openal -WINE_DEPENDENCIES += openal -else -WINE_CONF_OPTS += --without-openal -endif - -ifeq ($(BR2_PACKAGE_OPENLDAP),y) -WINE_CONF_OPTS += --with-ldap -WINE_DEPENDENCIES += openldap -else -WINE_CONF_OPTS += --without-ldap -endif - ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d @@ -266,19 +251,8 @@ endif # Wine only needs the host tools to be built, so cut-down the # build time by building just what we need. -HOST_WINE_TOOLS = \ - tools \ - tools/sfnt2fon \ - tools/widl \ - tools/winebuild \ - tools/winegcc \ - tools/wmc \ - tools/wrc - define HOST_WINE_BUILD_CMDS - $(foreach t, $(HOST_WINE_TOOLS), - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/$(t) - ) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) __tooldeps__ endef # Wine only needs its host variant to be built, not that it is @@ -304,10 +278,8 @@ HOST_WINE_CONF_OPTS += \ --without-gssapi \ --without-gstreamer \ --without-krb5 \ - --without-ldap \ --without-mingw \ --without-netapi \ - --without-openal \ --without-opencl \ --without-opengl \ --without-osmesa \ @@ -318,7 +290,6 @@ HOST_WINE_CONF_OPTS += \ --without-sdl \ --without-usb \ --without-v4l2 \ - --without-vkd3d \ --without-vulkan \ --without-x \ --without-xcomposite \ From 3254a2886a4e20111e5c87614f6f374ec626b755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 23 Feb 2023 19:08:46 +0100 Subject: [PATCH 0030/2890] boot/boot-wrapper-aarch64: bump version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump boot-wrapper to the latest version. Signed-off-by: Vincent Stehlé Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 30b352f8e7df..95f7e227603d 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a +BOOT_WRAPPER_AARCH64_VERSION = 9f26a1c1f27bd6b5b66c265114848007fc22e4aa BOOT_WRAPPER_AARCH64_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_SITE_METHOD = git BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause From b793f3a49e1ef8a48671ce19579586a0b018179d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 23 Feb 2023 19:08:47 +0100 Subject: [PATCH 0031/2890] configs/arm_foundationv8: bump to Linux 6.1.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump Linux kernel to v6.1.13 and increase the rootfs size accordingly. - Bump the FVP in the readme to version 11.20 build 15 and update the command line. Signed-off-by: Vincent Stehlé Cc: Masahiro Yamada Signed-off-by: Thomas Petazzoni --- board/arm/foundation-v8/readme.txt | 4 ++-- configs/arm_foundationv8_defconfig | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt index b5106f015ef8..cb0fe08b8755 100644 --- a/board/arm/foundation-v8/readme.txt +++ b/board/arm/foundation-v8/readme.txt @@ -3,14 +3,14 @@ ARM software simulator of the AArch64 architecture. First, one has to download the AArch64 software simulator from: - https://silver.arm.com/download/download.tm?pv=4807186 + https://armkeil.blob.core.windows.net/developer/Files/downloads/ecosystem-models/Foundation_Platform_11.20_15_Linux64.tgz Then, use the arm_foundationv8_defconfig configuration to build your Buildroot system. Finally, boot your system with: - ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \ + ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-9.3/Foundation_Platform \ --image output/images/linux-system.axf \ --block-device output/images/rootfs.ext2 \ --network=nat \ diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index 3c63f5dc76aa..102fe8fd09b9 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,15 +1,16 @@ BR2_aarch64=y -# Linux headers same as kernel, a 5.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.20" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BOOT_WRAPPER_AARCH64=y BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8-gicv3-psci" From c95eca4e2cc86be99b8955502b82ba84da7bb775 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 8 Mar 2023 09:50:47 +0100 Subject: [PATCH 0032/2890] package/htop: bump to version 3.2.2 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/htop/htop.hash | 4 ++-- package/htop/htop.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/htop/htop.hash b/package/htop/htop.hash index d43da134414c..12dc864de11d 100644 --- a/package/htop/htop.hash +++ b/package/htop/htop.hash @@ -1,5 +1,5 @@ -# From https://github.com/htop-dev/htop/releases/download/3.2.1/htop-3.2.1.tar.xz.sha256 -sha256 5a17121cf1c69d2f2e557c0b29d45a2c353ab983f644742e1c2e4ece15aa6cbb htop-3.2.1.tar.xz +# From https://github.com/htop-dev/htop/releases/download/3.2.2/htop-3.2.2.tar.xz.sha256 +sha256 bac9e9ab7198256b8802d2e3b327a54804dc2a19b77a5f103645b11c12473dc8 htop-3.2.2.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/htop/htop.mk b/package/htop/htop.mk index df2ec25908de..aafda5d48fae 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTOP_VERSION = 3.2.1 +HTOP_VERSION = 3.2.2 HTOP_SOURCE = htop-$(HTOP_VERSION).tar.xz HTOP_SITE = https://github.com/htop-dev/htop/releases/download/$(HTOP_VERSION) HTOP_DEPENDENCIES = ncurses From c4a2c66f6c9b479cedfde8774ac0ac386345334d Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 8 Mar 2023 09:50:55 +0100 Subject: [PATCH 0033/2890] package/libgtk3: bump to version 3.24.37 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 9fed2c9df2e8..22c37bf60565 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.36.sha256sum -sha256 27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691 gtk+-3.24.36.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.37.sha256sum +sha256 6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57 gtk+-3.24.37.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 283c129cef9b..18a8a9fa428e 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).36 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).37 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From f969665d8f66864a760693b42b395a93cb4020a1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 8 Mar 2023 09:51:03 +0100 Subject: [PATCH 0034/2890] package/pango: bump to version 1.50.14 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index 1dbc5c9197fb..3e609e6e0483 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/pango/1.50/pango-1.50.12.sha256sum -sha256 caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3 pango-1.50.12.tar.xz +# From https://download.gnome.org/sources/pango/1.50/pango-1.50.14.sha256sum +sha256 1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8 pango-1.50.14.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index f19faf05021e..723e6d22889d 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).12 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).14 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = https://download.gnome.org/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES From 5bfc02c0ad879f3e692cbe0330317e6a35507651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Mon, 6 Mar 2023 22:16:46 +0100 Subject: [PATCH 0035/2890] package/openfpgaloader: fix typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a typo in the name of two configuration options. This repairs the selection of libgpiod support. Signed-off-by: Vincent Stehlé Cc: Jean Burgat Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 9 +++++++++ package/openfpgaloader/Config.in | 2 +- package/openfpgaloader/openfpgaloader.mk | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7f69462f2ec1..1d247fe1a0c9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,15 @@ endif ############################################################################### +comment "Legacy options removed in 2023.05" + +config BR2_PACAKGE_OPENFPGALOADER_CMSIS + bool "openfpgaloader cmsis option name fixed" + select BR2_LEGACY + help + A typo on BR2_PACAKGE_OPENFPGALOADER_CMSIS was fixed by + renaming the option to BR2_PACKAGE_OPENFPGALOADER_CMSIS. + comment "Legacy options removed in 2023.02" config BR2_KERNEL_HEADERS_6_0 diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index 4ba01d12d3bd..bd83ad415ba6 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_OPENFPGALOADER if BR2_PACKAGE_OPENFPGALOADER -config BR2_PACAKGE_OPENFPGALOADER_CMSIS +config BR2_PACKAGE_OPENFPGALOADER_CMSIS bool "CMSIS-DAP support" depends on BR2_PACKAGE_HAS_UDEV # hidapi depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # hidapi diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index 042b16612e45..6d7fbd985076 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -17,14 +17,14 @@ else OPENFPGALOADER_CONF_OPTS += -DENABLE_UDEV=OFF endif -ifeq ($(BR2_PACAKGE_OPENFPGALOADER_CMSIS),y) +ifeq ($(BR2_PACKAGE_OPENFPGALOADER_CMSIS),y) OPENFPGALOADER_DEPENDENCIES += hidapi OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=ON else OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=OFF endif -ifeq ($(BR2_PACAKGE_OPENFPGALOADER_LIBGPIOD),y) +ifeq ($(BR2_PACKAGE_OPENFPGALOADER_LIBGPIOD),y) OPENFPGALOADER_DEPENDENCIES += libgpiod OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=ON else From b07c7eb6f48004753e0959b304f8489132ff7b39 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 7 Mar 2023 11:05:25 +0200 Subject: [PATCH 0036/2890] package/strace: bump to version 6.2 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/strace/strace.hash | 4 ++-- package/strace/strace.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 9478fbd45974..d49abf1f161a 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.1/strace-6.1.tar.xz.asc -sha256 2579e9cec37dbb786f6ea0bebd15f40dd561ef2bde2a2a2ecdce5963b01859fd strace-6.1.tar.xz +# https://strace.io/files/6.2/strace-6.2.tar.xz.asc +sha256 0c7d38a449416268d3004029a220a15a77c2206a03cc88120f37f46e949177e8 strace-6.2.tar.xz sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index cbb574559e67..730a91d27721 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.1 +STRACE_VERSION = 6.2 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From d1b87a346a0c0b775ee44ec7090bee03ba8be7ba Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 7 Mar 2023 10:35:02 +0100 Subject: [PATCH 0037/2890] board/qemu/aarch64-sbsa: use PARTLABEL to specify root Specifying /dev/sda2 is ambigious, and when booting my arm64 machine this tries to mount the second partition of my ATA drive, instead of the second partition of the USB-stick, simply because the ATA driver is probed earlier than the USB controller driver. To solve this problem, use PARTLABEL=root to specify the root filesystem. This is similar to how it is currently done for board/aarch64-efi/grub.cfg and board/qemu/aarch64-ebbr/grub.cfg. Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni --- board/qemu/aarch64-sbsa/grub.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/aarch64-sbsa/grub.cfg b/board/qemu/aarch64-sbsa/grub.cfg index cd486caf4c52..39b7842f8f32 100644 --- a/board/qemu/aarch64-sbsa/grub.cfg +++ b/board/qemu/aarch64-sbsa/grub.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /Image root=/dev/sda2 rootwait console=ttyAMA0 + linux /Image root=PARTLABEL=root rootwait console=ttyAMA0 } From 92f6a843b81479a9c8f8769d9e728767646b9901 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 7 Mar 2023 10:35:03 +0100 Subject: [PATCH 0038/2890] board/qemu/aarch64-sbsa: use the default console specified by ACPI ARM SBBR (Server Base Boot Requirements) defines SPCR (Serial Port Console Redirection Table) as a mandatory ACPI table that specifies the configuration of a serial console. In the linux kernel, ARM developers have decided that consoles defined by SPCR are always enabled when existing, see e.g.: https://lore.kernel.org/linux-serial/20200430161438.17640-1-alpernebiyasak@gmail.com/T/ Specifying console=ttyAMA0 (which is a serial console) is thus redundant for an ARM SBSA board. (It also blindly assumes that the serial console is on ttyAMA0, which might not be true.) Drop the explicit console=ttyAMA0 on the kernel command line, such that the kernel can pick up the default console defined by SPCR. This is similar to how it is currently done for board/aarch64-efi/grub.cfg. Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni --- board/qemu/aarch64-sbsa/grub.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/aarch64-sbsa/grub.cfg b/board/qemu/aarch64-sbsa/grub.cfg index 39b7842f8f32..d99e19c4cd52 100644 --- a/board/qemu/aarch64-sbsa/grub.cfg +++ b/board/qemu/aarch64-sbsa/grub.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /Image root=PARTLABEL=root rootwait console=ttyAMA0 + linux /Image root=PARTLABEL=root rootwait } From 3ecff27df15c2c22f7b9d8f7554119bc0346ff5b Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 7 Mar 2023 10:35:04 +0100 Subject: [PATCH 0039/2890] support/testing: move the kernel config only used by test_edk2.py The kernel config board/qemu/aarch64-sbsa/linux.config has never been in use by qemu_aarch64_sbsa_defconfig, neither via BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE, nor via BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES. test_edk2.py is using the kernel config board/qemu/aarch64-sbsa/linux.config. However, storing a kernel config that is not used by qemu_aarch64_sbsa_defconfig, in a directory that is "owned" by qemu_aarch64_sbsa_defconfig, is bound to cause confusion. Therefore, move the config file to a new subdirectory: support/testing/tests/boot/test_edk2/ This is similar to how e.g. test_grub.py has a subdirectory: support/testing/tests/boot/test_grub/ where it keeps the kernel config that is only used by test_grub.py. Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni --- support/testing/tests/boot/test_edk2.py | 2 +- .../testing/tests/boot/test_edk2}/linux.config | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {board/qemu/aarch64-sbsa => support/testing/tests/boot/test_edk2}/linux.config (100%) diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py index c1be8fad95d3..623e77e99252 100644 --- a/support/testing/tests/boot/test_edk2.py +++ b/support/testing/tests/boot/test_edk2.py @@ -18,7 +18,7 @@ class TestEdk2(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y - BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-sbsa/linux.config" + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="support/testing/tests/boot/test_edk2/linux.config" BR2_TARGET_EDK2=y BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y BR2_TARGET_GRUB2=y diff --git a/board/qemu/aarch64-sbsa/linux.config b/support/testing/tests/boot/test_edk2/linux.config similarity index 100% rename from board/qemu/aarch64-sbsa/linux.config rename to support/testing/tests/boot/test_edk2/linux.config From da3ef3e8b828cc99f49c95ad6bef39c55f87e512 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 11 Mar 2023 13:46:06 +0100 Subject: [PATCH 0040/2890] package/lsof: bump to version 4.98.0 For change log since 4.96.5, see: - https://github.com/lsof-org/lsof/releases/tag/4.97.0 - https://github.com/lsof-org/lsof/releases/tag/4.98.0 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/lsof/lsof.hash | 2 +- package/lsof/lsof.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lsof/lsof.hash b/package/lsof/lsof.hash index 29cf443a2449..b6a29b3ceab2 100644 --- a/package/lsof/lsof.hash +++ b/package/lsof/lsof.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e9030af1123ff052ab69e12ef55b8a17dc47ac4bccfba85ee1ca1f31acf29607 lsof-4.96.5.tar.gz +sha256 80308a614508814ac70eb2ae1ed2c4344dcf6076fa60afc7734d6b1a79e62b16 lsof-4.98.0.tar.gz sha256 32a728188b19bf86917659d904ab29d0a294b4506e1c98b8b7f1c70ab4975fe1 dialects/linux/dproto.h diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index fd5887141b1a..66911dddb914 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -4,7 +4,7 @@ # ################################################################################ -LSOF_VERSION = 4.96.5 +LSOF_VERSION = 4.98.0 LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION)) LSOF_LICENSE = lsof license # License is repeated in each file, this is a relatively small one. From 773535fbac1acd9bc08cde5b44db0d4c1e19de31 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 11 Mar 2023 13:46:07 +0100 Subject: [PATCH 0041/2890] support/testing/tests/package/test_lsof.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_lsof.py | 41 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 support/testing/tests/package/test_lsof.py diff --git a/DEVELOPERS b/DEVELOPERS index d052e59122a6..7733d5a04ef7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1719,6 +1719,7 @@ F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_libjxl.py +F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py diff --git a/support/testing/tests/package/test_lsof.py b/support/testing/tests/package/test_lsof.py new file mode 100644 index 000000000000..b0478dfbb707 --- /dev/null +++ b/support/testing/tests/package/test_lsof.py @@ -0,0 +1,41 @@ +import os + +import infra.basetest + + +class TestLsof(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_LSOF=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + test_file = "/tmp/this-is-a-test-file" + + # Check the program can execute + self.assertRunOk("lsof -v") + + # Check a normal program invocation + self.assertRunOk("lsof") + + # Check lsof fails if requested file is not opened + _, exit_code = self.emulator.run("lsof {}".format(test_file)) + self.assertNotEqual(exit_code, 0) + + # Open the test file from the shell on descriptor 10 + self.assertRunOk("exec 10> {}".format(test_file)) + + # Check that lsof now show the file + output, exit_code = self.emulator.run("lsof {}".format(test_file)) + self.assertEqual(exit_code, 0) + # output[0] is the lsof header line + self.assertIn(test_file, output[1]) From f32176a7671d8842b175077a92e268226fcec78f Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Fri, 10 Mar 2023 10:01:53 +0100 Subject: [PATCH 0042/2890] package/libgit2: bump to version 1.6.2 * Fix the license because libgit2 has been using some android code without attribution. This explains the change of the hash in the license file, which now includes the text of the BSD-2-Clause license. * Building in-source is accidentely broken in this release and upstream recommends a separate build directory anyway, so use a separate build directory. * Some win32-specific declarations use wchar_t, add an upstreamed patch to avoid a dependency to wchar_t elsewhere. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- ...clare-win32-functions-on-non-win32-p.patch | 35 +++++++++++++++++++ package/libgit2/libgit2.hash | 4 +-- package/libgit2/libgit2.mk | 7 ++-- 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch diff --git a/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch b/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch new file mode 100644 index 000000000000..6be66ffee3a4 --- /dev/null +++ b/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch @@ -0,0 +1,35 @@ +From 20811c5aa9c528405eaa3f88ff22a9adebafa9e6 Mon Sep 17 00:00:00 2001 +From: Nicolas Cavallari +Date: Wed, 8 Mar 2023 14:00:52 +0100 +Subject: [PATCH] sysdir: Do not declare win32 functions on non-win32 platforms + +These declaration poses problems on some embedded or retro Linux systems +that deliberately disable support for wchar_t from their libc. + +Signed-off-by: Nicolas Cavallari +[Retrieved from: +https://github.com/libgit2/libgit2/commit/20811c5aa9c528405eaa3f88ff22a9adebafa9e6] +--- + src/libgit2/sysdir.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libgit2/sysdir.h b/src/libgit2/sysdir.h +index 1d15bbf43..03f59e1de 100644 +--- a/src/libgit2/sysdir.h ++++ b/src/libgit2/sysdir.h +@@ -134,10 +134,12 @@ extern int git_sysdir_set(git_sysdir_t which, const char *paths); + */ + extern int git_sysdir_reset(void); + ++#ifdef GIT_WIN32 + /** Sets the registry system dir to a mock; for testing. */ + extern int git_win32__set_registry_system_dir(const wchar_t *mock_sysdir); + + /** Find the given system dir; for testing. */ + extern int git_win32__find_system_dirs(git_str *out, const char *subdir); ++#endif + + #endif +-- +2.39.2 + diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index e834525df599..baf43c66f744 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz -sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING +sha256 d557fbf35557bb5df53cbf38ae0081edb4a36494ec0d19741fa673e509245f8f libgit2-1.6.2.tar.gz +sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index c962c8030fd1..b31f5199e1c8 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,14 +4,15 @@ # ################################################################################ -LIBGIT2_VERSION = 1.5.1 +LIBGIT2_VERSION = 1.6.2 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ MIT (sha1), \ BSD-3-Clause (sha256), \ wildmatch license (wildmatch), \ - CC0-1.0 (xoroshiro256) + CC0-1.0 (xoroshiro256), \ + BSD-2-Clause (basename_r) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES @@ -24,6 +25,8 @@ LIBGIT2_CONF_OPTS = \ -DUSE_NTLMCLIENT=OFF \ -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) +LIBGIT2_SUPPORTS_IN_SOURCE_BUILD = NO + LIBGIT2_DEPENDENCIES = zlib libhttpparser # If libiconv is available (for !locale toolchains), then we can use From 6a8e1e220fb283d57f07d68e96312a5215afd517 Mon Sep 17 00:00:00 2001 From: Luca Pesce Date: Fri, 10 Mar 2023 14:48:31 +0100 Subject: [PATCH 0043/2890] package/libwebsockets: enable libev and libevent support indipendently libev and libevent can be enabled at the same time since version 4.1.0, thanks to the event lib support refactoring into plugins, which is enabled by default for unix platform builds (LWS_WITH_EVLIB_PLUGINS=ON): https://github.com/warmcat/libwebsockets/commit/c6c7ab2b4498c62bf9461b36395d8466e023575d In this way, libwebsockets can be compiled with both libev and libevent support, which is then user-selectable at runtime. This basically restores the behavior changed by previous commit 27f257e. Signed-off-by: Luca Pesce Signed-off-by: Thomas Petazzoni --- package/libwebsockets/libwebsockets.mk | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index 79624948a573..fb0ee6688326 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -57,18 +57,16 @@ endif ifeq ($(BR2_PACKAGE_LIBEV),y) LIBWEBSOCKETS_DEPENDENCIES += libev -LIBWEBSOCKETS_CONF_OPTS += \ - -DLWS_WITH_LIBEV=ON \ - -DLWS_WITH_LIBEVENT=OFF -else ifeq ($(BR2_PACKAGE_LIBEVENT),y) +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=ON +else +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBEVENT),y) LIBWEBSOCKETS_DEPENDENCIES += libevent -LIBWEBSOCKETS_CONF_OPTS += \ - -DLWS_WITH_LIBEV=OFF \ - -DLWS_WITH_LIBEVENT=ON +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=ON else -LIBWEBSOCKETS_CONF_OPTS += \ - -DLWS_WITH_LIBEV=OFF \ - -DLWS_WITH_LIBEVENT=OFF +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=OFF endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) From 9ce280ba180f8668bfcd92175842a3c2d9567223 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Thu, 9 Mar 2023 23:04:14 +0100 Subject: [PATCH 0044/2890] package/libcamera-apps: bump to version 1.1.2 Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- ...ass-VIDIOC_QUERYCAP-as-unsigned-long.patch | 35 ------------------- package/libcamera-apps/libcamera-apps.hash | 2 +- package/libcamera-apps/libcamera-apps.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch diff --git a/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch deleted file mode 100644 index fbd1d2d4ba1f..000000000000 --- a/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a65682a97e19f96b86aeceb3ca3befb1687e3861 Mon Sep 17 00:00:00 2001 -From: Marcus Folkesson -Date: Tue, 31 Jan 2023 09:14:15 +0100 -Subject: [PATCH] core: pass VIDIOC_QUERYCAP as unsigned long - -VIDIOC_QUARYCAP is an unsigned long and should be passed as one. - -Get rid of the following error: -core/libcamera_app.cpp:33:22: error: overflow in conversion from 'long unsigned int' to 'int' changes value from '2154321408' to '-2140645888' [-Werror=overflow] - 33 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); - -Upstream: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 -Signed-off-by: Marcus Folkesson ---- - core/libcamera_app.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/core/libcamera_app.cpp b/core/libcamera_app.cpp -index 04696fb..8cb6563 100644 ---- a/core/libcamera_app.cpp -+++ b/core/libcamera_app.cpp -@@ -30,7 +30,9 @@ static void check_camera_stack() - return; - - v4l2_capability caps; -- int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); -+ unsigned long request = VIDIOC_QUERYCAP; -+ -+ int ret = ioctl(fd, request, &caps); - close(fd); - - if (ret < 0 || strcmp((char *)caps.driver, "bm2835 mmal")) --- -2.38.1 - diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash index fbb3150cb53e..20a06aa8fe09 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c05e29e02da05fa92739941295d96dcb93324805f7b348ad182e7e29e7e0c520 libcamera-apps-1.1.1.tar.gz +sha256 a19f3960b97ec1c0d42df8af972868ff0d4c48be6096e7ac02dbaaa4c7c75636 libcamera-apps-1.1.2.tar.gz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a02648..ba45ab21ca4a 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 1.1.1 +LIBCAMERA_APPS_VERSION = 1.1.2 LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION)) LIBCAMERA_APPS_LICENSE = BSD-2-Clause LIBCAMERA_APPS_LICENSE_FILES = license.txt From b83550bd0c2bbfc894d1c82ec0ea330c8283deee Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 8 Mar 2023 18:25:33 +0100 Subject: [PATCH 0045/2890] package/janus-gateway: bump to version 1.1.2 Remove patch applied upstream. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- ...se-parentheses-to-ensure-compilation.patch | 27 ------------------- package/janus-gateway/janus-gateway.hash | 2 +- package/janus-gateway/janus-gateway.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch diff --git a/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch b/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch deleted file mode 100644 index f91c13d1f6ac..000000000000 --- a/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 51431c36cd5f2997c0f7723909195b9883ae0486 Mon Sep 17 00:00:00 2001 -From: Benson Muite -Date: Wed, 4 Jan 2023 13:33:36 +0300 -Subject: [PATCH] Use parentheses to ensure compilation (#3138) - -Compiler fails with latest Curl release. Use parenthesis to ensure compiler evaluates expression correctly. - -[Retrieved from: -https://github.com/meetecho/janus-gateway/commit/51431c36cd5f2997c0f7723909195b9883ae0486] -Signed-off-by: Fabrice Fontaine ---- - src/turnrest.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/turnrest.c b/src/turnrest.c -index b8560d22f2..42e6114de8 100644 ---- a/src/turnrest.c -+++ b/src/turnrest.c -@@ -165,7 +165,7 @@ janus_turnrest_response *janus_turnrest_request(const char *user) { - JANUS_LOG(LOG_VERB, "Sending request: %s\n", request_uri); - janus_mutex_unlock(&api_mutex); - curl_easy_setopt(curl, CURLOPT_URL, request_uri); -- curl_easy_setopt(curl, api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST, 1); -+ curl_easy_setopt(curl, (api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST), 1); - if(!api_http_get) { - /* FIXME Some servers don't like a POST with no data */ - curl_easy_setopt(curl, CURLOPT_POSTFIELDS, query_string); diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index 7a87ae737a77..a147a8afff27 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bb83c19d6137e39833e8eb2b1deeecb33b5d19d4f503d51703bdcc478c447940 janus-gateway-1.1.1.tar.gz +sha256 f721d62a22b38ba3a341a5502f06b8b3a5a4f7bd0e9cc6c53de257fe99695e17 janus-gateway-1.1.2.tar.gz sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index dd898563e5c4..786bc211d4db 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 1.1.1 +JANUS_GATEWAY_VERSION = 1.1.2 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING From 7cc92e463771f5542d796a73ff7aadce8cf09b0f Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Mon, 6 Mar 2023 07:45:28 -0600 Subject: [PATCH 0046/2890] package/ethtool: bump to version 6.2 Drop our patches as they are included in the new version. Signed-off-by: Vincent Fazio Reviewed-by: Florian Fainelli Signed-off-by: Thomas Petazzoni --- package/ethtool/0001-uapi-Bring-in-if.h.patch | 483 ------------------ ...2-marvell.c-Fix-build-with-musl-libc.patch | 71 --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 4 files changed, 2 insertions(+), 556 deletions(-) delete mode 100644 package/ethtool/0001-uapi-Bring-in-if.h.patch delete mode 100644 package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch diff --git a/package/ethtool/0001-uapi-Bring-in-if.h.patch b/package/ethtool/0001-uapi-Bring-in-if.h.patch deleted file mode 100644 index faf264f61f14..000000000000 --- a/package/ethtool/0001-uapi-Bring-in-if.h.patch +++ /dev/null @@ -1,483 +0,0 @@ -From fd02caa75918401f2cb75af1f2a181c1959e070d Mon Sep 17 00:00:00 2001 -From: Florian Fainelli -Date: Sat, 14 Jan 2023 08:34:09 -0800 -Subject: [PATCH] uapi: Bring in if.h - -Bring in if.h from commit eec517cdb481 ("net: Add IF_OPER_TESTING") as -well as uapi/linux/hdlc/ioctl.h. Ensure that we define all of the -necessary guards to provide updated definitions of ifmap, ifreq and -IFNAMSIZ. This resolves build issues with kernel headers < 4.11 which -lacked 2618be7dccf8739b89e1906b64bd8d551af351e6 ("uapi: fix linux/if.h -userspace compilation errors"). - -Fixes: 1fa60003a8b8 ("misc: header includes cleanup") -Reported-by: Markus Mayer -Signed-off-by: Florian Fainelli -Message-Id: <20230114163411.3290201-2-f.fainelli@gmail.com> - -[Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20230114163411.3290201-2-f.fainelli@gmail.com/] -[vfazio@gmail.com: fix whitespace issues] -Signed-off-by: Vincent Fazio ---- - Makefile.am | 6 +- - internal.h | 7 +- - uapi/linux/hdlc/ioctl.h | 94 +++++++++++++ - uapi/linux/if.h | 296 ++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 397 insertions(+), 6 deletions(-) - create mode 100644 uapi/linux/hdlc/ioctl.h - create mode 100644 uapi/linux/if.h - -diff --git a/Makefile.am b/Makefile.am -index 663f40a..691a20e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,7 +7,8 @@ EXTRA_DIST = LICENSE ethtool.8 ethtool.spec.in aclocal.m4 ChangeLog autogen.sh - - sbin_PROGRAMS = ethtool - ethtool_SOURCES = ethtool.c uapi/linux/ethtool.h internal.h \ -- uapi/linux/net_tstamp.h rxclass.c common.c common.h \ -+ uapi/linux/net_tstamp.h uapi/linux/if.h uapi/linux/hdlc/ioctl.h \ -+ rxclass.c common.c common.h \ - json_writer.c json_writer.h json_print.c json_print.h \ - list.h - if ETHTOOL_ENABLE_PRETTY_DUMP -@@ -43,7 +44,8 @@ ethtool_SOURCES += \ - netlink/desc-rtnl.c netlink/cable_test.c netlink/tunnels.c \ - uapi/linux/ethtool_netlink.h \ - uapi/linux/netlink.h uapi/linux/genetlink.h \ -- uapi/linux/rtnetlink.h uapi/linux/if_link.h -+ uapi/linux/rtnetlink.h uapi/linux/if_link.h \ -+ uapi/linux/if.h uapi/linux/hdlc/ioctl.h - AM_CPPFLAGS += @MNL_CFLAGS@ - LDADD += @MNL_LIBS@ - endif -diff --git a/internal.h b/internal.h -index b80f77a..3923719 100644 ---- a/internal.h -+++ b/internal.h -@@ -21,6 +21,9 @@ - #include - #include - #include -+#define __UAPI_DEF_IF_IFNAMSIZ 1 -+#define __UAPI_DEF_IF_IFMAP 1 -+#define __UAPI_DEF_IF_IFREQ 1 - #include - - #include "json_writer.h" -@@ -52,10 +55,6 @@ typedef int32_t s32; - #define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) - #endif - --#ifndef ALTIFNAMSIZ --#define ALTIFNAMSIZ 128 --#endif -- - #include - #include - -diff --git a/uapi/linux/hdlc/ioctl.h b/uapi/linux/hdlc/ioctl.h -new file mode 100644 -index 0000000..b06341a ---- /dev/null -+++ b/uapi/linux/hdlc/ioctl.h -@@ -0,0 +1,94 @@ -+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -+#ifndef __HDLC_IOCTL_H__ -+#define __HDLC_IOCTL_H__ -+ -+ -+#define GENERIC_HDLC_VERSION 4 /* For synchronization with sethdlc utility */ -+ -+#define CLOCK_DEFAULT 0 /* Default setting */ -+#define CLOCK_EXT 1 /* External TX and RX clock - DTE */ -+#define CLOCK_INT 2 /* Internal TX and RX clock - DCE */ -+#define CLOCK_TXINT 3 /* Internal TX and external RX clock */ -+#define CLOCK_TXFROMRX 4 /* TX clock derived from external RX clock */ -+ -+ -+#define ENCODING_DEFAULT 0 /* Default setting */ -+#define ENCODING_NRZ 1 -+#define ENCODING_NRZI 2 -+#define ENCODING_FM_MARK 3 -+#define ENCODING_FM_SPACE 4 -+#define ENCODING_MANCHESTER 5 -+ -+ -+#define PARITY_DEFAULT 0 /* Default setting */ -+#define PARITY_NONE 1 /* No parity */ -+#define PARITY_CRC16_PR0 2 /* CRC16, initial value 0x0000 */ -+#define PARITY_CRC16_PR1 3 /* CRC16, initial value 0xFFFF */ -+#define PARITY_CRC16_PR0_CCITT 4 /* CRC16, initial 0x0000, ITU-T version */ -+#define PARITY_CRC16_PR1_CCITT 5 /* CRC16, initial 0xFFFF, ITU-T version */ -+#define PARITY_CRC32_PR0_CCITT 6 /* CRC32, initial value 0x00000000 */ -+#define PARITY_CRC32_PR1_CCITT 7 /* CRC32, initial value 0xFFFFFFFF */ -+ -+#define LMI_DEFAULT 0 /* Default setting */ -+#define LMI_NONE 1 /* No LMI, all PVCs are static */ -+#define LMI_ANSI 2 /* ANSI Annex D */ -+#define LMI_CCITT 3 /* ITU-T Annex A */ -+#define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */ -+ -+#ifndef __ASSEMBLY__ -+ -+typedef struct { -+ unsigned int clock_rate; /* bits per second */ -+ unsigned int clock_type; /* internal, external, TX-internal etc. */ -+ unsigned short loopback; -+} sync_serial_settings; /* V.35, V.24, X.21 */ -+ -+typedef struct { -+ unsigned int clock_rate; /* bits per second */ -+ unsigned int clock_type; /* internal, external, TX-internal etc. */ -+ unsigned short loopback; -+ unsigned int slot_map; -+} te1_settings; /* T1, E1 */ -+ -+typedef struct { -+ unsigned short encoding; -+ unsigned short parity; -+} raw_hdlc_proto; -+ -+typedef struct { -+ unsigned int t391; -+ unsigned int t392; -+ unsigned int n391; -+ unsigned int n392; -+ unsigned int n393; -+ unsigned short lmi; -+ unsigned short dce; /* 1 for DCE (network side) operation */ -+} fr_proto; -+ -+typedef struct { -+ unsigned int dlci; -+} fr_proto_pvc; /* for creating/deleting FR PVCs */ -+ -+typedef struct { -+ unsigned int dlci; -+ char master[IFNAMSIZ]; /* Name of master FRAD device */ -+}fr_proto_pvc_info; /* for returning PVC information only */ -+ -+typedef struct { -+ unsigned int interval; -+ unsigned int timeout; -+} cisco_proto; -+ -+typedef struct { -+ unsigned short dce; /* 1 for DCE (network side) operation */ -+ unsigned int modulo; /* modulo (8 = basic / 128 = extended) */ -+ unsigned int window; /* frame window size */ -+ unsigned int t1; /* timeout t1 */ -+ unsigned int t2; /* timeout t2 */ -+ unsigned int n2; /* frame retry counter */ -+} x25_hdlc_proto; -+ -+/* PPP doesn't need any info now - supply length = 0 to ioctl */ -+ -+#endif /* __ASSEMBLY__ */ -+#endif /* __HDLC_IOCTL_H__ */ -diff --git a/uapi/linux/if.h b/uapi/linux/if.h -new file mode 100644 -index 0000000..75ee7f4 ---- /dev/null -+++ b/uapi/linux/if.h -@@ -0,0 +1,296 @@ -+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ -+/* -+ * INET An implementation of the TCP/IP protocol suite for the LINUX -+ * operating system. INET is implemented using the BSD Socket -+ * interface as the means of communication with the user level. -+ * -+ * Global definitions for the INET interface module. -+ * -+ * Version: @(#)if.h 1.0.2 04/18/93 -+ * -+ * Authors: Original taken from Berkeley UNIX 4.3, (c) UCB 1982-1988 -+ * Ross Biro -+ * Fred N. van Kempen, -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+#ifndef _LINUX_IF_H -+#define _LINUX_IF_H -+ -+#include /* for compatibility with glibc */ -+#include /* for "__kernel_caddr_t" et al */ -+#include /* for "struct sockaddr" et al */ -+ /* for "__user" et al */ -+ -+#include /* for struct sockaddr. */ -+ -+#if __UAPI_DEF_IF_IFNAMSIZ -+#define IFNAMSIZ 16 -+#endif /* __UAPI_DEF_IF_IFNAMSIZ */ -+#define IFALIASZ 256 -+#define ALTIFNAMSIZ 128 -+#include -+ -+/* For glibc compatibility. An empty enum does not compile. */ -+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || \ -+ __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 -+/** -+ * enum net_device_flags - &struct net_device flags -+ * -+ * These are the &struct net_device flags, they can be set by drivers, the -+ * kernel and some can be triggered by userspace. Userspace can query and -+ * set these flags using userspace utilities but there is also a sysfs -+ * entry available for all dev flags which can be queried and set. These flags -+ * are shared for all types of net_devices. The sysfs entries are available -+ * via /sys/class/net//flags. Flags which can be toggled through sysfs -+ * are annotated below, note that only a few flags can be toggled and some -+ * other flags are always preserved from the original net_device flags -+ * even if you try to set them via sysfs. Flags which are always preserved -+ * are kept under the flag grouping @IFF_VOLATILE. Flags which are __volatile__ -+ * are annotated below as such. -+ * -+ * You should have a pretty good reason to be extending these flags. -+ * -+ * @IFF_UP: interface is up. Can be toggled through sysfs. -+ * @IFF_BROADCAST: broadcast address valid. Volatile. -+ * @IFF_DEBUG: turn on debugging. Can be toggled through sysfs. -+ * @IFF_LOOPBACK: is a loopback net. Volatile. -+ * @IFF_POINTOPOINT: interface is has p-p link. Volatile. -+ * @IFF_NOTRAILERS: avoid use of trailers. Can be toggled through sysfs. -+ * Volatile. -+ * @IFF_RUNNING: interface RFC2863 OPER_UP. Volatile. -+ * @IFF_NOARP: no ARP protocol. Can be toggled through sysfs. Volatile. -+ * @IFF_PROMISC: receive all packets. Can be toggled through sysfs. -+ * @IFF_ALLMULTI: receive all multicast packets. Can be toggled through -+ * sysfs. -+ * @IFF_MASTER: master of a load balancer. Volatile. -+ * @IFF_SLAVE: slave of a load balancer. Volatile. -+ * @IFF_MULTICAST: Supports multicast. Can be toggled through sysfs. -+ * @IFF_PORTSEL: can set media type. Can be toggled through sysfs. -+ * @IFF_AUTOMEDIA: auto media select active. Can be toggled through sysfs. -+ * @IFF_DYNAMIC: dialup device with changing addresses. Can be toggled -+ * through sysfs. -+ * @IFF_LOWER_UP: driver signals L1 up. Volatile. -+ * @IFF_DORMANT: driver signals dormant. Volatile. -+ * @IFF_ECHO: echo sent packets. Volatile. -+ */ -+enum net_device_flags { -+/* for compatibility with glibc net/if.h */ -+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS -+ IFF_UP = 1<<0, /* sysfs */ -+ IFF_BROADCAST = 1<<1, /* __volatile__ */ -+ IFF_DEBUG = 1<<2, /* sysfs */ -+ IFF_LOOPBACK = 1<<3, /* __volatile__ */ -+ IFF_POINTOPOINT = 1<<4, /* __volatile__ */ -+ IFF_NOTRAILERS = 1<<5, /* sysfs */ -+ IFF_RUNNING = 1<<6, /* __volatile__ */ -+ IFF_NOARP = 1<<7, /* sysfs */ -+ IFF_PROMISC = 1<<8, /* sysfs */ -+ IFF_ALLMULTI = 1<<9, /* sysfs */ -+ IFF_MASTER = 1<<10, /* __volatile__ */ -+ IFF_SLAVE = 1<<11, /* __volatile__ */ -+ IFF_MULTICAST = 1<<12, /* sysfs */ -+ IFF_PORTSEL = 1<<13, /* sysfs */ -+ IFF_AUTOMEDIA = 1<<14, /* sysfs */ -+ IFF_DYNAMIC = 1<<15, /* sysfs */ -+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */ -+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO -+ IFF_LOWER_UP = 1<<16, /* __volatile__ */ -+ IFF_DORMANT = 1<<17, /* __volatile__ */ -+ IFF_ECHO = 1<<18, /* __volatile__ */ -+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ -+}; -+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */ -+ -+/* for compatibility with glibc net/if.h */ -+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS -+#define IFF_UP IFF_UP -+#define IFF_BROADCAST IFF_BROADCAST -+#define IFF_DEBUG IFF_DEBUG -+#define IFF_LOOPBACK IFF_LOOPBACK -+#define IFF_POINTOPOINT IFF_POINTOPOINT -+#define IFF_NOTRAILERS IFF_NOTRAILERS -+#define IFF_RUNNING IFF_RUNNING -+#define IFF_NOARP IFF_NOARP -+#define IFF_PROMISC IFF_PROMISC -+#define IFF_ALLMULTI IFF_ALLMULTI -+#define IFF_MASTER IFF_MASTER -+#define IFF_SLAVE IFF_SLAVE -+#define IFF_MULTICAST IFF_MULTICAST -+#define IFF_PORTSEL IFF_PORTSEL -+#define IFF_AUTOMEDIA IFF_AUTOMEDIA -+#define IFF_DYNAMIC IFF_DYNAMIC -+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */ -+ -+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO -+#define IFF_LOWER_UP IFF_LOWER_UP -+#define IFF_DORMANT IFF_DORMANT -+#define IFF_ECHO IFF_ECHO -+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ -+ -+#define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\ -+ IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT) -+ -+#define IF_GET_IFACE 0x0001 /* for querying only */ -+#define IF_GET_PROTO 0x0002 -+ -+/* For definitions see hdlc.h */ -+#define IF_IFACE_V35 0x1000 /* V.35 serial interface */ -+#define IF_IFACE_V24 0x1001 /* V.24 serial interface */ -+#define IF_IFACE_X21 0x1002 /* X.21 serial interface */ -+#define IF_IFACE_T1 0x1003 /* T1 telco serial interface */ -+#define IF_IFACE_E1 0x1004 /* E1 telco serial interface */ -+#define IF_IFACE_SYNC_SERIAL 0x1005 /* can't be set by software */ -+#define IF_IFACE_X21D 0x1006 /* X.21 Dual Clocking (FarSite) */ -+ -+/* For definitions see hdlc.h */ -+#define IF_PROTO_HDLC 0x2000 /* raw HDLC protocol */ -+#define IF_PROTO_PPP 0x2001 /* PPP protocol */ -+#define IF_PROTO_CISCO 0x2002 /* Cisco HDLC protocol */ -+#define IF_PROTO_FR 0x2003 /* Frame Relay protocol */ -+#define IF_PROTO_FR_ADD_PVC 0x2004 /* Create FR PVC */ -+#define IF_PROTO_FR_DEL_PVC 0x2005 /* Delete FR PVC */ -+#define IF_PROTO_X25 0x2006 /* X.25 */ -+#define IF_PROTO_HDLC_ETH 0x2007 /* raw HDLC, Ethernet emulation */ -+#define IF_PROTO_FR_ADD_ETH_PVC 0x2008 /* Create FR Ethernet-bridged PVC */ -+#define IF_PROTO_FR_DEL_ETH_PVC 0x2009 /* Delete FR Ethernet-bridged PVC */ -+#define IF_PROTO_FR_PVC 0x200A /* for reading PVC status */ -+#define IF_PROTO_FR_ETH_PVC 0x200B -+#define IF_PROTO_RAW 0x200C /* RAW Socket */ -+ -+/* RFC 2863 operational status */ -+enum { -+ IF_OPER_UNKNOWN, -+ IF_OPER_NOTPRESENT, -+ IF_OPER_DOWN, -+ IF_OPER_LOWERLAYERDOWN, -+ IF_OPER_TESTING, -+ IF_OPER_DORMANT, -+ IF_OPER_UP, -+}; -+ -+/* link modes */ -+enum { -+ IF_LINK_MODE_DEFAULT, -+ IF_LINK_MODE_DORMANT, /* limit upward transition to dormant */ -+ IF_LINK_MODE_TESTING, /* limit upward transition to testing */ -+}; -+ -+/* -+ * Device mapping structure. I'd just gone off and designed a -+ * beautiful scheme using only loadable modules with arguments -+ * for driver options and along come the PCMCIA people 8) -+ * -+ * Ah well. The get() side of this is good for WDSETUP, and it'll -+ * be handy for debugging things. The set side is fine for now and -+ * being very small might be worth keeping for clean configuration. -+ */ -+ -+/* for compatibility with glibc net/if.h */ -+#if __UAPI_DEF_IF_IFMAP -+struct ifmap { -+ unsigned long mem_start; -+ unsigned long mem_end; -+ unsigned short base_addr; -+ unsigned char irq; -+ unsigned char dma; -+ unsigned char port; -+ /* 3 bytes spare */ -+}; -+#endif /* __UAPI_DEF_IF_IFMAP */ -+ -+struct if_settings { -+ unsigned int type; /* Type of physical device or protocol */ -+ unsigned int size; /* Size of the data allocated by the caller */ -+ union { -+ /* {atm/eth/dsl}_settings anyone ? */ -+ raw_hdlc_proto *raw_hdlc; -+ cisco_proto *cisco; -+ fr_proto *fr; -+ fr_proto_pvc *fr_pvc; -+ fr_proto_pvc_info *fr_pvc_info; -+ x25_hdlc_proto *x25; -+ -+ /* interface settings */ -+ sync_serial_settings *sync; -+ te1_settings *te1; -+ } ifs_ifsu; -+}; -+ -+/* -+ * Interface request structure used for socket -+ * ioctl's. All interface ioctl's must have parameter -+ * definitions which begin with ifr_name. The -+ * remainder may be interface specific. -+ */ -+ -+/* for compatibility with glibc net/if.h */ -+#if __UAPI_DEF_IF_IFREQ -+struct ifreq { -+#define IFHWADDRLEN 6 -+ union -+ { -+ char ifrn_name[IFNAMSIZ]; /* if name, e.g. "en0" */ -+ } ifr_ifrn; -+ -+ union { -+ struct sockaddr ifru_addr; -+ struct sockaddr ifru_dstaddr; -+ struct sockaddr ifru_broadaddr; -+ struct sockaddr ifru_netmask; -+ struct sockaddr ifru_hwaddr; -+ short ifru_flags; -+ int ifru_ivalue; -+ int ifru_mtu; -+ struct ifmap ifru_map; -+ char ifru_slave[IFNAMSIZ]; /* Just fits the size */ -+ char ifru_newname[IFNAMSIZ]; -+ void * ifru_data; -+ struct if_settings ifru_settings; -+ } ifr_ifru; -+}; -+#endif /* __UAPI_DEF_IF_IFREQ */ -+ -+#define ifr_name ifr_ifrn.ifrn_name /* interface name */ -+#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -+#define ifr_addr ifr_ifru.ifru_addr /* address */ -+#define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-p lnk */ -+#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */ -+#define ifr_netmask ifr_ifru.ifru_netmask /* interface net mask */ -+#define ifr_flags ifr_ifru.ifru_flags /* flags */ -+#define ifr_metric ifr_ifru.ifru_ivalue /* metric */ -+#define ifr_mtu ifr_ifru.ifru_mtu /* mtu */ -+#define ifr_map ifr_ifru.ifru_map /* device map */ -+#define ifr_slave ifr_ifru.ifru_slave /* slave device */ -+#define ifr_data ifr_ifru.ifru_data /* for use by interface */ -+#define ifr_ifindex ifr_ifru.ifru_ivalue /* interface index */ -+#define ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */ -+#define ifr_qlen ifr_ifru.ifru_ivalue /* Queue length */ -+#define ifr_newname ifr_ifru.ifru_newname /* New name */ -+#define ifr_settings ifr_ifru.ifru_settings /* Device/proto settings*/ -+ -+/* -+ * Structure used in SIOCGIFCONF request. -+ * Used to retrieve interface configuration -+ * for machine (useful for programs which -+ * must know all networks accessible). -+ */ -+ -+/* for compatibility with glibc net/if.h */ -+#if __UAPI_DEF_IF_IFCONF -+struct ifconf { -+ int ifc_len; /* size of buffer */ -+ union { -+ char *ifcu_buf; -+ struct ifreq *ifcu_req; -+ } ifc_ifcu; -+}; -+#endif /* __UAPI_DEF_IF_IFCONF */ -+ -+#define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */ -+#define ifc_req ifc_ifcu.ifcu_req /* array of structures */ -+ -+#endif /* _LINUX_IF_H */ --- -2.25.1 - diff --git a/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch b/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch deleted file mode 100644 index f13edbbe506e..000000000000 --- a/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch +++ /dev/null @@ -1,71 +0,0 @@ -From a26296eea68aa6c16b253f34825c9b9007269672 Mon Sep 17 00:00:00 2001 -From: Florian Fainelli -Date: Sat, 14 Jan 2023 08:34:11 -0800 -Subject: [PATCH] marvell.c: Fix build with musl-libc - -After commit 1fa60003a8b8 ("misc: header includes cleanup") we stopped -including net/if.h which resolved the proper defines to pull in -sys/types.h and provide a definition for u_int32_t. With musl-libc we -would need to define _GNU_SOURCE to ensure that sys/types.h does provide a -definition for u_int32_t. - -Rather, just replace u_uint{16,32}_t with the more standard -uint{16,32}_t types from stdint.h - -Fixes: 1fa60003a8b8 ("misc: header includes cleanup") -Signed-off-by: Florian Fainelli - -[Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20230114163411.3290201-4-f.fainelli@gmail.com/] -Signed-off-by: Vincent Fazio ---- - marvell.c | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/marvell.c b/marvell.c -index d3d570e..3f3aed8 100644 ---- a/marvell.c -+++ b/marvell.c -@@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p) - static void dump_queue(const char *name, const void *a, int rx) - { - struct desc { -- u_int32_t ctl; -- u_int32_t next; -- u_int32_t data_lo; -- u_int32_t data_hi; -- u_int32_t status; -- u_int32_t timestamp; -- u_int16_t csum2; -- u_int16_t csum1; -- u_int16_t csum2_start; -- u_int16_t csum1_start; -- u_int32_t addr_lo; -- u_int32_t addr_hi; -- u_int32_t count_lo; -- u_int32_t count_hi; -- u_int32_t byte_count; -- u_int32_t csr; -- u_int32_t flag; -+ uint32_t ctl; -+ uint32_t next; -+ uint32_t data_lo; -+ uint32_t data_hi; -+ uint32_t status; -+ uint32_t timestamp; -+ uint16_t csum2; -+ uint16_t csum1; -+ uint16_t csum2_start; -+ uint16_t csum1_start; -+ uint32_t addr_lo; -+ uint32_t addr_hi; -+ uint32_t count_lo; -+ uint32_t count_hi; -+ uint32_t byte_count; -+ uint32_t csr; -+ uint32_t flag; - }; - const struct desc *d = a; - --- -2.25.1 - diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 609085aa5e54..846ca7efc3f9 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90 ethtool-6.1.tar.xz +sha256 86df0114064d4d73f6bf72bf03e85c33964a519ee0c1d1ba65005ad2d0e570e1 ethtool-6.2.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index 3381344e0a5b..a35e274bc442 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 6.1 +ETHTOOL_VERSION = 6.2 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From c4cad5405fdd5def2d713a0bd14dc3c29b7bfb36 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 6 Mar 2023 19:40:50 +0100 Subject: [PATCH 0047/2890] package/unrar: bump to version 6.2.6 Uptream does not provide a change log. The package now needs a C++11 compiler. For example, the source file "blake2s.hpp" is using the "constexpr" keyword. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/unrar/Config.in | 4 +++- package/unrar/unrar.hash | 2 +- package/unrar/unrar.mk | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/unrar/Config.in b/package/unrar/Config.in index 29696c35aa95..8a3def699b55 100644 --- a/package/unrar/Config.in +++ b/package/unrar/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_UNRAR bool "unrar" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR help @@ -8,6 +9,7 @@ config BR2_PACKAGE_UNRAR http://www.rarlab.com/rar_add.htm -comment "unrar needs a toolchain w/ C++, wchar, threads" +comment "unrar needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index 40e05a1a320c..bc8f98687562 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 de75b6136958173fdfc530d38a0145b72342cf0d3842bf7bb120d336602d88ed unrarsrc-6.1.7.tar.gz +sha256 0c2d4cbc8b34d0e3bec7b474e0f52bbcc6c4320ec089b4141223ee355f63c318 unrarsrc-6.2.6.tar.gz sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index fee9fb753bbb..f59d199558ec 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 6.1.7 +UNRAR_VERSION = 6.2.6 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = https://www.rarlab.com/rar UNRAR_LICENSE = unrar @@ -13,7 +13,7 @@ UNRAR_CPE_ID_VENDOR = rarlab define UNRAR_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) CXX="$(TARGET_CXX)" STRIP="/bin/true" \ - CXXFLAGS="$(TARGET_CXXFLAGS) -pthread" \ + CXXFLAGS="$(TARGET_CXXFLAGS) -pthread -std=c++11" \ LDFLAGS="$(TARGET_LDFLAGS) -pthread" -C $(@D) endef From 3e48f8358e519f9c24262a6549d8f6c78ee01add Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 6 Mar 2023 22:14:35 +0100 Subject: [PATCH 0048/2890] package/gsl: bump to version 2.7.1 For change log since 2.6, see: https://git.savannah.gnu.org/cgit/gsl.git/tree/NEWS?h=release-2-7 This 2.7.1 version includes a minor libtool version fixup on top of 2.7: https://git.savannah.gnu.org/cgit/gsl.git/commit/?id=77e7c7d008707dace56626020eaa6181912e9841 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gsl/gsl.hash | 2 +- package/gsl/gsl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gsl/gsl.hash b/package/gsl/gsl.hash index 0d40a75497e7..153ae4131d44 100644 --- a/package/gsl/gsl.hash +++ b/package/gsl/gsl.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8 gsl-2.6.tar.gz +sha256 dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b gsl-2.7.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk index 3604f9836c8a..575cb754621a 100644 --- a/package/gsl/gsl.mk +++ b/package/gsl/gsl.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSL_VERSION = 2.6 +GSL_VERSION = 2.7.1 GSL_SITE = $(BR2_GNU_MIRROR)/gsl GSL_INSTALL_STAGING = YES GSL_LICENSE = GPL-3.0 From af2cfc61a2a3e630824ac693d961b74f858c0407 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 12 Mar 2023 10:22:15 +0100 Subject: [PATCH 0049/2890] package/pcre2: update _SITE url The pcre2 url [1] is now redirecting to [2]. This change was announced in upstream commit [3] which was already included in pcre2 10.41. This commit updates the PCRE2_SITE url accordingly. The package version remains unchanged. [1] https://github.com/PhilipHazel/pcre2 [2] https://github.com/PCRE2Project/pcre2 [3] https://github.com/PCRE2Project/pcre2/commit/66b3cb34dfe5411cb2bb939a8f4981081815d496 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/pcre2/pcre2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index aba378cab6b5..c35056f8a263 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -5,7 +5,7 @@ ################################################################################ PCRE2_VERSION = 10.42 -PCRE2_SITE = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(PCRE2_VERSION) +PCRE2_SITE = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause PCRE2_LICENSE_FILES = LICENCE From 69053186c9f1561855357be574c70c0b3ad0ddcb Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 1 Mar 2023 23:01:58 +0100 Subject: [PATCH 0050/2890] package/kexec: bump to version 2.0.26 See release announce: https://lists.infradead.org/pipermail/kexec/2022-December/026399.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 34e17339b974..4e16a53a3571 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 7ce2e5def38ec04f79feb107d02243dd586fbc68569eccf02f44bad3a13ec07d kexec-tools-2.0.25.tar.xz +sha256 7fe36a064101cd5c515e41b2be393dce3ca88adce59d6ee668e0af7c0c4570cd kexec-tools-2.0.26.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index ced7009ed3f7..c1411f6ab751 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.25 +KEXEC_VERSION = 2.0.26 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 From af9769ad23c67f9bd4d1b038709d41230501efef Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Wed, 1 Mar 2023 10:22:53 +0100 Subject: [PATCH 0051/2890] package/htpdate: bump to version 1.3.7 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/htpdate/htpdate.hash | 2 +- package/htpdate/htpdate.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index f572fb1e843b..b711773af5ae 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 3cdc558ec8e53ef374a42490b2f28c0b23981fa8754a6d7182044707828ad1e9 htpdate-1.3.6.tar.gz +sha256 88c52fe475308ee95f560fd7cf68c75bc6e9a6abf56be7fed203a7f762fe7ab2 htpdate-1.3.7.tar.gz sha256 7989949df09a0489434723c571541604cd3f2e0418c6a6aa9179bfaf8ec807cc LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 2d4a11dd9db6..20be904d3d6c 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTPDATE_VERSION = 1.3.6 +HTPDATE_VERSION = 1.3.7 HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE From f69c972ae613719c0ebc5395ba3084c408023102 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 3 Mar 2023 23:26:58 +0100 Subject: [PATCH 0052/2890] support/testing/tests/package/test_kexec.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/package/test_kexec.py | 93 +++++++++++++++++++ .../package/test_kexec/linux-kexec.fragment | 5 + 3 files changed, 100 insertions(+) create mode 100644 support/testing/tests/package/test_kexec.py create mode 100644 support/testing/tests/package/test_kexec/linux-kexec.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 7733d5a04ef7..f6e120d92b99 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1718,6 +1718,8 @@ F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_kexec.py +F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_ncdu.py diff --git a/support/testing/tests/package/test_kexec.py b/support/testing/tests/package/test_kexec.py new file mode 100644 index 000000000000..77e383373e79 --- /dev/null +++ b/support/testing/tests/package/test_kexec.py @@ -0,0 +1,93 @@ +import os + +import infra.basetest + + +class TestKexec(infra.basetest.BRTest): + + # A specific configuration is needed for using kexec: + # - We use Aarch64 since it is well supported for kexec, + # - A kernel config fragment enables all the kexec parts, + # - The kernel Image is installed on target filesystem to be + # reloaded through kexec, + # - We use a ext4 rootfs image exposed as a virtio storage (rather + # than cpio initrd). This avoids needing to install the initrd + # inside the rootfs. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.15" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" + BR2_LINUX_KERNEL_INSTALL_TARGET=y + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_KEXEC=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """.format( + infra.filepath("tests/package/test_kexec/linux-kexec.fragment") + ) + + def test_run(self): + hda = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + # Notes: + # Sufficient memory is needed to load the kernel: having at + # least 512MB works. kexec could silently fail if not enough + # memory is present. KASLR needs to be disabled for the test: + # we pass "nokaslr" to kernel bootargs, and also pass + # "dtb-kaslr-seed=off" to qemu virt machine. + bootargs = ["root=/dev/vda console=ttyAMA0 nokaslr"] + qemu_opts = ["-M", "virt,dtb-kaslr-seed=off", "-cpu", "cortex-a57", "-m", "512M", + "-drive", f"file={hda},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # Test the program can execute + self.assertRunOk("kexec --version") + + # Check the kexec kernel is NOT loaded: + self.assertRunOk("test \"$(cat /sys/kernel/kexec_loaded)\" -eq 0") + + # Load the Kernel: + # "--append br-test" adds a dummy kernel args we'll be able to + # check in the second executed kernel. + # We use the dtb image from /sys/firmware/fdt (since we don't + # have the dtb file in the system) + self.assertRunOk("kexec -d -l --dtb=/sys/firmware/fdt --reuse-cmdline --serial=ttyAMA0 --append=br-test /boot/Image") + + # Check the kexec kernel IS loaded: + self.assertRunOk("test \"$(cat /sys/kernel/kexec_loaded)\" -eq 1") + + # Create a marker file in tmpfs which is supposed to disappear + # after kexec kernel restart. + self.assertRunOk("touch /dev/shm/br-kexec-marker") + + # Execute the loaded kernel (i.e perform a kexec reboot) + # qemu.sendline() is used here because no exit code nor + # program return is expected, since kexec is like a + # reboot. The login is expected to be reached after the + # command is issued. + self.emulator.qemu.sendline("kexec -d -e") + + # Wait for the login, and log again + self.emulator.login() + + # Check the "br-test" dummy kernel arg is present + self.assertRunOk("grep br-test /proc/cmdline") + + # Check the test marker file is no longer here + self.assertRunOk("test ! -e /dev/shm/br-kexec-marker") + + # After restart, the kernel is not supposed to have a kexec + # loaded image: + self.assertRunOk("test \"$(cat /sys/kernel/kexec_loaded)\" -eq 0") diff --git a/support/testing/tests/package/test_kexec/linux-kexec.fragment b/support/testing/tests/package/test_kexec/linux-kexec.fragment new file mode 100644 index 000000000000..04c65f5cae1b --- /dev/null +++ b/support/testing/tests/package/test_kexec/linux-kexec.fragment @@ -0,0 +1,5 @@ +CONFIG_KEXEC=y +CONFIG_KEXEC_FILE=y +CONFIG_PROC_KCORE=y +CONFIG_DEBUG_KERNEL=y +CONFIG_KALLSYMS_ALL=y From f1c5671ffef3d68979f6514a687815abd4c1f357 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 4 Mar 2023 14:35:16 +0100 Subject: [PATCH 0053/2890] package/ola: bump to version 0.10.9 For change log, see: https://github.com/OpenLightingProject/ola/releases/tag/0.10.9 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ola/ola.hash | 2 +- package/ola/ola.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ola/ola.hash b/package/ola/ola.hash index 7565adabde0b..a1a5577ed3ef 100644 --- a/package/ola/ola.hash +++ b/package/ola/ola.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13 ola-0.10.8.tar.gz +sha256 44073698c147fe641507398253c2e52ff8dc7eac8606cbf286c29f37939a4ebf ola-0.10.9.tar.gz # License files (locally computed) sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 COPYING diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 82615e8155d4..efaa5b6e3e4a 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -4,7 +4,7 @@ # ################################################################################ -OLA_VERSION = 0.10.8 +OLA_VERSION = 0.10.9 OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION) OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE From 06fa870d7e8ba385de00e64116df74c1e3b9b31a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 4 Mar 2023 17:31:00 +0100 Subject: [PATCH 0054/2890] package/iperf3: bump to version 3.13 LICENSE file hash changed, due to year update. For change log, see: https://github.com/esnet/iperf/blob/3.13/RELNOTES.md#iperf-313-2023-02-16 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/iperf3/iperf3.hash | 6 +++--- package/iperf3/iperf3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index 15c75b6dac24..b2c89df98ab4 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.12.tar.gz.sha256 -sha256 72034ecfb6a7d6d67e384e19fb6efff3236ca4f7ed4c518d7db649c447e1ffd6 iperf-3.12.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.13.tar.gz.sha256 +sha256 bee427aeb13d6a2ee22073f23261f63712d82befaa83ac8cb4db5da4c2bdc865 iperf-3.13.tar.gz # Locally computed -sha256 a5c2e3d799f2835156e565a3de4fad33d32ed289cdc9e414dfaf75719fd12ef9 LICENSE +sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 9041c8657597..129319d78a9c 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.12 +IPERF3_VERSION = 3.13 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT From 620098889f74ad924676fca7d8d56eb401a7d0be Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 4 Mar 2023 17:31:01 +0100 Subject: [PATCH 0055/2890] support/testing/tests/package/test_iperf3.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_iperf3.py | 23 ++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 support/testing/tests/package/test_iperf3.py diff --git a/DEVELOPERS b/DEVELOPERS index f6e120d92b99..ff26021d1d51 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1718,6 +1718,7 @@ F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_iperf3.py F: support/testing/tests/package/test_kexec.py F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_libjxl.py diff --git a/support/testing/tests/package/test_iperf3.py b/support/testing/tests/package/test_iperf3.py new file mode 100644 index 000000000000..9aac4c6fd0b8 --- /dev/null +++ b/support/testing/tests/package/test_iperf3.py @@ -0,0 +1,23 @@ +import os + +import infra.basetest + + +class TestIperf3(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IPERF3=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("iperf3 --version") + self.assertRunOk("iperf3 -s -D") + self.assertRunOk("iperf3 -c 127.0.0.1 -t 3") From ce952170e1e8229da0bdac81566a627a87e56bee Mon Sep 17 00:00:00 2001 From: Casey Reeves Date: Sun, 26 Feb 2023 12:33:08 +0100 Subject: [PATCH 0056/2890] package/lzop: bump to version 1.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit lzop 1.04 uses libtool 2.4.2.418, which is right between 2.4.2 and 2.4.4. While our patch for 2.4 is also supposed to work up to and including 2.4.2.x, it does not work for libtool 2.4.2.418, which requires the patch for 2.4.4. We could change our infra to better pick the appropriate patch, but we do not know exactly which 2.4.2.x version is actually the cutting point that requires the 2.4.4 patch. Until we have more data point, let's handle the case in an ad-hoc manner for lzop. Additionally, we add a patch from Florian Bäuerle, which allows to set the mtime of the lzop archive for reproducible build support using SOURCE_DATE_EPOCH. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni --- ...1-allow-overriding-modification-time.patch | 42 ++++++++ package/lzop/0001-build-with-gcc6.patch | 37 ------- ...es-as-the-external-inline-definition.patch | 102 ------------------ package/lzop/lzop.hash | 2 +- package/lzop/lzop.mk | 15 ++- 5 files changed, 57 insertions(+), 141 deletions(-) create mode 100644 package/lzop/0001-allow-overriding-modification-time.patch delete mode 100644 package/lzop/0001-build-with-gcc6.patch delete mode 100644 package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch diff --git a/package/lzop/0001-allow-overriding-modification-time.patch b/package/lzop/0001-allow-overriding-modification-time.patch new file mode 100644 index 000000000000..5ffc64cd30e3 --- /dev/null +++ b/package/lzop/0001-allow-overriding-modification-time.patch @@ -0,0 +1,42 @@ +From: =?UTF-8?q?Florian=20B=C3=A4uerle?= +Date: Thu, 25 Oct 2018 17:26:30 +0200 +Subject: [PATCH] allow overriding modification time + +This patch allows to set the mtime of the lzop archive to +$SOURCE_DATE_EPOCH, required for reproducible build. It was submitted to +pengutronix by florian Bäuerle in october 2018. + +https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch + +Signed-off-by: Casey Reeves +--- + src/lzop.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/lzop.c b/src/lzop.c +index a540ad9c4d33..c2f877d16f92 100644 +--- a/src/lzop.c ++++ b/src/lzop.c +@@ -712,6 +712,7 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + assert(opt_method > 0); + assert(opt_level > 0); + assert(fip->st.st_mode == 0 || S_ISREG(fip->st.st_mode)); ++ const char *source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + + memset(h,0,sizeof(header_t)); + +@@ -748,7 +749,13 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + + h->mode = fix_mode_for_header(fip->st.st_mode); + +- if (fip->st.st_mtime > 0) ++ if (source_date_epoch) ++ { ++ time_t mtime = strtoul(source_date_epoch, NULL, 0); ++ h->mtime_low = (lzo_uint32) (mtime); ++ h->mtime_high = (lzo_uint32) ((mtime >> 16) >> 16); ++ } ++ else if (fip->st.st_mtime > 0) + { + h->mtime_low = (lzo_uint32) (fip->st.st_mtime); + h->mtime_high = (lzo_uint32) ((fip->st.st_mtime >> 16) >> 16); diff --git a/package/lzop/0001-build-with-gcc6.patch b/package/lzop/0001-build-with-gcc6.patch deleted file mode 100644 index 03bd887d5168..000000000000 --- a/package/lzop/0001-build-with-gcc6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jaap Crezee -Date: Sat, 25 june 2016 13:13:00 +0200 -Subject: [PATCH] fix compilation host-lzop with gcc-6 - -This patch allows host-lzop to be compiled with host systems containing gcc-6 - -Upstream patch found here: -https://build.opensuse.org/package/view_file/Archiving/lzop/lzop-1.03-gcc6.patch?expand=1 - -Signed-off-by: Jaap Crezee - ---- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 -+++ b/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch b/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch deleted file mode 100644 index f6d076a9f7c4..000000000000 --- a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 16 Aug 2015 10:35:47 -0700 -Subject: [PATCH] use static inlines as the external inline definition has - changed with gcc5 - -[Patch from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch] -Signed-off-by: Khem Raj -Signed-off-by: Peter Korsgaard ---- -Upstream-Status: Pending - - src/miniacc.h | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -diff --git a/src/miniacc.h b/src/miniacc.h -index 09e6f0c..cae98d1 100644 ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } --- -2.5.0 - diff --git a/package/lzop/lzop.hash b/package/lzop/lzop.hash index adc20648b664..99796dc8c93f 100644 --- a/package/lzop/lzop.hash +++ b/package/lzop/lzop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz +sha256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 lzop-1.04.tar.gz sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk index 55157c4d4880..d32d2d1d3bf5 100644 --- a/package/lzop/lzop.mk +++ b/package/lzop/lzop.mk @@ -4,13 +4,26 @@ # ################################################################################ -LZOP_VERSION = 1.03 +LZOP_VERSION = 1.04 LZOP_SITE = http://www.lzop.org/download LZOP_LICENSE = GPL-2.0+ LZOP_LICENSE_FILES = COPYING LZOP_DEPENDENCIES = lzo HOST_LZOP_DEPENDENCIES = host-lzo +# lzop uses libtool 2.4.2.418, which is right between 2.4.2 and +# 2.4.4. While our patch for 2.4 is also supposed to work up to and +# including 2.4.2.x, it does not work for libtool 2.4.2.418, which +# requires the patch for 2.4.4. So we disable the libtool patching +# from autotools-package and do our own. +LZOP_LIBTOOL_PATCH = NO + +define LZOP_LIBTOOL_FIXUP + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh +endef +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP +HOST_LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 38c581b05cd8e7967783410b36c14b9b561acd12 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 26 Feb 2023 14:18:38 +0100 Subject: [PATCH 0057/2890] configs/spike_riscv64: bump kernel to 6.1.14 Linux Kernel 6.1 now being officially promoted to be a LTS, this commit bump the kernel version of this defconfig to 6.1.14. A Kernel config fragment "linux.fragment" is now needed as the kernel no longer enable SBI v0.1 support and the earlycon RISC-V SBI in its riscv arch defconfig. See [1] [2]. The Spike riscv-isa-sim was updated upstream accordingly [3]. In order to keep a smooth transition, this kernel config fragment re-enable those options to make sure this kernel will work with both old Spike versions (not including commit [3] like the v1.1.0 currently included in Buildroot), and newer versions. This commit was also successfully tested with riscv-isa-sim at commit 0d1a48c0c0. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6f562570b9c5d6a3e30d87aec60a9d8f22a3203c [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3938d5a2f9369d1ebd56320629fed395ce327e9c [3] https://github.com/riscv-software-src/riscv-isa-sim/commit/191634d2854dfed448fc323195f9b65c305e2d77 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- board/spike/riscv64/linux.fragment | 3 +++ configs/spike_riscv64_defconfig | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 board/spike/riscv64/linux.fragment diff --git a/board/spike/riscv64/linux.fragment b/board/spike/riscv64/linux.fragment new file mode 100644 index 000000000000..b443b0ab364f --- /dev/null +++ b/board/spike/riscv64/linux.fragment @@ -0,0 +1,3 @@ +CONFIG_RISCV_SBI_V01=y +CONFIG_HVC_RISCV_SBI=y +CONFIG_SERIAL_EARLYCON_RISCV_SBI=y diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index e23f1ce32cd0..73ea566084fe 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -2,9 +2,10 @@ BR2_riscv=y BR2_RISCV_64=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/spike/riscv64/linux.fragment" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y From a1f00209c20e6d5fc2712c8b4746f3ac5d94df7f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 4 Mar 2023 20:49:27 +0100 Subject: [PATCH 0058/2890] package/harfbuzz: bump to version 7.1.0 Since the major release changed all the packages that have direct dependency to harfbuzz has been succesfully built: - efl - libass - mupdf - pango - qt5base - qt5webengine - qt6base - sdl2_ttf - supertuxkart - vlc - webkitgtk - wpewebkit Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 9489f25c6a58..e881f5851094 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz +sha256 f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b harfbuzz-7.1.0.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index b0112168e1b9..24c6f3ef27dc 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 5.3.1 +HARFBUZZ_VERSION = 7.1.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 0a46e6c1981c9a326c7cd3713bd312f9f9bc8f99 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 4 Mar 2023 19:53:41 +0100 Subject: [PATCH 0059/2890] package/mtools: bump to version 4.0.42 Release announce: https://lists.gnu.org/archive/html/info-mtools/2022-10/msg00000.html For change log since 4.0.38, see: https://svn.savannah.gnu.org/viewvc/mtools/tags/4.0.42/NEWS?view=markup Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index a162bfdc95dd..b81830a7d2d0 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 7086821b399a39b8a3c5a372d064de4860f3c195b4911dd4e8b76219fcabe75c mtools-4.0.38.tar.lz +sha256 40a98fd9bcc865997866015013c3c64a304d98c2892fe4ab892ffd6ac3dd9bae mtools-4.0.42.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index c875814bc7e0..407ac1a2c6f8 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.38 +MTOOLS_VERSION = 4.0.42 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ From c6c79d6d40e37fada0c50430f27b9aeaf68bae74 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 1 Mar 2023 00:55:47 +0100 Subject: [PATCH 0060/2890] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.66 bluez 5.66 contains various fixes and initial support for Basic Audio Profile and Volume Control Profile. Signed-off-by: Stefan Agner Signed-off-by: Thomas Petazzoni --- package/bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 565511120fec..8ca3764935f6 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.65 +BLUEZ5_UTILS_HEADERS_VERSION = 5.66 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index e0c9f3cdb935..9467647592d9 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4 bluez-5.65.tar.xz +sha256 39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574 bluez-5.66.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 76070dc3a90f..4059b3455656 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.65 +BLUEZ5_UTILS_VERSION = 5.66 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES From bcf9d2f51cd5c80191b63020412631a548e32a7d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 28 Feb 2023 21:27:20 +0100 Subject: [PATCH 0061/2890] package/openmpi: bump to version 4.1.5 For change log, see: https://github.com/open-mpi/ompi/blob/v4.1.5/NEWS#L61 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/openmpi/openmpi.hash | 6 +++--- package/openmpi/openmpi.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index 745ed7c58053..567ffe483331 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ # From: https://www.open-mpi.org/software/ompi/v4.1/ -md5 f057e12aabaf7dd5a6a658180fca404e openmpi-4.1.4.tar.bz2 -sha1 357c61a8e06e103d987c0e4a054e8780a034c8b1 openmpi-4.1.4.tar.bz2 -sha256 92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d openmpi-4.1.4.tar.bz2 +md5 bb045df2d600744c2231c78b31a20da3 openmpi-4.1.5.tar.bz2 +sha1 eba2e6f9ee0c39fbca0a8cf53a79c9ed29643284 openmpi-4.1.5.tar.bz2 +sha256 a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3 openmpi-4.1.5.tar.bz2 # Locally computed sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index f14b55ced53a..82a4b3eb1cad 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -5,7 +5,7 @@ ################################################################################ OPENMPI_VERSION_MAJOR = 4.1 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).4 +OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).5 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause @@ -15,7 +15,7 @@ OPENMPI_INSTALL_STAGING = YES # The macro searching for IME (Infinite Memory Engine) filesystem # brings "-I/usr/local/include" in the CPPFLAGS, even if not # found. This makes the configuration fail. See: -# https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 +# https://github.com/open-mpi/ompi/blob/v4.1.5/config/ompi_check_ime.m4#L35 # Disable explicitly to avoid the issue. OPENMPI_CONF_OPTS = --without-ime From 9c3cdee11a21380f8141ec4379f8a67dea4481a7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 Mar 2023 20:27:31 +0100 Subject: [PATCH 0062/2890] support/testing/tests/package/test_shadow.py: drop blank line at end of file Fixes: support/testing/tests/package/test_shadow.py:55:1: W391 blank line at end of file 1 W391 blank line at end of file make: *** [Makefile:1253: check-flake8] Error 123 https://gitlab.com/buildroot.org/buildroot/-/jobs/3918132888 Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_shadow.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/package/test_shadow.py b/support/testing/tests/package/test_shadow.py index c5151b4fdb76..09b580de5974 100644 --- a/support/testing/tests/package/test_shadow.py +++ b/support/testing/tests/package/test_shadow.py @@ -52,4 +52,3 @@ def test_usermod(self): self.assertRunOk(f'usermod {username} --home {new_home}') self.assertRunOk(f'test $(su {username} -c \'echo $HOME\') = {new_home}') self.assertRunOk(f'userdel {username}') - From f50259d6a0c0e8ba2149aea04c7dc98fe4707abb Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 28 Feb 2023 08:20:36 +0100 Subject: [PATCH 0063/2890] package/dbus-broker: bump to release 33 This release contains mostly a bugfixes, with some improvements around error handling for unimplemented functionality and resiliency against runtime changes of dbus service-files. Also update hashes of license files. There was no change in license, the hashes changed due to copyright date bump and additional authors listend in the same files. Signed-off-by: Stefan Agner Signed-off-by: Thomas Petazzoni --- package/dbus-broker/dbus-broker.hash | 6 +++--- package/dbus-broker/dbus-broker.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash index f6c2cbe16026..06c8f229b794 100644 --- a/package/dbus-broker/dbus-broker.hash +++ b/package/dbus-broker/dbus-broker.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md @@ -11,7 +11,7 @@ sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subpro sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md -sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS -sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md +sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS +sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md sha256 7e660796fea0400a1a9a539226c345b3c656a745a334e323e33258de7864e985 subprojects/libcutf8-1/AUTHORS sha256 106099cc1c488cbf8911f56da7977a955f6b27a7bb5b815985e59d9fae0e6fe7 subprojects/libcutf8-1/README.md diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index e82b79220dad..c4e3679a2eb9 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_BROKER_VERSION = 32 +DBUS_BROKER_VERSION = 33 DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) From c53258975a583bdfbb99296274bd5e560db961c2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 12 Mar 2023 21:59:33 +0100 Subject: [PATCH 0064/2890] docs/website/news.html: add 2023.02 announcement link Signed-off-by: Peter Korsgaard --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index 9fbbe5b0b7f8..fec6b414e29c 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

2023.02 released

The stable 2023.02 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2023.02 release.

From f90fd1b8f4a368b1a586069c4f29d600e6705bd1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 12 Mar 2023 22:01:21 +0100 Subject: [PATCH 0065/2890] Kickoff 2023.05 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 634780b42124..3498f7226b52 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02 +export BR2_VERSION := 2023.05-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1678652000 From 30e96518cd7255048bcac024c20e203f51c377d4 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 27 Feb 2023 21:53:33 +0100 Subject: [PATCH 0066/2890] support/testing/tests/package/test_stress_ng.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../testing/tests/package/test_stress_ng.py | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 support/testing/tests/package/test_stress_ng.py diff --git a/DEVELOPERS b/DEVELOPERS index ff26021d1d51..e28b46967c19 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1736,6 +1736,7 @@ F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ +F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ diff --git a/support/testing/tests/package/test_stress_ng.py b/support/testing/tests/package/test_stress_ng.py new file mode 100644 index 000000000000..12fd6ec9e646 --- /dev/null +++ b/support/testing/tests/package/test_stress_ng.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestStressNG(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_STRESS_NG=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("stress-ng --version") + self.assertRunOk("stress-ng --cpu 1 --timeout 3") From 00553ea186357fd3e2b3c89fa560e9711cc67472 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 27 Feb 2023 21:53:34 +0100 Subject: [PATCH 0067/2890] package/stress-ng: bump to version V0.15.04 This commit dropped the patch, included upstream in: https://github.com/ColinIanKing/stress-ng/commit/5d419c790e648c7a2f96f34ed1b93b326f725545 which was included in V0.14.04. Three patches are also introduced to fix build issues (all upstream not but not yet in version). Also, this new version now depends on BR2_TOOLCHAIN_HAS_SYNC_4. Finally, a new _MAKE_FLAGS is introduced to prevent the package to modify too much its CFLAGS. For change log since V0.13.05, see: - https://github.com/ColinIanKing/stress-ng/blob/V0.15.04/debian/changelog or commit logs: - https://github.com/ColinIanKing/stress-ng/commits/V0.15.04 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...1-Makefile-fix-build-with-kernel-5.6.patch | 60 -------------- ...build-with-HAVE_SYSCALL-or-__NR_mmap.patch | 54 +++++++++++++ ...002-stress-regs-fix-build-on-riscv32.patch | 43 ++++++++++ ...introduce-PRESERVE_CFLAGS-build-flag.patch | 78 +++++++++++++++++++ package/stress-ng/Config.in | 2 + package/stress-ng/stress-ng.hash | 2 +- package/stress-ng/stress-ng.mk | 7 +- 7 files changed, 183 insertions(+), 63 deletions(-) delete mode 100644 package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch create mode 100644 package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch create mode 100644 package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch create mode 100644 package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch diff --git a/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch b/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch deleted file mode 100644 index 4c62da32413e..000000000000 --- a/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5d419c790e648c7a2f96f34ed1b93b326f725545 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 13 Aug 2022 17:17:05 +0200 -Subject: [PATCH] Makefile: fix build with kernel < 5.6 - -Fix the following build failure with kernel >= 5.1 and < 5.5 (i.e. -before -https://github.com/torvalds/linux/commit/9e3aa61ae3e01ce1ce6361a41ef725e1f4d1d2bf) -raised since version 0.11.21 and -https://github.com/ColinIanKing/stress-ng/commit/3d6fccdbe53d0cbcb75dd4b91571aaaae7ee1ad4: - -In file included from stress-io-uring.c:26: -io-uring.h:1:9: error: macro names must be identifiers - 1 | #define #define HAVE_IORING_OP_NOP 0 - | ^ - -Moreover, IORING_OP_FALLOCATE is not available before kernel 5.6 and -https://github.com/torvalds/linux/commit/d63d1b5edb7b832210bfde587ba9e7549fa064eb - -Fixes: - - http://autobuild.buildroot.org/results/1bf3f2bbc849bdce531d56b1024fa87f0c1ae667 - -Signed-off-by: Fabrice Fontaine -[Retrieved (and backported) from -https://github.com/ColinIanKing/stress-ng/commit/5d419c790e648c7a2f96f34ed1b93b326f725545] ---- - Makefile | 2 +- - stress-io-uring.c | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 2f9cc9918..ee17ae08b 100644 ---- a/Makefile -+++ b/Makefile -@@ -528,7 +528,7 @@ stress-personality.c: personality.h - # - io-uring.h: - $(V)$(CPP) $(CFLAGS) core-io-uring.c | $(GREP) IORING_OP | sed 's/,//' | \ -- sed 's/IORING_OP_/#define HAVE_IORING_OP_/' > io-uring.h -+ sed 's/.*\(IORING_OP_.*\)/#define HAVE_\1/' > io-uring.h - $(Q)echo "MK io-uring.h" - - stress-io-uring.c: io-uring.h -diff --git a/stress-io-uring.c b/stress-io-uring.c -index ab9fd0749..84f463611 100644 ---- a/stress-io-uring.c -+++ b/stress-io-uring.c -@@ -311,7 +311,11 @@ static inline int stress_io_uring_complete( - break; - - cqe = &cring->cqes[head & *submit->cq_ring.ring_mask]; -- if ((cqe->res < 0) && (opcode != IORING_OP_FALLOCATE)) { -+ if ((cqe->res < 0) -+#ifdef HAVE_IORING_OP_FALLOCATE -+ && (opcode != IORING_OP_FALLOCATE) -+#endif -+ ) { - const int err = abs(cqe->res); - - /* Silently ignore EOPNOTSUPP completion errors */ diff --git a/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch b/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch new file mode 100644 index 000000000000..41a264713333 --- /dev/null +++ b/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch @@ -0,0 +1,54 @@ +From 625dd7e458e6aa488f7dd4764e4a62b6fbf79a9d Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Thu, 23 Feb 2023 21:54:16 +0100 +Subject: [PATCH] stress-mmap: fix build with HAVE_SYSCALL or __NR_mmap2 is + undefined + +Commit afae500a added macro tests for defined(HAVE_SYSCALL) and +system call numbers. + +More specifically, in stress-mmap.c, function mmap2_try() was defined +only if __NR_mmap2 is defined. See: +https://github.com/ColinIanKing/stress-ng/commit/afae500a23b198b9df421ad0fd9270fcdf65c3fb#diff-ffb0db2473f6c5e1b93dd33bce389ee836671a628fff9f903d097733f7ddfc9c + +This commit forgot to replicate the same test when the mmap2_try() +function is used later at: +https://github.com/ColinIanKing/stress-ng/blob/50f3ef2560e928c4694894be0bb652e663af5076/stress-mmap.c#L754 + +When HAVE_SYSCALL or __NR_mmap2 is undefined, compilation fails with: + + stress-mmap.c: In function 'stress_mmap': + stress-mmap.c:809:31: error: 'mmap2_try' undeclared (first use in this function); did you mean 'mmap_prot'? + context.mmap = (mmap_func_t)mmap2_try; + ^~~~~~~~~ + mmap_prot + stress-mmap.c:809:31: note: each undeclared identifier is reported only once for each function it appears in + +This patch fixes this issue. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/3da49180fdfa8a70307569202ed9431f5295913e + +Signed-off-by: Julien Olivain +--- + stress-mmap.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/stress-mmap.c b/stress-mmap.c +index cf343078..68f5a9b8 100644 +--- a/stress-mmap.c ++++ b/stress-mmap.c +@@ -805,7 +805,9 @@ static int stress_mmap(const stress_args_t *args) + context.mmap_file = true; + + if (mmap_mmap2) { +-#if defined(HAVE_MMAP2) ++#if defined(HAVE_MMAP2) && \ ++ defined(HAVE_SYSCALL) && \ ++ defined(__NR_mmap2) + context.mmap = (mmap_func_t)mmap2_try; + #else + if (args->instance == 0) +-- +2.39.2 + diff --git a/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch b/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch new file mode 100644 index 000000000000..cb2a507bfdfd --- /dev/null +++ b/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch @@ -0,0 +1,43 @@ +From 40309f5d313524f4189f4ef158920391e92e226d Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Thu, 23 Feb 2023 21:38:25 +0100 +Subject: [PATCH] stress-regs: fix build on riscv32 + +RISC-V register test routine is using 64bit registers only. +When compiling on 32bit RISC-V, compilation fails with output: + + stress-regs.c: In function 'stress_regs_helper': + stress-regs.c:485:27: error: register specified for 's1' isn't suitable for data type + 485 | register uint64_t s1 __asm__("s1") = v; + | ^~ + stress-regs.c:495:27: error: register specified for 's11' isn't suitable for data type + 495 | register uint64_t s11 __asm__("s11") = s1 ^ 0xa5a5a5a5a5a5a5a5ULL; + | ^~~ + +This patch fix this issue by protecting the stress_regs_helper() +function with an additional test, to restrict to 64bit. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/6c335ac3abba535e79ddbddf34591ef5b9ee0a96 + +Signed-off-by: Julien Olivain +--- + stress-regs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/stress-regs.c b/stress-regs.c +index 4d4d32d2..0ffac4d1 100644 +--- a/stress-regs.c ++++ b/stress-regs.c +@@ -473,7 +473,7 @@ do { \ + } + #endif + +-#if defined(STRESS_ARCH_RISCV) ++#if defined(STRESS_ARCH_RISCV) && (__riscv_xlen == 64) + + #define STRESS_REGS_HELPER + /* +-- +2.39.2 + diff --git a/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch b/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch new file mode 100644 index 000000000000..beb5429dc1cc --- /dev/null +++ b/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch @@ -0,0 +1,78 @@ +From d3ab0bad6afc2e8f4be70fe38dd24788f1b3d4be Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 24 Feb 2023 21:11:30 +0100 +Subject: [PATCH] Makefile: introduce PRESERVE_CFLAGS build flag + +The stress-ng Makefile includes many nice environment auto-detection +features to adjust compilation flags. This is very convenient in +many compilation use-cases. However, in some other specific cross +compilation environments, those automatic CFLAGS adjustments may +create compilation failures. + +For example, commit c00e695ed5 added -fstack-protector-strong if the +compiler recognize the flag. In some situations, for example a gcc +toolchain based on uClibc-ng without stack-protector libssp +enabled, gcc will recognize the option. Then, the Makefile adds the +option to CFLAGS, and the compilation/link fails at link time with an +error like: + + /toolchain/arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp_nonshared: No such file or directory + /toolchain/arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp: No such file or directory + +stress-ng is included in the Buildroot build system [1] [2], which +supports many architectures and toolchain configurations. This build +system carefully controls its CFLAGS. In such a case, it is +preferable for a package to avoid changing compilation flags. + +This patch introduces the PRESERVE_CFLAGS Makefile variable which will +disable those CFLAGS adjustments, if set to 1. The current build +behavior is preserved if unset. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/3d87d50561505a5a79008c01e35fc2e100000160 + +[1] https://buildroot.org/ +[2] https://git.buildroot.org/buildroot/tree/package/stress-ng?h=2022.11.1 + +Signed-off-by: Julien Olivain +--- + Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Makefile b/Makefile +index 7a969aba..35151d74 100644 +--- a/Makefile ++++ b/Makefile +@@ -45,6 +45,7 @@ endif + # Test for hardening flags and apply them if applicable + # + MACHINE = $(shell uname -m) ++ifneq ($(PRESERVE_CFLAGS),1) + ifneq ($(MACHINE),$(filter $(MACHINE),alpha parisc)) + ifeq ($(shell $(CC) $(CFLAGS) -fstack-protector-strong -E -xc /dev/null > /dev/null 2>& 1 && echo 1),1) + CFLAGS += -fstack-protector-strong +@@ -58,6 +59,7 @@ ifeq ($(shell $(CC) $(CFLAGS) -D_FORTIFY_SOURCE=2 -E -xc /dev/null > /dev/null 2 + CFLAGS += -D_FORTIFY_SOURCE=2 + endif + endif ++endif + + # + # Expected build warnings +@@ -83,11 +85,13 @@ PRE_V= + PRE_Q=@# + endif + ++ifneq ($(PRESERVE_CFLAGS),1) + ifeq ($(findstring icc,$(CC)),icc) + CFLAGS += -no-inline-max-size -no-inline-max-total-size + CFLAGS += -axAVX,CORE-AVX2,CORE-AVX-I,CORE-AVX512,SSE2,SSE3,SSSE3,SSE4.1,SSE4.2,SANDYBRIDGE,SKYLAKE,SKYLAKE-AVX512,TIGERLAKE,SAPPHIRERAPIDS + CFLAGS += -ip -falign-loops -funroll-loops -ansi-alias -fma -qoverride-limits + endif ++endif + + #ifeq ($(findstring clang,$(CC)),clang) + #CFLAGS += -Weverything +-- +2.39.2 + diff --git a/package/stress-ng/Config.in b/package/stress-ng/Config.in index 839cbb1cc034..918c3db19478 100644 --- a/package/stress-ng/Config.in +++ b/package/stress-ng/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_STRESS_NG bool "stress-ng" depends on BR2_USE_MMU # fork() # perf.c needs PERF_COUNT_HW_REF_CPU_CYCLES + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 and ARC depends on !BR2_nios2 @@ -16,5 +17,6 @@ config BR2_PACKAGE_STRESS_NG comment "stress-ng needs a toolchain w/ headers >= 3.3" depends on !BR2_nios2 && !BR2_arc + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index 2e3f9987693b..5b967d2b9530 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3de49e1100866634f549e99c1644283d0cde817b844a69dcf7f80afa2227d350 stress-ng-0.13.05.tar.gz +sha256 92922b979b5ca6ee05b03fd792c32a0b25a01fea6161b418b5e672c64ffb549f stress-ng-0.15.04.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 0b2287c7fbca..28116b455d4e 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,11 +4,14 @@ # ################################################################################ -STRESS_NG_VERSION = 0.13.05 +STRESS_NG_VERSION = 0.15.04 STRESS_NG_SITE = $(call github,ColinIanKing,stress-ng,V$(STRESS_NG_VERSION)) STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING +STRESS_NG_MAKE_FLAGS = \ + PRESERVE_CFLAGS=1 + ifeq ($(BR2_PACKAGE_LIBBSD),y) STRESS_NG_DEPENDENCIES += libbsd endif @@ -18,7 +21,7 @@ STRESS_NG_DEPENDENCIES += keyutils endif define STRESS_NG_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(STRESS_NG_MAKE_FLAGS) endef # Don't use make install otherwise stress-ng will be rebuild without From acfe5c70b2301bc147ec524e7bc2d4a95e1cee66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Thu, 23 Feb 2023 09:56:04 +0100 Subject: [PATCH 0068/2890] package/rt-tests: bump version to 2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Szymanski Signed-off-by: Thomas Petazzoni --- package/rt-tests/rt-tests.hash | 2 +- package/rt-tests/rt-tests.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash index 49df8313f9fb..eb28f4d441a6 100644 --- a/package/rt-tests/rt-tests.hash +++ b/package/rt-tests/rt-tests.hash @@ -1,4 +1,4 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc -sha256 393457f0c91cce57e82b876ecb9b672871f898e6cecafc751548079512bcc808 rt-tests-2.4.tar.xz +sha256 2ed2e4c965c7f336a15d3354dec090e27a0b1e9ada91ae0b9ef18bbcb993874e rt-tests-2.5.tar.xz # locally computed hash sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index 74290211ce3f..8ad4215ee192 100644 --- a/package/rt-tests/rt-tests.mk +++ b/package/rt-tests/rt-tests.mk @@ -6,7 +6,7 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 2.4 +RT_TESTS_VERSION = 2.5 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING From 4c5ac7e0344ad858642955e571d9be547e7a146a Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 6 Mar 2023 16:51:35 +0100 Subject: [PATCH 0069/2890] package/rauc: bump to version 1.9 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/rauc/rauc.hash | 2 +- package/rauc/rauc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 8351d0266e8f..1cd5f7f31454 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d233247c1763b1c56c851d0adef2094b7aa2fcd72decf524a8ac0419188e0978 rauc-1.8.tar.xz +sha256 73802ce28d1045c757b547f5b4a222f0e825b5df77bca3464350278fc6fd200e rauc-1.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 0c81a6cc35c7..2baa25ec9ecd 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.8 +RAUC_VERSION = 1.9 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From 835858d79d554bc4753e8a691ae42f3162c88608 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 6 Mar 2023 16:52:53 +0100 Subject: [PATCH 0070/2890] package/rauc: switch to meson build Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/rauc/rauc.mk | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 2baa25ec9ecd..4168d6c2dbba 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -11,9 +11,10 @@ RAUC_LICENSE = LGPL-2.1 RAUC_LICENSE_FILES = COPYING RAUC_CPE_ID_VENDOR = pengutronix RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 +RAUC_CONF_OPTS += -Dtests=false ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) -RAUC_CONF_OPTS += --enable-service +RAUC_CONF_OPTS += -Dservice=true RAUC_DEPENDENCIES += dbus # systemd service uses dbus interface @@ -28,35 +29,35 @@ endef endif else -RAUC_CONF_OPTS += --disable-service +RAUC_CONF_OPTS += -Dservice=false endif ifeq ($(BR2_PACKAGE_RAUC_GPT),y) -RAUC_CONF_OPTS += --enable-gpt +RAUC_CONF_OPTS += -Dgpt=enabled RAUC_DEPENDENCIES += util-linux-libs else -RAUC_CONF_OPTS += --disable-gpt +RAUC_CONF_OPTS += -Dgpt=disabled endif ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) -RAUC_CONF_OPTS += --enable-network +RAUC_CONF_OPTS += -Dnetwork=true RAUC_DEPENDENCIES += libcurl else -RAUC_CONF_OPTS += --disable-network +RAUC_CONF_OPTS += -Dnetwork=false endif ifeq ($(BR2_PACKAGE_RAUC_JSON),y) -RAUC_CONF_OPTS += --enable-json +RAUC_CONF_OPTS += -Djson=enabled RAUC_DEPENDENCIES += json-glib else -RAUC_CONF_OPTS += --disable-json +RAUC_CONF_OPTS += -Djson=disabled endif ifeq ($(BR2_PACKAGE_RAUC_STREAMING),y) -RAUC_CONF_OPTS += --enable-streaming +RAUC_CONF_OPTS += -Dstreaming=true RAUC_DEPENDENCIES += libnl else -RAUC_CONF_OPTS += --disable-streaming +RAUC_CONF_OPTS += -Dstreaming=false endif HOST_RAUC_DEPENDENCIES = \ @@ -65,12 +66,13 @@ HOST_RAUC_DEPENDENCIES = \ host-libglib2 \ host-squashfs \ $(if $(BR2_PACKAGE_HOST_LIBP11),host-libp11) + HOST_RAUC_CONF_OPTS += \ - --disable-network \ - --disable-json \ - --disable-service \ - --without-dbuspolicydir \ - --with-systemdunitdir=no + -Dnetwork=false \ + -Dstreaming=false \ + -Djson=disabled \ + -Dservice=false \ + -Dtests=false -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) From ebb464a7d5809f7bc52fd7b21efcf441e7920f43 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 5 Mar 2023 12:14:10 +0100 Subject: [PATCH 0071/2890] package/ddrescue: bump to version 1.27 For change log, see the release announce: https://lists.gnu.org/archive/html/info-gnu/2023-01/msg00011.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ddrescue/ddrescue.hash | 4 ++-- package/ddrescue/ddrescue.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ddrescue/ddrescue.hash b/package/ddrescue/ddrescue.hash index f7c82b086bb3..3caec5667f7a 100644 --- a/package/ddrescue/ddrescue.hash +++ b/package/ddrescue/ddrescue.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2022-01/msg00013.html -sha256 e513cd3a90d9810dfdd91197d40aa40f6df01597bfb5ecfdfb205de1127c551f ddrescue-1.26.tar.lz +# From https://lists.gnu.org/archive/html/info-gnu/2023-01/msg00011.html +sha256 38c80c98c5a44f15e53663e4510097fd68d6ec20758efdf3a925037c183232eb ddrescue-1.27.tar.lz # Locally computed sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk index 6d16d8701faa..f4376a934001 100644 --- a/package/ddrescue/ddrescue.mk +++ b/package/ddrescue/ddrescue.mk @@ -4,7 +4,7 @@ # ################################################################################ -DDRESCUE_VERSION = 1.26 +DDRESCUE_VERSION = 1.27 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPL-2.0+ From 44b3aadffaaf26ec9c404dae8b6a8f231870fc63 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 5 Mar 2023 18:30:55 +0100 Subject: [PATCH 0072/2890] support/testing/tests/package/test_ddrescue.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + .../testing/tests/package/test_ddrescue.py | 94 +++++++++++++++++++ .../test_ddrescue/linux-ddrescue.fragment | 4 + 3 files changed, 100 insertions(+) create mode 100644 support/testing/tests/package/test_ddrescue.py create mode 100644 support/testing/tests/package/test_ddrescue/linux-ddrescue.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 9aa26418b563..6c3498484f45 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1729,6 +1729,8 @@ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_ddrescue.py +F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py diff --git a/support/testing/tests/package/test_ddrescue.py b/support/testing/tests/package/test_ddrescue.py new file mode 100644 index 000000000000..22069714218d --- /dev/null +++ b/support/testing/tests/package/test_ddrescue.py @@ -0,0 +1,94 @@ +import os + +import infra.basetest + + +class TestDdrescue(infra.basetest.BRTest): + + # A specific configuration is needed for testing ddrescue: + # - A kernel config fragment enables loop blk dev and device + # mapper dm-dust, which are used to simulate a failing storage + # block device. + # - dmraid user space package is needed to configure dm-dust + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.15" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_DDRESCUE=y + BR2_PACKAGE_DMRAID=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """.format( + infra.filepath("tests/package/test_ddrescue/linux-ddrescue.fragment") + ) + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", "-initrd", img]) + self.emulator.login() + + # Test variables: + dev_img = "/tmp/dev.img" + lo_dev = "/dev/loop0" + dm_dev_name = "dust0" + dm_dev = f"/dev/mapper/{dm_dev_name}" + ddrescue_img = "/tmp/ddrescue.img" + + # Test the program can execute + self.assertRunOk("ddrescue --version") + + # Create a 1MB file of zeroes for initial loopback block device + self.assertRunOk(f"dd if=/dev/zero of={dev_img} bs=1M count=1") + + # Setup lookback block device + self.assertRunOk(f"losetup {lo_dev} {dev_img}") + + # Create and setup dm-dust to simulate a failing block device + # The dev_img file is 1MB: 2048 blocks of 512 bytes each + self.assertRunOk(f"dmsetup create {dm_dev_name} --table '0 2048 dust {lo_dev} 0 512'") + + # Add few bad blocks and enable I/O error emulation + for badblock in [30, 40, 50, 60]: + self.assertRunOk(f"dmsetup message {dm_dev_name} 0 addbadblock {badblock}") + self.assertRunOk(f"dmsetup message {dm_dev_name} 0 enable") + + # Show device mapper status, to make debugging easier + self.assertRunOk(f"dmsetup status {dm_dev_name}") + + # A normal 'dd' is expected to fail with I/O error + cmd = f"dd if={dm_dev} of=/dev/null bs=512" + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Where a normal 'dd' fails, 'ddrescue' is expected to succeed + self.assertRunOk(f"ddrescue {dm_dev} {ddrescue_img}") + + # ddrescue does not normaly write any output data when there + # is I/O error on the input. The intent is to preserve any + # data that could have been read in a previous pass. There is + # one exception, when the output is a non-existing regular + # file, ddrescue will initialize it with zeroes the first + # time. Since the original image file was also including + # zeroes, the recovered image is expected to be the same as + # the original one. See ddrescue manual: + # https://www.gnu.org/software/ddrescue/manual/ddrescue_manual.html#Introduction + # "Ddrescue does not write zeros to the output when it finds + # bad sectors in the input, and does not truncate the output + # file if not asked to." + # https://www.gnu.org/software/ddrescue/manual/ddrescue_manual.html#Algorithm + # "If the output file is a regular file created by ddrescue, + # the areas marked as bad-sector will contain zeros." + self.assertRunOk(f"cmp {dev_img} {ddrescue_img}") diff --git a/support/testing/tests/package/test_ddrescue/linux-ddrescue.fragment b/support/testing/tests/package/test_ddrescue/linux-ddrescue.fragment new file mode 100644 index 000000000000..5cbe18a89fbe --- /dev/null +++ b/support/testing/tests/package/test_ddrescue/linux-ddrescue.fragment @@ -0,0 +1,4 @@ +CONFIG_BLK_DEV_LOOP=y +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_DUST=y From 655b18053a344927b9372ff88302b082b1dba2f0 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 4 Mar 2023 22:41:20 +0100 Subject: [PATCH 0073/2890] support/testing/tests/package/test_mtools.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_mtools.py | 72 ++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 support/testing/tests/package/test_mtools.py diff --git a/DEVELOPERS b/DEVELOPERS index 6c3498484f45..592c0e6b9c1f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1739,6 +1739,7 @@ F: support/testing/tests/package/test_kexec.py F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lsof.py +F: support/testing/tests/package/test_mtools.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py diff --git a/support/testing/tests/package/test_mtools.py b/support/testing/tests/package/test_mtools.py new file mode 100644 index 000000000000..51e5138481b5 --- /dev/null +++ b/support/testing/tests/package/test_mtools.py @@ -0,0 +1,72 @@ +import os + +import infra.basetest + + +class TestMtools(infra.basetest.BRTest): + # We use a glibc toolchain to have iconv conversion working for + # codepage 850. + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y + BR2_PACKAGE_MTOOLS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + dos_img = "dos-fat.img" + mtools_opts = f"-i {dos_img}" + + self.assertRunOk("mtools --version") + + # Create an empty image file to hold the FAT partition + self.assertRunOk(f"dd if=/dev/zero of={dos_img} bs=1M count=1") + + # Any Mtools command is expected to fail on an unformated + # partition. + cmd = f"minfo {mtools_opts} ::" + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Now, let's format the partition file to FAT + self.assertRunOk(f"mformat {mtools_opts} ::") + + # Run some Mtools commands on this empty partition + self.assertRunOk(f"minfo {mtools_opts} ::") + self.assertRunOk(f"mdir {mtools_opts} ::") + self.assertRunOk(f"mlabel {mtools_opts} -N 12345678 ::BUILDROOT") + + # Create a reference file on our Linux filesystem + self.assertRunOk("echo 'Hello Buildroot!' > file1.txt") + + # Copy the reference file into the DOS image, then perform + # various file manipulations + self.assertRunOk(f"mcopy {mtools_opts} file1.txt ::file2.txt") + self.assertRunOk(f"mcopy {mtools_opts} ::file2.txt ::file3.txt") + self.assertRunOk(f"mdel {mtools_opts} ::file2.txt") + self.assertRunOk(f"mren {mtools_opts} ::file3.txt ::file4.txt") + self.assertRunOk(f"mmd {mtools_opts} ::dir1") + self.assertRunOk(f"mmove {mtools_opts} ::file4.txt ::dir1") + self.assertRunOk(f"mdir {mtools_opts} ::dir1") + self.assertRunOk(f"mdu {mtools_opts} -a ::") + + # Copy back the file from the DOS image to the Linux + # filesystem + self.assertRunOk(f"mcopy {mtools_opts} ::dir1/file4.txt file5.txt") + + # We expect this last copied file to have the same content as + # the reference one created at the beginning + self.assertRunOk("cmp file1.txt file5.txt") + + # Delete a directory tree containing a file + self.assertRunOk(f"mdeltree {mtools_opts} ::dir1") From 6dfa40b9ab3d0425c7760f0b27e5ecc91c659bac Mon Sep 17 00:00:00 2001 From: Pedro Aguilar Date: Sun, 5 Mar 2023 17:51:30 +0100 Subject: [PATCH 0074/2890] package/guile: bump to version 3.0.9 Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni --- package/guile/guile.hash | 2 +- package/guile/guile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/guile/guile.hash b/package/guile/guile.hash index e9ae5b6e517b..b671edad9d3b 100644 --- a/package/guile/guile.hash +++ b/package/guile/guile.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 daa7060a56f2804e9b74c8d7e7fe8beed12b43aab2789a38585183fcc17b8a13 guile-3.0.8.tar.xz +sha256 1a2625ac72b2366e95792f3fe758fd2df775b4044a90a4a9787326e66c0d750d guile-3.0.9.tar.xz # Locally computed sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 9478e75b41f7..1d2e8038f0e4 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUILE_VERSION = 3.0.8 +GUILE_VERSION = 3.0.9 GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES From 0d8b27841fe6aad8e9bb4a083c3aeb863d3e0913 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 12 Mar 2023 22:59:45 +0100 Subject: [PATCH 0075/2890] package/kexec: add KEXEC_CPE_ID_{PRODUCT, VENDOR} cpe:2.3:a:kexec-tools_project:kexec-tools is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Akexec-tools_project%3Akexec-tools Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/kexec/kexec.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index c1411f6ab751..562b09012b63 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -9,6 +9,8 @@ KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 KEXEC_LICENSE_FILES = COPYING +KEXEC_CPE_ID_PRODUCT = kexec-tools +KEXEC_CPE_ID_VENDOR = kexec-tools_project KEXEC_SELINUX_MODULES = kdump # Makefile expects $STRIP -o to work, so needed for !BR2_STRIP_strip From 89944e2c459d45dd4271c49e35dd4a13dfd850a4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Mar 2023 23:02:53 +0100 Subject: [PATCH 0076/2890] package/{mesa3d, mesa3d-headers}: bump version to 23.0.0 Release notes: https://www.phoronix.com/news/Mesa-23.0-Released https://lists.freedesktop.org/archives/mesa-announce/2023-February/000706.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index ad1999a30dc9..a9ab1de8ea9c 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 22.3.5 +MESA3D_HEADERS_VERSION = 23.0.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 50c5bcc7fc6b..17dc2e7c0029 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.html -sha256 3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9 mesa-22.3.5.tar.xz -sha512 a4cad9b7e6501678fac279bd88a37e522633c7128afa8df04982f469c930e3557bb1d05b4b0f5ae16704d8d04e50c90a7489943a48861df17dd947704c329b85 mesa-22.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-February/000706.html +sha256 01f3cff3763f09e0adabcb8011e4aebc6ad48f6a4dd4bae904fe918707d253e4 mesa-23.0.0.tar.xz +sha512 127e2759a2a31cacd65a0891719ab7bb4a9188844022b4bccaebbedce9c550b9ccb160ad519178ea0d851c4bcb8f0f56febda248ed2ba82b5ddf804855e4694b mesa-23.0.0.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index a744334c5b04..a09c157b33b4 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 22.3.5 +MESA3D_VERSION = 23.0.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 406a9848d11a162db700b224ab55b1fccc0de711 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Mar 2023 23:06:47 +0100 Subject: [PATCH 0077/2890] package/intel-gmmlib: bump version to 22.3.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 693d9d090508..d959f968e0ec 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 86651bd2803c9f0afd82471bec784e65d2b418dee315a053d22215eb2a679be7 intel-gmmlib-22.3.3.tar.gz +sha256 c42b5fa1f5f7c165621099b3787de4c052688cd93c6ef986589ab24fff09b659 intel-gmmlib-22.3.4.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 3eb3458ee710..0308ab6a2801 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.3 +INTEL_GMMLIB_VERSION = 22.3.4 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 1ec5d3547691888311502b936313b1807f658d80 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Mar 2023 23:06:48 +0100 Subject: [PATCH 0078/2890] package/intel-mediadriver: bump version to 23.1.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index e4e41e4ad39c..0ec128f9fd71 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 edae1bdc07b694bd6e42099feddcf875e3b5d7254894f4b3fb292128577baf82 intel-media-23.1.0.tar.gz +sha256 3b9a809f618cfd0a7835060dfec777a7bdd76f85d170c83116078bf7d4e3d427 intel-media-23.1.3.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 6cc862dce47f..51083af1440b 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 23.1.0 +INTEL_MEDIADRIVER_VERSION = 23.1.3 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From 52ef625e67645d7fffc7b0082bfe6367ec6eb883 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Mar 2023 23:06:49 +0100 Subject: [PATCH 0079/2890] package/intel-mediasdk: bump version to 23.1.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index a2c424379018..bdd4c7f3a6d0 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9208c35641ba995760d662689426a6c433973cf5283b8510f9cfb774e4b9cb38 intel-mediasdk-23.1.0.tar.gz +sha256 f1bb11ddaa44d5827562600e0a989ca20550e1b021314bce32bc4957352da110 intel-mediasdk-23.1.3.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 462d487ebedc..9843ec350295 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 23.1.0 +INTEL_MEDIASDK_VERSION = 23.1.3 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From 61ba55e9cce6884295e47fdf33554e6877bd0747 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Mar 2023 23:09:29 +0100 Subject: [PATCH 0080/2890] package/mpv: bump version to 0.35.1 https://github.com/mpv-player/mpv/releases/tag/v0.35.1 Updated license hash due to upstream commit "DOCS: use upstream license files": https://github.com/mpv-player/mpv/commit/7314253180e7c5d06bec6d1fed79ce92bff4b6be Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mpv/mpv.hash | 4 ++-- package/mpv/mpv.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash index 0c7eb5f8a5ad..a09015619d49 100644 --- a/package/mpv/mpv.hash +++ b/package/mpv/mpv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9 mpv-0.33.1.tar.gz -sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL +sha256 41df981b7b84e33a2ef4478aaf81d6f4f5c8b9cd2c0d337ac142fc20b387d1a9 mpv-0.35.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index f9250070d132..e368b25736f7 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPV_VERSION = 0.33.1 +MPV_VERSION = 0.35.1 MPV_SITE = $(call github,mpv-player,mpv,v$(MPV_VERSION)) MPV_DEPENDENCIES = \ host-pkgconf ffmpeg libass zlib \ From a2867fec00d68721158aad1991d4e85a7fa491e9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 13 Mar 2023 19:23:34 +0100 Subject: [PATCH 0081/2890] package/libnss: bump version to 3.89 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index ec3fe0d77791..483320d95c24 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_88_1_RTM/src/SHA256SUMS -sha256 27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496 nss-3.88.1.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_89_RTM/src/SHA256SUMS +sha256 55c37a3f4da010d0574fb8b39264cb1e7b4ce9e6c2954c1c7ecf9f41ee00bed5 nss-3.89.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index ac342cf3af33..5daced718206 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.88.1 +LIBNSS_VERSION = 3.89 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From 7a99e1fa29f5dd7cb46186d07826debc519e1035 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 13 Mar 2023 22:34:39 +0100 Subject: [PATCH 0082/2890] package/python-hwdata: new package Provides python interface to database stored in hwdata package. It allows you to get human readable description of USB and PCI devices. https://github.com/xsuchy/python-hwdata Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/python-hwdata/Config.in | 12 ++++++ package/python-hwdata/python-hwdata.hash | 5 +++ package/python-hwdata/python-hwdata.mk | 23 +++++++++++ .../tests/package/sample_python_hwdata.py | 40 +++++++++++++++++++ .../tests/package/test_python_hwdata.py | 12 ++++++ 7 files changed, 96 insertions(+) create mode 100644 package/python-hwdata/Config.in create mode 100644 package/python-hwdata/python-hwdata.hash create mode 100644 package/python-hwdata/python-hwdata.mk create mode 100644 support/testing/tests/package/sample_python_hwdata.py create mode 100644 support/testing/tests/package/test_python_hwdata.py diff --git a/DEVELOPERS b/DEVELOPERS index 592c0e6b9c1f..b49491da7a65 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1715,6 +1715,7 @@ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ +F: package/python-hwdata/ F: package/python-magic-wormhole/ F: package/python-magic-wormhole-mailbox-server/ F: package/python-magic-wormhole-transit-relay/ @@ -1727,6 +1728,7 @@ F: package/z3/ F: package/zynaddsubfx/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py +F: support/testing/tests/package/sample_python_hwdata.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_ddrescue.py @@ -1748,6 +1750,7 @@ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_hkdf.py +F: support/testing/tests/package/test_python_hwdata.py F: support/testing/tests/package/test_python_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py diff --git a/package/Config.in b/package/Config.in index f8ce83365e4a..0f8dab3e71eb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1082,6 +1082,7 @@ menu "External python modules" source "package/python-httplib2/Config.in" source "package/python-huepy/Config.in" source "package/python-humanize/Config.in" + source "package/python-hwdata/Config.in" source "package/python-hyperframe/Config.in" source "package/python-hyperlink/Config.in" source "package/python-ibmiotf/Config.in" diff --git a/package/python-hwdata/Config.in b/package/python-hwdata/Config.in new file mode 100644 index 000000000000..923d0a7d8ac3 --- /dev/null +++ b/package/python-hwdata/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_HWDATA + bool "python-hwdata" + select BR2_PACKAGE_HWDATA # runtime + select BR2_PACKAGE_HWDATA_PCI_IDS + select BR2_PACKAGE_HWDATA_PNP_IDS + select BR2_PACKAGE_HWDATA_USB_IDS + help + Provides python interface to database stored in hwdata + package. It allows you to get human readable description of + USB and PCI devices. + + https://github.com/xsuchy/python-hwdata diff --git a/package/python-hwdata/python-hwdata.hash b/package/python-hwdata/python-hwdata.hash new file mode 100644 index 000000000000..0c7ca31476c3 --- /dev/null +++ b/package/python-hwdata/python-hwdata.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/hwdata/json +md5 dccf3b28d06fb9c6f56875e148356c24 hwdata-2.3.7.tar.gz +sha256 9e5c96be38d9218ffde40834d4ca03344b8dfaed29c8c5afe0030125ea03db03 hwdata-2.3.7.tar.gz +# Locally computed +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/python-hwdata/python-hwdata.mk b/package/python-hwdata/python-hwdata.mk new file mode 100644 index 000000000000..8eeec6efa820 --- /dev/null +++ b/package/python-hwdata/python-hwdata.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# python-hwdata +# +################################################################################ + +PYTHON_HWDATA_VERSION = 2.3.7 +PYTHON_HWDATA_SOURCE = hwdata-$(PYTHON_HWDATA_VERSION).tar.gz +PYTHON_HWDATA_SITE = https://files.pythonhosted.org/packages/15/26/f5bc1b42129fbcbd1c99c29714af1685fc89e2cf37680a9930d4fcac1808 +PYTHON_HWDATA_SETUP_TYPE = distutils +PYTHON_HWDATA_LICENSE = GPL-2.0+ +PYTHON_HWDATA_LICENSE_FILES = LICENSE + +# There is no LICENSE file in the PyPi tarball, but it is available in +# upstream git repository: +PYTHON_HWDATA_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/xsuchy/python-hwdata/python-hwdata-$(PYTHON_HWDATA_VERSION)-1/LICENSE + +define PYTHON_HWDATA_ADD_LICENSE_FILE + cp $(PYTHON_HWDATA_DL_DIR)/LICENSE $(@D) +endef +PYTHON_HWDATA_POST_EXTRACT_HOOKS += PYTHON_HWDATA_ADD_LICENSE_FILE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_hwdata.py b/support/testing/tests/package/sample_python_hwdata.py new file mode 100644 index 000000000000..a13c08b32eb5 --- /dev/null +++ b/support/testing/tests/package/sample_python_hwdata.py @@ -0,0 +1,40 @@ +#! /usr/bin/env python3 + +from hwdata import PCI, PNP, USB + +# Test PCI IDs +pci_vendor_id = '1af4' +pci_device_id = '1003' + +pci = PCI() + +pci_vendor = pci.get_vendor(pci_vendor_id) +print("PCI Vendor: %s" % pci_vendor) +assert (pci_vendor == "Red Hat, Inc.") + +pci_device = pci.get_device(pci_vendor_id, pci_device_id) +print("PCI Device: %s" % pci_device) +assert (pci_device == "Virtio console") + +# Test USB IDs +usb_vendor_id = '1d6b' +usb_device_id = '0001' + +usb = USB() + +usb_vendor = usb.get_vendor(usb_vendor_id) +print("USB Vendor: %s" % usb_vendor) +assert (usb_vendor == "Linux Foundation") + +usb_device = usb.get_device(usb_vendor_id, usb_device_id) +print("USB Device: %s" % usb_device) +assert (usb_device == "1.1 root hub") + +# Test PNP IDs +pnp_id = 'RHT' + +pnp = PNP() + +pnp_vendor = pnp.get_vendor(pnp_id) +print("PNP Vendor: %s" % pnp_vendor) +assert (pnp_vendor == "Red Hat, Inc.") diff --git a/support/testing/tests/package/test_python_hwdata.py b/support/testing/tests/package/test_python_hwdata.py new file mode 100644 index 000000000000..7028d1dd59dd --- /dev/null +++ b/support/testing/tests/package/test_python_hwdata.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonHwdata(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_HWDATA=y + """ + sample_scripts = ["tests/package/sample_python_hwdata.py"] + timeout = 10 From 36070a47aa68787d56d29bf32a8288484d35a160 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Mon, 13 Mar 2023 08:18:23 +0300 Subject: [PATCH 0083/2890] package/osm2pgsql: bump version to 1.8.1 Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.8.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index b5b76c15c684..cc13bf741d9c 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927 osm2pgsql-1.8.0.tar.gz +sha256 9e3cd9e13893fd7a153c7b42089bd23338867190c91b157cbdb4ff7176ecba62 osm2pgsql-1.8.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 9cdfb44ce08d..11f09fe7d1a5 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.8.0 +OSM2PGSQL_VERSION = 1.8.1 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING From 0c28688054e06bb84906ae309da1f64d45ced0d3 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Mon, 13 Mar 2023 08:26:26 +0300 Subject: [PATCH 0084/2890] package/timescaledb: bump version to 2.10.1 Release notes: https://github.com/timescale/timescaledb/blob/2.10.1/CHANGELOG.md Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 2fd14e6c1a11..b05c7802c28a 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ff0820891646a772aceab19ee0f7da0a5343dc53b9a72c965ab70f723d231d5c timescaledb-2.9.3.tar.gz +sha256 6fca72a6ed0f6d32d2b3523951ede73dc5f9b0077b38450a029a5f411fdb8c73 timescaledb-2.10.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index e3c94ed2fe25..bcda07f89350 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.9.3 +TIMESCALEDB_VERSION = 2.10.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 27ea8958e1595a92b92f7057bcf005db0fa363f1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 25 Feb 2023 13:55:44 +0100 Subject: [PATCH 0085/2890] package/ptm2human: bump to latest commit d0b8b6b For change log since commit d0b8b6b, see project commit log: https://github.com/hwangcc23/ptm2human/commits/c8c5e7d5bdacd73114f4f244355e88c7f4e7d64a Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ptm2human/ptm2human.hash | 2 +- package/ptm2human/ptm2human.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ptm2human/ptm2human.hash b/package/ptm2human/ptm2human.hash index 034601966776..d581491bded1 100644 --- a/package/ptm2human/ptm2human.hash +++ b/package/ptm2human/ptm2human.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 28947eeb458d8b6a362cbeb8c5cb6098006274af04ebb4f5da70eac89f927d95 ptm2human-d0b8b6be9897ea5b04fd6460038a4773cec078bc.tar.gz +sha256 4c66e9429dfb92b5f4332b08050db0436511581102d1ec56555eb8229d9c2c74 ptm2human-c8c5e7d5bdacd73114f4f244355e88c7f4e7d64a.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/ptm2human/ptm2human.mk b/package/ptm2human/ptm2human.mk index 28a7b7ab4880..edba21d401de 100644 --- a/package/ptm2human/ptm2human.mk +++ b/package/ptm2human/ptm2human.mk @@ -4,7 +4,7 @@ # ################################################################################ -PTM2HUMAN_VERSION = d0b8b6be9897ea5b04fd6460038a4773cec078bc +PTM2HUMAN_VERSION = c8c5e7d5bdacd73114f4f244355e88c7f4e7d64a PTM2HUMAN_SITE = $(call github,hwangcc23,ptm2human,$(PTM2HUMAN_VERSION)) PTM2HUMAN_LICENSE = GPL-2.0 PTM2HUMAN_LICENSE_FILES = LICENSE From 97ce2f621d46a3da0e6149815d66d7ccfcf9c020 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Tue, 14 Mar 2023 08:13:19 +0000 Subject: [PATCH 0086/2890] package/harfbuzz: fix COPYING hash The version bump in a1f0020 forgot to update the hash of the license file. Changes include updated copyright years for the different parties. Fixes: - http://autobuild.buildroot.net/results/0d93b20995c2bfd2236d820a35e5eae9de76f00e Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/harfbuzz/harfbuzz.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index e881f5851094..1e7a1cf5306f 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed sha256 f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b harfbuzz-7.1.0.tar.xz -sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING +sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING From 65f49b2cb3e7902fe90403e56a9ba7931504d99c Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Tue, 14 Mar 2023 08:35:53 +0000 Subject: [PATCH 0087/2890] package/network-manager: fix CONTRIBUTING.md hash The version bump in e3706f1 forgot to update the hash for CONTRIBUTING.md The file includes various changes unrelated to the legal information (mailing list, how to build,...). Fixes: - http://autobuild.buildroot.net/results/bbd0db06663b6df82973173bb044b57f013e844b Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 270699d63af5..895351a5372d 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -3,4 +3,4 @@ sha256 2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4 Networ # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md +sha256 cfb6c71f6df5898e1724be3debe9adac48c115b903915406c1e7dfd362b57892 CONTRIBUTING.md From a23128e2a5060136b54c41255bf753638b48d94e Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Tue, 14 Mar 2023 08:08:26 +0000 Subject: [PATCH 0088/2890] package/lzop: fix COPYING hash The version bump in ce95217 forgot to update the hash of the license file. Changes include a new address for Free Software Foundation, Inc. Fixes: - http://autobuild.buildroot.net/results/c8a/c8ab973077067b2aa57e4f3ab51bd41ca1543d6f/ Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/lzop/lzop.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lzop/lzop.hash b/package/lzop/lzop.hash index 99796dc8c93f..31849aa0c5dc 100644 --- a/package/lzop/lzop.hash +++ b/package/lzop/lzop.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 lzop-1.04.tar.gz -sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING From 7107a9876b29c0a3e6fc8424eca199dfea5ce5b2 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Tue, 14 Mar 2023 08:09:08 +0000 Subject: [PATCH 0089/2890] package/lzop: use upstream download hash The official website includes a sha256 next to the download link. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/lzop/lzop.hash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/lzop/lzop.hash b/package/lzop/lzop.hash index 31849aa0c5dc..8cf31d16100d 100644 --- a/package/lzop/lzop.hash +++ b/package/lzop/lzop.hash @@ -1,3 +1,4 @@ -# Locally calculated +# From http://www.lzop.org sha256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 lzop-1.04.tar.gz +# Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING From 998f3e17da8658f983dcd8c3d565bfa7e4914f20 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Tue, 14 Mar 2023 16:52:33 +0700 Subject: [PATCH 0090/2890] package/git: bump to version 2.40.0 Bump the package to v2.40.0. The release announcement and notes are at [1]. While at it, also drop two Buildroot patches as these have been already applied upstream. [1]: https://lore.kernel.org/git/xmqqjzzkv8xz.fsf@gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Thomas Petazzoni --- ...avoid-redefining-system-function-nam.patch | 109 ------------------ ...undefine-system-names-before-redecla.patch | 55 --------- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 4 files changed, 2 insertions(+), 166 deletions(-) delete mode 100644 package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch delete mode 100644 package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch diff --git a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch deleted file mode 100644 index 24100e1f6e49..000000000000 --- a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 86aeac96d04ae5381085c0f93acb12d3bfd06969 Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Wed, 30 Nov 2022 16:15:14 -0500 -Subject: [PATCH] git-compat-util: avoid redefining system function names -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Our git-compat-util header defines a few noop wrappers for system -functions if they are not available. This was originally done with a -macro, but in 15b52a44e0 (compat-util: type-check parameters of no-op -replacement functions, 2020-08-06) we switched to inline functions, -because it gives us basic type-checking. - -This can cause compilation failures when the system _does_ declare those -functions but we choose not to use them, since the compiler will -complain about the redeclaration. This was seen in the real world when -compiling against certain builds of uclibc, which may leave -_POSIX_THREAD_SAFE_FUNCTIONS unset, but still declare flockfile() and -funlockfile(). - -It can also be seen on any platform that has setitimer() if you choose -to compile without it (which plausibly could happen if the system -implementation is buggy). E.g., on Linux: - - $ make NO_SETITIMER=IWouldPreferNotTo git.o - CC git.o - In file included from builtin.h:4, - from git.c:1: - git-compat-util.h:344:19: error: conflicting types for ‘setitimer’; have ‘int(int, const struct itimerval *, struct itimerval *)’ - 344 | static inline int setitimer(int which UNUSED, - | ^~~~~~~~~ - In file included from git-compat-util.h:234: - /usr/include/x86_64-linux-gnu/sys/time.h:155:12: note: previous declaration of ‘setitimer’ with type ‘int(__itimer_which_t, const struct itimerval * restrict, struct itimerval * restrict)’ - 155 | extern int setitimer (__itimer_which_t __which, - | ^~~~~~~~~ - make: *** [Makefile:2714: git.o] Error 1 - -Here I think the compiler is complaining about the lack of "restrict" -annotations in our version, but even if we matched it completely (and -there is no way to match all platforms anyway), it would still complain -about a static declaration following a non-static one. Using macros -doesn't have this problem, because the C preprocessor rewrites the name -in our code before we hit this level of compilation. - -One way to fix this would just be to revert most of 15b52a44e0. What we -really cared about there was catching build problems with -precompose_argv(), which most platforms _don't_ build, and which is our -custom function. So we could just switch the system wrappers back to -macros; most people build the real versions anyway, and they don't -change. So the extra type-checking isn't likely to catch bugs. - -But with a little work, we can have our cake and eat it, too. If we -define the type-checking wrappers with a unique name, and then redirect -the system names to them with macros, we still get our type checking, -but without redeclaring the system function names. - -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano -[Bagas: cherry-picked from e0c08a4f738b3dea7a4e8fe3511c323cf1f41942 on next branch] -Signed-off-by: Bagas Sanjaya ---- - git-compat-util.h | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/git-compat-util.h b/git-compat-util.h -index af05077560..f6882b9b50 100644 ---- a/git-compat-util.h -+++ b/git-compat-util.h -@@ -341,11 +341,12 @@ struct itimerval { - #endif - - #ifdef NO_SETITIMER --static inline int setitimer(int which UNUSED, -- const struct itimerval *value UNUSED, -- struct itimerval *newvalue UNUSED) { -+static inline int git_setitimer(int which, -+ const struct itimerval *value, -+ struct itimerval *newvalue) { - return 0; /* pretend success */ - } -+#define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) - #endif - - #ifndef NO_LIBGEN_H -@@ -1479,14 +1480,16 @@ int open_nofollow(const char *path, int flags); - #endif - - #ifndef _POSIX_THREAD_SAFE_FUNCTIONS --static inline void flockfile(FILE *fh UNUSED) -+static inline void git_flockfile(FILE *fh) - { - ; /* nothing */ - } --static inline void funlockfile(FILE *fh UNUSED) -+static inline void git_funlockfile(FILE *fh) - { - ; /* nothing */ - } -+#define flockfile(fh) git_flockfile(fh) -+#define funlockfile(fh) git_funlockfile(fh) - #define getc_unlocked(fh) getc(fh) - #endif - - -base-commit: cbf04937d5b9fcf0a76c28f69e6294e9e3ecd7e6 --- -An old man doll... just what I always wanted! - Clara - diff --git a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch deleted file mode 100644 index f6207300ee8b..000000000000 --- a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d4a11fd215195cd1ca6a43058ef250b688ade1f4 Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Fri, 2 Dec 2022 06:05:38 -0500 -Subject: [PATCH] git-compat-util: undefine system names before redeclaring - them - -When we define a macro to point a system function (e.g., flockfile) to -our custom wrapper, we should make sure that the system did not already -define it as a macro. This is rarely a problem, but can cause -compilation failures if both of these are true: - - - we decide to define our own wrapper even though the system provides - the function; we know this happens at least with uclibc, which may - declare flockfile, etc, without _POSIX_THREAD_SAFE_FUNCTIONS - - - the system version is declared as a macro; we know this happens at - least with uclibc's version of getc_unlocked() - -So just handling getc_unlocked() would be sufficient to deal with the -real-world case we've seen. But since it's easy to do, we may as well be -defensive about the other macro wrappers added in the previous patch. - -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano -[Bagas: cherry-picked from e1a95b78d8a26762ea04332de8b7c3878da51522 on next branch] -Signed-off-by: Bagas Sanjaya ---- - git-compat-util.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/git-compat-util.h b/git-compat-util.h -index f6882b9b50..dadb9e55cb 100644 ---- a/git-compat-util.h -+++ b/git-compat-util.h -@@ -346,6 +346,7 @@ static inline int git_setitimer(int which, - struct itimerval *newvalue) { - return 0; /* pretend success */ - } -+#undef setitimer - #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) - #endif - -@@ -1488,6 +1489,9 @@ static inline void git_funlockfile(FILE *fh) - { - ; /* nothing */ - } -+#undef flockfile -+#undef funlockfile -+#undef getc_unlocked - #define flockfile(fh) git_flockfile(fh) - #define funlockfile(fh) git_funlockfile(fh) - #define getc_unlocked(fh) getc(fh) --- -An old man doll... just what I always wanted! - Clara - diff --git a/package/git/git.hash b/package/git/git.hash index b7840cd1eb62..edb15955205a 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 git-2.39.2.tar.xz +sha256 b17a598fbf58729ef13b577465eb93b2d484df1201518b708b5044ff623bf46d git-2.40.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 206d06ffe7f4..46ffc861512f 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.39.2 +GIT_VERSION = 2.40.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 562cf1fbdba54ba87b9cf630675c5865843d5c4c Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Tue, 14 Mar 2023 16:52:34 +0700 Subject: [PATCH 0091/2890] DEVELOPERS: Add entry for Bagas Sanjaya as Buildroot developer for git Bagas is keen to maintain git package for Buildroot. However, due to limited resources available, he can only do testing as far as build testing. Other developers are needed to help him maintain the package. Signed-off-by: Bagas Sanjaya Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b49491da7a65..b6d288c54fa9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -273,6 +273,9 @@ F: package/orbit/ N: Attila Wagner F: package/python-canopen/ +N: Bagas Sanjaya +F: package/git/ + N: Bartosz Bilas F: board/stmicroelectronics/stm32mp157a-dk1/ F: configs/stm32mp157a_dk1_defconfig From d3051892eba100441f6900b6b435ae935f103fff Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 14 Mar 2023 14:06:08 +0100 Subject: [PATCH 0092/2890] package/rtl8812au-aircrack-ng: fix build failure on PowerPC64 Add local patch pending upstream[0] to fix build failure on PowerPC64 due to conflicting get_ra(). Fixes: http://autobuild.buildroot.net/results/8c5/8c51009fa32947b2c1cda8f9862507df8da126db// [0]: https://github.com/aircrack-ng/rtl8812au/pull/1054 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- .../0001-Fix-build-failure-on-PowerPC64.patch | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch diff --git a/package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch b/package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch new file mode 100644 index 000000000000..488c21a4fc1c --- /dev/null +++ b/package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch @@ -0,0 +1,114 @@ +From d78bda8e60ad6382c1e5832d83d8e40c923628fa Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Tue, 14 Mar 2023 13:21:11 +0100 +Subject: [PATCH] Fix build failure on PowerPC64 + +get_ra() is defined in Linux kernel for PowerPC64 architecture and it +conflicts with local get_ra() definition so let's rename local definition +as rtl_get_ra(). + +[Upstream status: https://github.com/aircrack-ng/rtl8812au/pull/1054] +Signed-off-by: Giulio Benetti +--- + core/rtw_odm.c | 6 +++--- + core/rtw_recv.c | 4 ++-- + hal/hal_com.c | 2 +- + include/wifi.h | 2 +- + os_dep/linux/ioctl_cfg80211.c | 2 +- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/core/rtw_odm.c b/core/rtw_odm.c +index 7204181..a9a7604 100644 +--- a/core/rtw_odm.c ++++ b/core/rtw_odm.c +@@ -273,7 +273,7 @@ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys) + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t0->band, phys_t0->channel, phys_t0->rxsc + ); +@@ -389,7 +389,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, rf_mode:%u, l_rxsc:%u, ht_rxsc:%u) => %u,%u\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc + , pkt_cch, pkt_bw +@@ -407,7 +407,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc + ); +diff --git a/core/rtw_recv.c b/core/rtw_recv.c +index ffd1ff9..05bede9 100644 +--- a/core/rtw_recv.c ++++ b/core/rtw_recv.c +@@ -4851,7 +4851,7 @@ void rx_query_phy_status( + wlanhdr = get_recvframe_data(precvframe); + + ta = get_ta(wlanhdr); +- ra = get_ra(wlanhdr); ++ ra = rtl_get_ra(wlanhdr); + is_ra_bmc = IS_MCAST(ra); + + if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) { +@@ -4991,7 +4991,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) + { + s32 ret = _SUCCESS; + u8 *pbuf = precvframe->u.hdr.rx_data; +- u8 *pda = get_ra(pbuf); ++ u8 *pda = rtl_get_ra(pbuf); + u8 ra_is_bmc = IS_MCAST(pda); + _adapter *primary_padapter = precvframe->u.hdr.adapter; + #ifdef CONFIG_CONCURRENT_MODE +diff --git a/hal/hal_com.c b/hal/hal_com.c +index dcf8edf..07b8a5e 100644 +--- a/hal/hal_com.c ++++ b/hal/hal_com.c +@@ -12569,7 +12569,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe) + + /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/ + if (psta) { +- if (IS_MCAST(get_ra(get_recvframe_data(prframe)))) ++ if (IS_MCAST(rtl_get_ra(get_recvframe_data(prframe)))) + psta_dframe_info = &psta->sta_dframe_info_bmc; + else + psta_dframe_info = &psta->sta_dframe_info; +diff --git a/include/wifi.h b/include/wifi.h +index f071dd0..b349bb9 100644 +--- a/include/wifi.h ++++ b/include/wifi.h +@@ -454,7 +454,7 @@ __inline static int IS_MCAST(const u8 *da) + return _FALSE; + } + +-__inline static unsigned char *get_ra(unsigned char *pframe) ++__inline static unsigned char *rtl_get_ra(unsigned char *pframe) + { + unsigned char *ra; + ra = GetAddr1Ptr(pframe); +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 03f6240..a54125a 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -6468,7 +6468,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra + + indicate: + #if defined(RTW_DEDICATED_P2P_DEVICE) +- if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), get_ra(frame), &wdev)) ++ if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), rtl_get_ra(frame), &wdev)) + if (0) + RTW_INFO("redirect to pd_wdev:%p\n", wdev); + #endif +-- +2.34.1 + From 4a0301c1b95a751c331e738d6a392c1fd03d2393 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 18 Mar 2023 13:30:10 +0100 Subject: [PATCH 0093/2890] package/shadow: fix libsemanage dependency Fix the following build failure raised since the addition of the package in commit f78c5cb5cae93a9e63dad4361d78e1787759382f: Makefile:576: *** libsemanage is in the dependency chain of shadow that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/e528e07874815d7f1cb951084ec985d76fe22d2e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/shadow/shadow.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index d8f913a6483f..4bc3cce037e1 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -87,7 +87,7 @@ else SHADOW_CONF_OPTS += --without-libcrack endif -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +ifeq ($(BR2_PACKAGE_LIBSELINUX)$(BR2_PACKAGE_LIBSEMANAGE),yy) SHADOW_CONF_OPTS += --with-selinux SHADOW_DEPENDENCIES += libselinux libsemanage else From 889fd54f809973d56b98e78677ae8a14e9e64da4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 18 Mar 2023 13:30:58 +0100 Subject: [PATCH 0094/2890] package/s390-tools: needs OpenSSL-enabled libcurl Fix the following build failure raised bump to version 2.17.0 in commit eab9110afbef9c39569c4cc988aed15c48f7ce44 and https://github.com/ibm-s390-linux/s390-tools/commit/56fecf1832c3ebc4626ddf5c598762833c362d5e: Error: libcurl is not built with the OpenSSL backend Fixes: - http://autobuild.buildroot.org/results/32aa8f0bece5da2a16d761f175d46c7d3e0a8965 - http://autobuild.buildroot.org/results/535253f483c927da456c0be292df6a58c1f39737 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/s390-tools/s390-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index 8cd549140547..ec01a18cb07c 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -14,7 +14,7 @@ S390_TOOLS_MAKE_OPTS = \ ARCH=$(BR2_ARCH) \ CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -ifeq ($(BR2_PACKAGE_LIBCURL),y) +ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) S390_TOOLS_DEPENDENCIES += libcurl S390_TOOLS_MAKE_OPTS += \ CURL_CONFIG=$(STAGING_DIR)/usr/bin/curl-config \ From e011fa0415883b9d44df616cfaf6956e1a11da88 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 18 Mar 2023 13:32:17 +0100 Subject: [PATCH 0095/2890] package/snmppp: security bump to version 3.5.0 - Improved (security): Avoid timing attacks on authentication verification. - Drop patch (already in version) https://www.agentpp.com/download/changes_snmp++v3.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-fix-build-with-libressl-3-5-0.patch | 39 ------------------- package/snmppp/snmppp.hash | 2 +- package/snmppp/snmppp.mk | 2 +- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 package/snmppp/0001-fix-build-with-libressl-3-5-0.patch diff --git a/package/snmppp/0001-fix-build-with-libressl-3-5-0.patch b/package/snmppp/0001-fix-build-with-libressl-3-5-0.patch deleted file mode 100644 index f60f84f9a25b..000000000000 --- a/package/snmppp/0001-fix-build-with-libressl-3-5-0.patch +++ /dev/null @@ -1,39 +0,0 @@ -fix build with libressl >= 3.5.0 - -Fix the following build failure with libressl >= 3.5.0: - -auth_priv.cpp: In member function 'virtual int Snmp_pp::AuthMD5::password_to_key(const unsigned char*, unsigned int, const unsigned char*, unsigned int, unsigned char*, unsigned int*)': -auth_priv.cpp:1132:20: error: aggregate 'Snmp_pp::MD5HashStateType md5_hash_state' has incomplete type and cannot be defined - MD5HashStateType md5_hash_state; - ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/b50b883c03e82564198a8b7e91bd14bf007772e0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: merged (emailed to katz.agentpp.com@magenta.de)] - -diff -Naurp snmp++-3.4.9.orig/src/auth_priv.cpp snmp++-3.4.9/src/auth_priv.cpp ---- snmp++-3.4.9.orig/src/auth_priv.cpp 2022-05-13 11:39:14.083038544 +0200 -+++ snmp++-3.4.9/src/auth_priv.cpp 2022-05-13 15:00:42.576102348 +0200 -@@ -79,8 +79,9 @@ static const char *loggerModuleName = "s - - /* -- START: Defines for OpenSSL -- */ - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) --// OpenSSL versions up to 1.0.x and LibreSSL -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) -+// OpenSSL versions up to 1.0.x and LibreSSL versions up to 3.4.x - typedef EVP_MD_CTX EVPHashStateType; - - int evpAllocAndInit(EVP_MD_CTX *ctx, const EVP_MD *md) -@@ -138,7 +139,7 @@ typedef EVP_MD_CTX* MD5HashSta - #define MD5_PROCESS(s, p, l) EVP_DigestUpdate(*(s), p, l) - #define MD5_DONE(s, k) evpDigestFinalAndFree(s, k) - --#endif // OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#endif // OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) - - typedef DES_key_schedule DESCBCType; - #define DES_CBC_START_ENCRYPT(c, iv, k, kl, r, s) \ diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index 6dc3d39ced1a..74c6a3e98f2b 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d7a77fd05ecd99b25c51cbab08dfeef22a5edf2677875695c213631af59d5bae snmp++-3.4.10.tar.gz +sha256 43a433bd5f6fd67add5a26add6521ca664c41aead438405658ed57483664b4bf snmp++-3.5.0.tar.gz sha256 61337e799c8274e596e5783b22607beea8073ee296c6b27fc5c7487296e56851 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 005a5a9f3526..9f1916dd662b 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.4.10 +SNMPPP_VERSION = 3.5.0 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf From 4cc99b8cf6765fd12225f512c52b5807ac329d76 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 18 Mar 2023 01:04:39 +0100 Subject: [PATCH 0096/2890] package/rdma-core: bump to version v45.0 For change log, see: https://github.com/linux-rdma/rdma-core/releases/tag/v45.0 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/rdma-core/rdma-core.hash | 2 +- package/rdma-core/rdma-core.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash index 1aff44f7f4e7..128ca54e3e6e 100644 --- a/package/rdma-core/rdma-core.hash +++ b/package/rdma-core/rdma-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4a2eec55b37ac25f25e7680a372f71c1781c23808542bd31fb68dc0448b8cba2 rdma-core-44.0.tar.gz +sha256 8725cf10f05579585c9fdebdce5613120e632f204fc098a77d24f5974a0c4321 rdma-core-45.0.tar.gz sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk index 885821bf985f..0cbe22d04336 100644 --- a/package/rdma-core/rdma-core.mk +++ b/package/rdma-core/rdma-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -RDMA_CORE_VERSION = 44.0 +RDMA_CORE_VERSION = 45.0 RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md From c4173d8b08525f260fea8a2a1e805b806bcba9fc Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 17 Mar 2023 21:27:23 +0100 Subject: [PATCH 0097/2890] package/linux-tools/S10hyperv: fix shellcheck warnings When running "make check-package" on a system with shellcheck 0.9.0, the command fails with output: make check-package package/linux-tools/S10hyperv:0: run 'shellcheck' and fix the warnings ... 2 warnings generated This commit fixes the warnings reported by the command: shellcheck package/linux-tools/S10hyperv This commit also fixes the four-space indent by a single tab on the changed lines. Since this fixes the indentation warnings of check-package, the Indent exclusion in .checkpackageignore is also removed. Fixes: In package/linux-tools/S10hyperv line 27: return $ret ^--^ SC2086 (info): Double quote to prevent globbing and word splitting. In package/linux-tools/S10hyperv line 48: return $ret ^--^ SC2086 (info): Double quote to prevent globbing and word splitting. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 +- package/linux-tools/S10hyperv | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 405e1c5677c7..04966a9b068a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -94,7 +94,7 @@ package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch Sob package/libiio/S99iiod Shellcheck Variables package/libmad/0001-mips-h-constraint-removal.patch Sob package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables -package/linux-tools/S10hyperv Indent Variables +package/linux-tools/S10hyperv Variables package/linuxptp/S65ptp4l Indent Shellcheck package/linuxptp/S66phc2sys Indent Shellcheck package/lirc-tools/S25lircd Indent Variables diff --git a/package/linux-tools/S10hyperv b/package/linux-tools/S10hyperv index ec934bc972db..32887d1b6c3a 100644 --- a/package/linux-tools/S10hyperv +++ b/package/linux-tools/S10hyperv @@ -24,7 +24,7 @@ start() { for prog in ${PROGS}; do start_one "${prog}" || ret=$? done - return $ret + return "$ret" } stop_one() { @@ -45,7 +45,7 @@ stop() { for prog in ${PROGS}; do stop_one "${prog}" || ret=$? done - return $ret + return "$ret" } restart() { From 971ae7b266d7d8df2d31f482d9fa44c0f3338c0a Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 17 Mar 2023 20:33:26 +0100 Subject: [PATCH 0098/2890] package/qt6base: network module needs libopenssl PSK feature Fixes: - http://autobuild.buildroot.net/results/fdf2b2eb252a24e81bddad1c81c4fdfb03dc0afe .../build/qt6base-6.4.2/src/plugins/tls/openssl/qdtls_openssl.cpp: In member function 'bool dtlsopenssl::DtlsState::initCtxAndConnection(QDtlsBasePrivate*)': .../build/qt6base-6.4.2/src/plugins/tls/openssl/qdtls_openssl.cpp:669:9: error: 'q_SSL_set_psk_server_callback' was not declared in this scope; did you mean 'q_SSL_set_psk_use_session_callback'? 669 | q_SSL_set_psk_server_callback(newConnection.data(), dtlscallbacks::q_PSK_server_callback); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | q_SSL_set_psk_use_session_callback .../build/qt6base-6.4.2/src/plugins/tls/openssl/qdtls_openssl.cpp:671:9: error: 'q_SSL_set_psk_client_callback' was not declared in this scope; did you mean 'q_SSL_set_info_callback'? 671 | q_SSL_set_psk_client_callback(newConnection.data(), dtlscallbacks::q_PSK_client_callback); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | q_SSL_set_info_callback Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 7927975bff8b..f9fb2a2ad052 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -165,6 +165,7 @@ endif config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL help This options enables the Qt6Network library. From 9833247d491e06c7dfefd1e1bf62043fe08eae11 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 17 Mar 2023 04:10:31 -0600 Subject: [PATCH 0099/2890] package/{rust, rust-bin}: bump to version 1.68.0 Link to Rust 1.68.0 announcement: https://blog.rust-lang.org/2023/03/09/Rust-1.68.0.html Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 11cfae5e9b1d..1b7d1538332a 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 b7b8e8b70cae457092661894efa5a4861ef4f0e20f2f617d05d6f17b1f780a68 rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 b686a2d0d1648e1b84def715dd65a85a3d2802b33ecf65808bdb2ed639aec7d3 rust-1.67.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc -sha256 c9df968487707eb63207f63086daed4fe1484829fb6221bd9414de2700424995 rust-1.67.1-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 4f56194a354b1413fb973d25f1c895aaa8e85211d316755508d6848e3a4fe18b rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 852e5a714ea8d2737f2cd5b0d6a12ecfa712b75238c643ba8138b490fc39fc43 rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 0a5bc85383d5d9d077dccaad1fb213d9498b6137112aaaabced6eb079fe12c9e rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 574851ff8503df9cb0dd04e6a1cd0ce5d709b5ea8b9c1265b314b9e182c818da rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 50e98fefef58218bd2c09c826308d43abe11b05f528b08ecca3d2657d7996630 rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 6e8629ace0c1b9cc0c2bc6225e6716df852370e5c7e907815ff8e6241e427699 rust-1.67.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 7dbb718bdb09adad7e36b9a413e571863913682495527f7f2d6507ea2c068542 rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 35027409400faaaa38ea2855b92dea6b553b2e656dff735da730f67ac02e57e6 rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc -sha256 dcd3926c151cdd33d4de2860f021c86a18556809c4d06cbddebc1b377638710a rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 da42d5b07984dac9a41719511eeb47cbb6c5e70b32a6eacba96c9f860ced0307 rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 3b95c9595db3e10077c4eca8f63d80414bf3a50c1f0f6b2ac33f1992ee0940db rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 767761d99846174dfb7dfb579e2e2be63800478858a82f3f7050cc9555209a89 rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.asc -sha256 1e53306124de9f282452bd6085e86918e5e9f6f1940fc79809a1b284272e2d2b rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 3e8bb4265c8c6d8984b69eeefe015131ea140148a58179b3abec5653d93bea7d rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 cbfce327b623e341c1243f0d29ef2f60e5fb205d406c79eb8be1433652c3c9a5 rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 b6d00c4e338744ce1bf5b314f1056472acf1eb416f65057a8b3ca0a992fb04df rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 8a7e46b15adb0718b4e4ee33cd46529117411e8d73c29043778b05e7412c2b46 rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 6102f98617dd37874f3d755d0a325b45d47c6e1715c39d5e9bc037992e4d3cd6 rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 720958bc039c9ff00e7e399adf45f044484c5695a71bde0d07e0c895a819fe74 rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.asc -sha256 22cbbf0b22d9b0894cfbd6e1dd6b95b71c7ad02cee4e477d375dcf81af8d1337 rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.asc -sha256 49beb678732f34a0bfc22f94900c3d4a17ec05effdb7377864042df73b2a2819 rust-std-1.67.1-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409 rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.asc -sha256 a2c6e55a8a2987d0c306d2c164347a70ab7a6a18f6562039a772b33e25934972 rust-std-1.67.1-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.asc -sha256 048b3da190212b742f7a052618b57683dc96ee2b6c25fc7f5ae751143cb79bad rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.asc -sha256 b9ef413b764a92d42e07a2e588268ece09994d2cd1ab2a93858c27f85a250349 rust-std-1.67.1-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 ef7fe3160de629f0d38788f2c270f87b0631480e5b0d848595b460528de719e4 rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 15fdb3e8b39c8a122e9beee0c4c909ee8ec356e57aaaaae5f2b9e94f58d73c87 rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 6ccfd98fd920cc2f1199bcf9a842430c27f6fcd2cc46c18421e487309ff7811e rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 78477c45f5b848b156adaf0e0f6f2954ae73e2903321d1636c155020175eaaf5 rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 94410897626546dde806a114299c3c32abb6b4b294af5daea5c4d136751fe063 rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.asc -sha256 b3f1a338e69428f1611f059c67b8afafa78ce5c7ed0799f8a90795390261d3a4 rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 26efe78c09ed36da34964c0d023cf9aa404766ab790a94d9becd373b8879cb5a rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 135f5e6ab6d8f077a14521d387d3f31831abdb840ca4e6a15b6f0d0d5b7dbc81 rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 364c47ed22e4268edf238d221c40007d7d8792a66ca325d3937596a9c911ea48 rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 63a7e6a6c889a3d01bb3c66a3def3e41963511ea52e13906669da5b29b2fd9da rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 04573298d9e815c1e8c47a2f9548ea55d4a2afc538eceaa6a704d44a5e1f7e3e rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 addf0b0beb1966787e599f32849f18c28d5cb65515272b7d9608d4a1dddee2e7 rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9 rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc -sha256 89741cd2ac00c3a3f565bcccdf442cc1f9ec58ea419f1f0d09e911be0ff86c87 rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 79cb5c840e44d0e3623335e59c2849dd73e0048fc6f97f2d351e88b0bd85040a rust-1.68.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 650b7cd7a13e4739de39e7e89c534600cfb33afdc6d7774b87ed64e5b7cd17a3 rust-1.68.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 7d0aab2e137295af67b77146c2a95f90fe98ee7bd4966ad0c22d2e02681bdf99 rust-1.68.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 aa56fd4432f100a9af4b4376adc112555d2b29d4673602374ae04d961ba778be rust-1.68.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 ca4f14022c67caef7813e9a02875c49ab431d2b6657f83966011c6f6577a34e2 rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 6730365b822d588f7132d6416a94edd61767f49d31c8777448a734f03bff9375 rust-1.68.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 46e28305a69af20b7b6e8888a2b98656428d28e0906e71b4be1d0089f0f9032b rust-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 f66202760b26b66169f8b923dbc72bdc7eb78dabe687d78397ce73de44165edd rust-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 bdf82d1046f16188b11afc19088057f2ad096101d995ac7edbbbd632af199b84 rust-1.68.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 183d53f7488095550788fe38eff80542d68e6bd92ee48442d2ce0bd60a7eceaf rust-1.68.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 caf2385d507d6ce3f3550bd41e5c2be95053564b76851fc5920b9770a1e6046f rust-std-1.68.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 90e19eb15fd5b1f206f33e6f50a00ab5785aa5600ae7ccf5787ca64aec63f85f rust-std-1.68.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 40714404769bfa989c2da9f24e28cdfb8395ec8993bbec1544e2bba6030d0d3f rust-std-1.68.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 f455a4c19db7a548571405a591c76b3087995f58f529010b2e6c3e4bcd6ce49b rust-std-1.68.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 9eab35245a3193b8242b5ed08b896c8deeb3197c013134783d7062fa992213d0 rust-std-1.68.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 c0e2c4f1ff860f6073870901cde9aee61eb39932cc59d7a320760874505da4f0 rust-std-1.68.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 d7f562e6f3071972fc54ab1c8e35bf9c464376c43b1039d6bcfc602a3a997302 rust-std-1.68.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 41a6db7397757390dd53e2806c244159d3b8755957fb5c464df31fa83e982e66 rust-std-1.68.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 07a41cdf9bf8e0a42018f550c0c535afd0b0bbe967f5de13adab965170903aca rust-std-1.68.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 a6baaf8a3409b2601134d0a7035b5f764472954b29a978543aba97e5413920c1 rust-std-1.68.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 f18851de6f979076b94d399a4e2d5553a9251444a7cb3d4dad59d568f177e084 rust-std-1.68.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 50897d7bcfbd3f30d4552fd87bed46e3886beab9963bbae90aca8cc7ef9fe2d4 rust-std-1.68.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 6cf446799b6cb659da932dd7c2ffcbd028b86f28db89771d7f4485e939ec9bc2 rust-std-1.68.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-i586-unknown-linux-musl.tar.xz.asc +sha256 7458325c76d82cffcde5cbecdacafe0d8f62d650ba711c0153bcca0d0d83bd0e rust-std-1.68.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 a6ea604be18d30e5c41e53bb41486d3bddc0c7289056895127d93ad6fb30691c rust-std-1.68.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-i686-unknown-linux-musl.tar.xz.asc +sha256 ceb9f340ec4b57e3d12885f7a35a9bbf510d3aa70311d5a656db1893650e2187 rust-std-1.68.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 1fdf0323e24442c990c8f59142225c3b0e1ab8c666d7aac34158dc26c6905004 rust-std-1.68.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips-unknown-linux-musl.tar.xz.asc +sha256 03b1cb375241aab01b36261193f47737ffc05038a5dfb34de879c8300c9c722b rust-std-1.68.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 1e3e1382aad0582e57bef856d35c79a69a0c9141dfa26a2642f053add57aaf0b rust-std-1.68.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 d69d196cc73ed629bc9bf7b76556463f3aca8318729b380fd4a23f1dbea2a0f5 rust-std-1.68.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 14aa5d7813239667fc111fb378243a888b3a2b0a1960a40ab7901476bb5a7abe rust-std-1.68.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 95bf115ca743f1379b1fbf052202c1dfc8ea1eb6dbf82e0ee8eafe77a9f60cca rust-std-1.68.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 c31ce8298655750e493c7065512e858cdd60457c3db855e154dc9f9d3140fe48 rust-std-1.68.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 3e0bd2a95b94848c887930d27821e9de4c1963b5d4d0b2fea28e06e80cdc422e rust-std-1.68.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 1047a97e42079562ec685e19af6fd817e860eaf847cd4b3f1486a949af810a7a rust-std-1.68.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 a446a6445fdb536e1ca1bfe4233b7bf0f808cee00c043cc1ae6e06f3e59d3f2a rust-std-1.68.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 d9561344d71ea49491f6e9ea9913c93824fbac6b51319d1559ab2a432ca01ba3 rust-std-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 aaf5f145be482ad21ab3af0552a5ad3e2968430e08dbf62011228532bc45237d rust-std-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 89398529b7cbeed722fcb263c45b94a46a37ce9a446036f5e5af6101acb520cf rust-std-1.68.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 244f488ffbac717768cc800b25d6142409160e2ec9e899748b696d9f1845bc2d rust-std-1.68.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 566f4e83e96e8e141d3444a09a014a3a69c786b3eef122389747eaaf4c1525b5 rust-std-1.68.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 5109c26489ad6f316b8f5b953805b83c21f21f3a72b443704029f11ebe539b8e rust-std-1.68.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index bb66de5ec59d..9efca1dcbdc3 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.67.1 +RUST_BIN_VERSION = 1.68.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 1b4b08ceccd4..d717ccbfeffc 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.asc -sha256 77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682 rustc-1.67.1-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.68.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.68.0-src.tar.xz.asc +sha256 8651245e8708f11d0f65ba9fdb394c4b9300d603d318045664b371729da9eac4 rustc-1.68.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 814a3c1dd43a..51574c357401 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.67.1 +RUST_VERSION = 1.68.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From f5b50cb14ca5b08c2d123a63b4d8829f19078578 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Thu, 16 Mar 2023 13:53:04 +0000 Subject: [PATCH 0100/2890] package/bluez5_utils: fix media control profile With bluez 5.66 (bumped in c6c79d6) the Media Control Profile (MCP), Basic Audio Profile (BAP) and Volume Control Profile (VCP) where added. All three are enabled by default. MCP only works if AVRCP is enabled, as it requires player.c which is otherwise not compiled. Only enable all three new profiles when the audio plugin is selected. Fixes: - http://autobuild.buildroot.net/results/d62/d6260a5acf766657f683d85fa1bdc27b7a43551e/ Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/bluez5_utils/bluez5_utils.mk | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 4059b3455656..7fe6899cdb6b 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -64,9 +64,19 @@ endif # enable audio plugins (a2dp and avrcp) ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO),y) -BLUEZ5_UTILS_CONF_OPTS += --enable-a2dp --enable-avrcp -else -BLUEZ5_UTILS_CONF_OPTS += --disable-a2dp --disable-avrcp +BLUEZ5_UTILS_CONF_OPTS += \ + --enable-a2dp \ + --enable-avrcp \ + --enable-bap \ + --enable-mcp \ + --enable-vcp +else +BLUEZ5_UTILS_CONF_OPTS += \ + --disable-a2dp \ + --disable-avrcp \ + --disable-bap \ + --disable-mcp \ + --disable-vcp endif # enable health plugin From 456204e7e02cc787cee65711409025245ce337de Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Thu, 16 Mar 2023 13:53:14 +0000 Subject: [PATCH 0101/2890] package/bluez5_utils: fix SysV init script - Use daemon name (bluetoothd) as file name. - Script doesn't need to be executable. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/bluez5_utils/{S40bluetooth => S40bluetoothd} | 0 package/bluez5_utils/bluez5_utils.mk | 4 ++-- 3 files changed, 2 insertions(+), 3 deletions(-) rename package/bluez5_utils/{S40bluetooth => S40bluetoothd} (100%) mode change 100755 => 100644 diff --git a/.checkpackageignore b/.checkpackageignore index 04966a9b068a..4faa3a8b8f88 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -8,7 +8,6 @@ package/avahi/S05avahi-setup.sh Indent Variables package/avahi/S50avahi-daemon Indent Variables package/babeld/S50babeld Indent Shellcheck Variables package/bind/S81named Indent Shellcheck Variables -package/bluez5_utils/S40bluetooth NotExecutable Variables package/boinc/S99boinc-client Indent Shellcheck Variables package/brickd/S70brickd Indent Shellcheck Variables package/brltty/S10brltty Indent Shellcheck Variables diff --git a/package/bluez5_utils/S40bluetooth b/package/bluez5_utils/S40bluetoothd old mode 100755 new mode 100644 similarity index 100% rename from package/bluez5_utils/S40bluetooth rename to package/bluez5_utils/S40bluetoothd diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 7fe6899cdb6b..37a2e79a7a50 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -194,8 +194,8 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-systemd endif define BLUEZ5_UTILS_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/bluez5_utils/S40bluetooth \ - $(TARGET_DIR)/etc/init.d/S40bluetooth + $(INSTALL) -m 0755 -D package/bluez5_utils/S40bluetoothd \ + $(TARGET_DIR)/etc/init.d/S40bluetoothd endef $(eval $(autotools-package)) From b2cf393c335b1839b8fed8e1f8e8a499fcb7b6c5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 18 Mar 2023 14:29:11 +0100 Subject: [PATCH 0102/2890] Update for 2022.11.3 Signed-off-by: Peter Korsgaard (cherry picked from commit 904c8b538e71fcc565f39b72d93b9dd6c67211c0) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGES b/CHANGES index a03a4876b8a0..f35a55726e20 100644 --- a/CHANGES +++ b/CHANGES @@ -132,6 +132,31 @@ #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. #15331: Warning on python-flit-core license when generating legal info +2022.11.3, released March 18th, 2023 + + Important / security related fixes. + + Updated/fixed packages: ace, apache, apr, apr-util, asterisk, + at91dataflashboot, audit, bash, bind, bridge-utils, clamav, + dmalloc, efivar, erlang, exfat, exfat-utils, f2fs-tools, gcc, + gdal, gensio, gerbera, git, glslsandbox-player, go, haproxy, + hawktracer, intel-gmmlib, ipmiutil, less, libblockdev, + libcurl, libev, libgcrypt, libglfw, libmad, libmdbx, + libmodsecurity, libolm, libpjsip, lirc-tools, + lttng-babeltrace, mender, mpv, mutt, mxs-bootlets, netsurf, + ntpsec, nut, opensbi, opus, paho-mqtt-c, pcm-tools, php, + pistache, proftpd, proxychains-ng, pulseaudio, + python-cryptography, python-django, python-m2crypto, + python-numpy, python-werkzeug, qemu, quazip, quickjs, + rockchip-mali, rsync, s6-linux-utils, sudo, tiff, uacme, uqmi, + webkitgtk, wilc-driver, wpa_supplicant, wpewebkit, + xdriver_xf86-video-qxl, znc + + Issues resolved (http://bugs.uclibc.org): + + #15306: glibc build fails in Docker container + #15361: Buildroot linking error on Apple Silicon + 2022.11.2, released March 1st, 2023 Important / security related fixes. From e39cbef783e9fbf840cdcb9472b313a1dca3f193 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 19 Mar 2023 14:55:12 +0100 Subject: [PATCH 0103/2890] docs/website: update for 2022.11.3 Signed-off-by: Peter Korsgaard --- docs/website/news.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index fec6b414e29c..05d06c6d9669 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

News

    +
  • +
    +
    +
    +

    2022.11.3 released, 2022.11.x series EOL

    +

    18 March 2023

    +
    +
    +

    The 2022.11.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2022.11.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2022.11.3 release.

    + +

    Notice that the 2022.11.x series is now end of life. Please migrate to + the 2023.02 series instead which will be supported until April 2024.

    +
    +
    +
    • +
  • From 1ad6d0dea57cdc0099399c67f68ccf5e693c9da6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 19 Mar 2023 11:20:22 +0100 Subject: [PATCH 0104/2890] Update for 2022.02.11 Signed-off-by: Peter Korsgaard (cherry picked from commit 71a2706320dbc22b16397b70b2d53b903bde0752) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGES b/CHANGES index f35a55726e20..e184f3f3be12 100644 --- a/CHANGES +++ b/CHANGES @@ -775,6 +775,27 @@ #14731: BR2_PACKAGE_IOSTAT #14751: LVM2 Outdated Link +2022.02.11, released March 19th, 2023 + + Important / security related fixes. + + Updated/fixed packages: apache, apr, apr-util, asterisk, + at91dataflashboot, audit, bash, bind, bridge-utils, clamav, + dmalloc, exfat, exfat-utils, f2fs-tools, gcc, git, + glslsandbox-player, go, haproxy, intel-gmmlib, ipmiutil, less, + libblockdev, libcurl, libev, libgcrypt, libmad, libmdbx, + libmodsecurity, libolm, libpjsip, lttng-babeltrace, mender, + mpv, mutt, mxs-bootlets, opensbi, opus, paho-mqtt-c, + pcm-tools, php, proxychains-ng, python-django, + python-m2crypto, python-werkzeug, quazip, quickjs, + rockchip-mali, rsync, sudo, tiff, uacme, uqmi, webkitgtk, + wpebackend-fdo, wpewebkit, xdriver_xf86-video-qxl, znc + + Issues resolved (http://bugs.uclibc.org): + + #15306: glibc build fails in Docker container + #15361: Buildroot linking error on Apple Silicon + 2022.02.10, released March 1st, 2023 Important / security related fixes. From 48781ec9604834a8e5f0acbe2d71a0c469b54fed Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 19 Mar 2023 14:58:06 +0100 Subject: [PATCH 0105/2890] docs/website: update for 2022.02.11 Signed-off-by: Peter Korsgaard --- docs/website/news.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 05d06c6d9669..257678465ab3 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

    News

      +
    • +
      +
      +
      +

      2022.02.11 released

      +

      19 March 2023

      +
      +
      +

      The 2022.02.11 bugfix release is out, fixing a number of important / + security related issues discovered since the 2022.02.10 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2022.02.11 release.

      +
      +
      +
      • +
    • From c5b453f47892fbb3f7c505e98cb24939161d37eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Thu, 16 Mar 2023 13:36:52 +0100 Subject: [PATCH 0106/2890] package/python-apispec: bump to 6.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Hundebøll Signed-off-by: Thomas Petazzoni --- package/python-apispec/python-apispec.hash | 4 ++-- package/python-apispec/python-apispec.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-apispec/python-apispec.hash b/package/python-apispec/python-apispec.hash index f2861f920a63..f8a2350eaf30 100644 --- a/package/python-apispec/python-apispec.hash +++ b/package/python-apispec/python-apispec.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/apispec/json -md5 b4e90006a26215e2e0a6fe2629d12c10 apispec-6.0.2.tar.gz -sha256 e76d80b739edef4be213092a6384ad7fd933ba7d64f6d5a0aff8d4da1bef7887 apispec-6.0.2.tar.gz +md5 d6cc7586754cf1c653ffb7ee83955d3a apispec-6.3.0.tar.gz +sha256 6cb08d92ce73ff0b3bf46cb2ea5c00d57289b0f279fb0256a3df468182ba5344 apispec-6.3.0.tar.gz # Locally computed sha256 checksums sha256 a452afcef750956a8396f7e7a6f913a117d28ef99a13170c29dc74c3b7a95f29 LICENSE diff --git a/package/python-apispec/python-apispec.mk b/package/python-apispec/python-apispec.mk index 4674ce0c3dac..744fb7681057 100644 --- a/package/python-apispec/python-apispec.mk +++ b/package/python-apispec/python-apispec.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_APISPEC_VERSION = 6.0.2 +PYTHON_APISPEC_VERSION = 6.3.0 PYTHON_APISPEC_SOURCE = apispec-$(PYTHON_APISPEC_VERSION).tar.gz -PYTHON_APISPEC_SITE = https://files.pythonhosted.org/packages/a7/2a/b42c17e0d653341b8f5916999892cd2d8489de127dac6118ae44531674f5 +PYTHON_APISPEC_SITE = https://files.pythonhosted.org/packages/3f/1e/207c3e61c805eef214d7e5c58106312f9af4733b07f470224e4e309dc65e PYTHON_APISPEC_SETUP_TYPE = setuptools PYTHON_APISPEC_LICENSE = MIT PYTHON_APISPEC_LICENSE_FILES = LICENSE From 1c36821be1ffa7a55a7c87da7e224b457091c562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Thu, 16 Mar 2023 13:36:53 +0100 Subject: [PATCH 0107/2890] package/python-marshmallow-sqlalchemy: bump to version 0.29.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Hundebøll Signed-off-by: Thomas Petazzoni --- .../python-marshmallow-sqlalchemy.hash | 4 ++-- .../python-marshmallow-sqlalchemy.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash index 6b847de94d16..db061b623f22 100644 --- a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/marshmallow-sqlalchemy/json -md5 5e012b07ccf4ad67dbd3f38cc68cb1f4 marshmallow-sqlalchemy-0.28.1.tar.gz -sha256 aa376747296780a56355e3067b9c8bf43a2a1c44ff985de82b3a5d9e161ca2b8 marshmallow-sqlalchemy-0.28.1.tar.gz +md5 e1b2858be2f0ce6dead48e67080631c4 marshmallow-sqlalchemy-0.29.0.tar.gz +sha256 3523a774390ef0c1c0f7c708a7519809c5396cf608720f14f55c36f74ff5bbec marshmallow-sqlalchemy-0.29.0.tar.gz # Locally computed sha256 checksums sha256 625df8e2758a271b4bc90525c0b6161814e0f72cb3504b03ab5206b7abf50072 LICENSE diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk index 293ea29be60b..8f176feb4da3 100644 --- a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 0.28.1 +PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 0.29.0 PYTHON_MARSHMALLOW_SQLALCHEMY_SOURCE = marshmallow-sqlalchemy-$(PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION).tar.gz -PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/eb/96/3895bde2247fa653c36d887ff08e439665668aa7c991a3924ae199be88d6 +PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/fa/0d/4dd275732213cefb4e49a86c60443cb1e3e0d0bd605625aed3fa7bb22fdd PYTHON_MARSHMALLOW_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE = MIT PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE_FILES = LICENSE From 25defd685737913fcac59b00819c82118df533f9 Mon Sep 17 00:00:00 2001 From: Martin Hundeboll Date: Thu, 16 Mar 2023 10:45:15 +0100 Subject: [PATCH 0108/2890] package/ifupdown: bump to 0.8.41 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MUSL support is patched by defining FNM_EXTMATCH to zero, which omits GNU-only extended pattern matching. Signed-off-by: Martin Hundebøll Signed-off-by: Thomas Petazzoni --- ...e-GNU-only-FNM_EXTMATCH-to-zero-on-n.patch | 41 +++++++++++++++++++ package/ifupdown/ifupdown.hash | 4 +- package/ifupdown/ifupdown.mk | 5 ++- 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 package/ifupdown/0001-archcommon-define-GNU-only-FNM_EXTMATCH-to-zero-on-n.patch diff --git a/package/ifupdown/0001-archcommon-define-GNU-only-FNM_EXTMATCH-to-zero-on-n.patch b/package/ifupdown/0001-archcommon-define-GNU-only-FNM_EXTMATCH-to-zero-on-n.patch new file mode 100644 index 000000000000..b1b58f1e7e64 --- /dev/null +++ b/package/ifupdown/0001-archcommon-define-GNU-only-FNM_EXTMATCH-to-zero-on-n.patch @@ -0,0 +1,41 @@ +From e27fe4b483194ee57736c228b7a6c56696ae8a06 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= +Date: Thu, 16 Mar 2023 09:29:20 +0100 +Subject: [PATCH] archcommon: define GNU-only FNM_EXTMATCH to zero on non-glibc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +FNM_EXTMATCH is a GNU extension that enables extended pattern matching +for fnmatch(3). Defining it to zero on non-glibc builds makes ifupdown +usable, albeit with a sligthy reduced pattern matching feature set. + +Signed-off-by: Martin Hundebøll +Upstream-status: Denied [https://salsa.debian.org/debian/ifupdown/-/merge_requests/5] +--- + archcommon.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/archcommon.h b/archcommon.h +index 818b0b6..981e84f 100644 +--- a/archcommon.h ++++ b/archcommon.h +@@ -1,5 +1,15 @@ + #include "header.h" + ++/* ++ * FNM_EXTMATCH is a GNU extension, so it isn't available when compiling ++ * with MUSL. Defining FNM_EXTMATCH to zero is safe, as the flag merely ++ * enables extended pattern matching, which MUSL users should be able to ++ * live without. ++ */ ++#ifndef FNM_EXTMATCH ++#define FNM_EXTMATCH 0 ++#endif ++ + bool execable(const char *); + + #define iface_is_link() (!_iface_has(ifd->real_iface, ":.")) +-- +2.39.2 + diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash index f8844a60a683..f5c2d2d34c4f 100644 --- a/package/ifupdown/ifupdown.hash +++ b/package/ifupdown/ifupdown.hash @@ -1,4 +1,4 @@ -# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.16.dsc -sha256 601416c12e39ac29022951a2867aed5c607f732ac57fd51517bfba92a4cc4fb0 ifupdown_0.8.16.tar.xz +# From http://snapshot.debian.org/archive/debian/20230222T205615Z/pool/main/i/ifupdown/ifupdown_0.8.41.dsc +sha256 222c5bef313a9e71d9be4b946c73c8606c98f9e0229153191d9c6d8fb9b3599c ifupdown_0.8.41.tar.xz # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk index e62c2a79c5c3..14c36db0dbc6 100644 --- a/package/ifupdown/ifupdown.mk +++ b/package/ifupdown/ifupdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -IFUPDOWN_VERSION = 0.8.16 +IFUPDOWN_VERSION = 0.8.41 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz -IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20230222T205615Z/pool/main/i/ifupdown IFUPDOWN_LICENSE = GPL-2.0+ IFUPDOWN_LICENSE_FILES = COPYING IFUPDOWN_CPE_ID_VENDOR = debian @@ -14,6 +14,7 @@ IFUPDOWN_CPE_ID_VENDOR = debian define IFUPDOWN_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -D'IFUPDOWN_VERSION=\"$(IFUPDOWN_VERSION)\"'" \ + ARCH=linux \ -C $(@D) endef From 8fb31ceddd37d1804617c5ddba947fc18ba6f535 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 19 Mar 2023 13:16:58 +0100 Subject: [PATCH 0109/2890] package/rtl8189es: bump to version 2023-03-14 on master branch Let's drop local patch that has been upstreamed and note that this version supports up to Linux 6.3 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- .../0001-Fix-build-failure-on-PowerPC64.patch | 113 ------------------ package/rtl8189es/rtl8189es.hash | 2 +- package/rtl8189es/rtl8189es.mk | 2 +- 3 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch diff --git a/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch b/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch deleted file mode 100644 index 8c876f16ee41..000000000000 --- a/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch +++ /dev/null @@ -1,113 +0,0 @@ -From c7bf7590bc0d7252005fd0496898ad420a85e1ae Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 27 Feb 2023 09:12:39 +0100 -Subject: [PATCH] Fix build failure on PowerPC64 - -get_ra() is defined in Linux kernel for PowerPC64 architecture and it -conflicts with local get_ra() definition so let's rename local definition -as rtl_get_ra(). - -Signed-off-by: Giulio Benetti ---- - core/rtw_odm.c | 6 +++--- - core/rtw_recv.c | 4 ++-- - hal/hal_com.c | 2 +- - include/wifi.h | 2 +- - os_dep/linux/ioctl_cfg80211.c | 2 +- - 5 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/core/rtw_odm.c b/core/rtw_odm.c -index 8a35816..d74e134 100644 ---- a/core/rtw_odm.c -+++ b/core/rtw_odm.c -@@ -273,7 +273,7 @@ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys) - RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n" - , *phys & 0xf - , MAC_ARG(get_ta(wlanhdr)) -- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" -+ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" - , HDATA_RATE(attrib->data_rate) - , phys_t0->band, phys_t0->channel, phys_t0->rxsc - ); -@@ -383,7 +383,7 @@ type1_end: - RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, rf_mode:%u, l_rxsc:%u, ht_rxsc:%u) => %u,%u\n" - , *phys & 0xf - , MAC_ARG(get_ta(wlanhdr)) -- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" -+ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" - , HDATA_RATE(attrib->data_rate) - , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc - , pkt_cch, pkt_bw -@@ -401,7 +401,7 @@ type1_end: - RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n" - , *phys & 0xf - , MAC_ARG(get_ta(wlanhdr)) -- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" -+ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" - , HDATA_RATE(attrib->data_rate) - , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc - ); -diff --git a/core/rtw_recv.c b/core/rtw_recv.c -index dc65adf..a5a65f9 100644 ---- a/core/rtw_recv.c -+++ b/core/rtw_recv.c -@@ -4678,7 +4678,7 @@ void rx_query_phy_status( - wlanhdr = get_recvframe_data(precvframe); - - ta = get_ta(wlanhdr); -- ra = get_ra(wlanhdr); -+ ra = rtl_get_ra(wlanhdr); - is_ra_bmc = IS_MCAST(ra); - - if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) { -@@ -4818,7 +4818,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) - { - s32 ret = _SUCCESS; - u8 *pbuf = precvframe->u.hdr.rx_data; -- u8 *pda = get_ra(pbuf); -+ u8 *pda = rtl_get_ra(pbuf); - u8 ra_is_bmc = IS_MCAST(pda); - _adapter *primary_padapter = precvframe->u.hdr.adapter; - #ifdef CONFIG_CONCURRENT_MODE -diff --git a/hal/hal_com.c b/hal/hal_com.c -index c28ae39..27b0825 100644 ---- a/hal/hal_com.c -+++ b/hal/hal_com.c -@@ -13406,7 +13406,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe) - - /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/ - if (psta) { -- if (IS_MCAST(get_ra(get_recvframe_data(prframe)))) -+ if (IS_MCAST(rtl_get_ra(get_recvframe_data(prframe)))) - psta_dframe_info = &psta->sta_dframe_info_bmc; - else - psta_dframe_info = &psta->sta_dframe_info; -diff --git a/include/wifi.h b/include/wifi.h -index def77a4..c2e7afb 100644 ---- a/include/wifi.h -+++ b/include/wifi.h -@@ -456,7 +456,7 @@ __inline static int IS_MCAST(const u8 *da) - return _FALSE; - } - --__inline static unsigned char *get_ra(unsigned char *pframe) -+__inline static unsigned char *rtl_get_ra(unsigned char *pframe) - { - unsigned char *ra; - ra = GetAddr1Ptr(pframe); -diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c -index 4e810e5..e744d69 100644 ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -6347,7 +6347,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra - indicate: - #endif - #if defined(RTW_DEDICATED_P2P_DEVICE) -- if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), get_ra(frame), &wdev)) -+ if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), rtl_get_ra(frame), &wdev)) - if (0) - RTW_INFO("redirect to pd_wdev:%p\n", wdev); - #endif --- -2.34.1 - diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash index 44d73e60f091..64f6158654f7 100644 --- a/package/rtl8189es/rtl8189es.hash +++ b/package/rtl8189es/rtl8189es.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 96347dbfedd95a217fb89b7b295fe417b711dbad3db896ef0c2fa733c6d150fd rtl8189es-e58bd86c9d9408c648b1246a0dd76b16856ec172.tar.gz +sha256 05d839c9b7820008bf7975c2f4a3dde6265dbae0c5dc48cefcee3a79492dc377 rtl8189es-ae7b31e55526ca0e01d2a3310118530bff4f1055.tar.gz diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk index c2ee77f92290..a40f656d3ea9 100644 --- a/package/rtl8189es/rtl8189es.mk +++ b/package/rtl8189es/rtl8189es.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189ES_VERSION = e58bd86c9d9408c648b1246a0dd76b16856ec172 +RTL8189ES_VERSION = ae7b31e55526ca0e01d2a3310118530bff4f1055 RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION)) RTL8189ES_LICENSE = GPL-2.0 From 5b1e431500d6e7d17cd23d70d55df2ba99813852 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 19 Mar 2023 13:16:59 +0100 Subject: [PATCH 0110/2890] package/rtl8189fs: bump to version 2023-03-13 on branch rtl8189fs rtl8189fs branch is specific for rtl8189fs controller and diverged from master so let's switch branch from master to rtl8189s to fix runtime failure. Signed-off-by: Giulio Benetti Tested-by: Indrek Kruusa Signed-off-by: Thomas Petazzoni --- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index 4f117cfd14e3..018e5b8a7785 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 96347dbfedd95a217fb89b7b295fe417b711dbad3db896ef0c2fa733c6d150fd rtl8189fs-e58bd86c9d9408c648b1246a0dd76b16856ec172.tar.gz +sha256 20382dbb1ac33425e6b3198cc9be269b79cd1423ea656e0ccd16dedafa3e2a2a rtl8189fs-ed6741b52bc998875298117b55d18b0d557c37a6.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 15a5329a45b2..2dd9e6097c59 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = e58bd86c9d9408c648b1246a0dd76b16856ec172 +RTL8189FS_VERSION = ed6741b52bc998875298117b55d18b0d557c37a6 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 From 9f5c8bd4305ab7667f3a36911ba58cef358b5aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CA=8E=C9=90H=20=C7=9D=CA=8C=C7=9D=CA=87S?= Date: Sun, 19 Mar 2023 15:22:12 +0100 Subject: [PATCH 0111/2890] package/ca-certificates: bump version to 20230311 The impetus for this change was that wget fails to load pages signed by Let's Encrypt due to missing root certs. This version has the updated and correct certs. 0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch Patch dropped because the fix is incorporated upstream. Signed-off-by: Steve Hay Signed-off-by: Thomas Petazzoni --- ...2pem.py-make-cryptography-module-opt.patch | 27 ++++++++--------- ...2pem.py-Fix-compat-with-cryptography.patch | 29 ------------------- package/ca-certificates/ca-certificates.hash | 4 +-- package/ca-certificates/ca-certificates.mk | 4 +-- 4 files changed, 17 insertions(+), 47 deletions(-) delete mode 100644 package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch diff --git a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch index b76c1bfd7f55..ed90c217eca8 100644 --- a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch +++ b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch @@ -1,4 +1,4 @@ -From bf18b564122e8f976681a2398862fde1eafd84ba Mon Sep 17 00:00:00 2001 +From a4e468a2a0afa80df174831c2f422184820bb0fa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 6 Jan 2022 23:15:00 +0100 Subject: [PATCH] mozilla/certdata2pem.py: make cryptography module optional @@ -14,38 +14,39 @@ cryptography Python module is there, we perform the check, otherwise the check is skipped. Signed-off-by: Thomas Petazzoni +[Steve: refreshed to apply on ca-certificates version 20230311] +Signed-off-by: Steve Hay --- - mozilla/certdata2pem.py | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) + mozilla/certdata2pem.py | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py -index ede23d4..a6261f8 100644 +index 4df86a2..3a6d7dc 100644 --- a/mozilla/certdata2pem.py +++ b/mozilla/certdata2pem.py -@@ -28,9 +28,6 @@ import sys +@@ -28,8 +28,6 @@ import sys import textwrap import io -from cryptography import x509 - -- + objects = [] - # Dirty file parser. -@@ -122,11 +119,16 @@ for obj in objects: +@@ -122,11 +120,16 @@ for obj in objects: if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]: continue -- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) -- if cert.not_valid_after < datetime.datetime.now(): +- cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) +- if cert.not_valid_after < datetime.datetime.utcnow(): - print('!'*74) - print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) - print('!'*74) + try: + from cryptography import x509 + -+ cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) -+ if cert.not_valid_after < datetime.datetime.now(): ++ cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) ++ if cert.not_valid_after < datetime.datetime.utcnow(): + print('!'*74) + print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) + print('!'*74) @@ -55,5 +56,5 @@ index ede23d4..a6261f8 100644 bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\ .replace(' ', '_')\ -- -2.33.1 +2.30.2 diff --git a/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch b/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch deleted file mode 100644 index 0537da92242d..000000000000 --- a/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5e493ca307a031e81528ceddb96f3da40bc062cf Mon Sep 17 00:00:00 2001 -From: Wataru Ashihara -Date: Wed, 2 Nov 2022 12:40:05 -0400 -Subject: [PATCH] mozilla/certdata2pem.py: Fix compat with cryptography > 3.0 - -In newer cryptography packages, load_der_x509_certificate is enforced to be 'bytes' rather than currently used 'bytearray'. This fixes that. - -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008244 -Signed-off-by: Justin Wood ---- - mozilla/certdata2pem.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py -index a6261f8..c0fa52c 100644 ---- a/mozilla/certdata2pem.py -+++ b/mozilla/certdata2pem.py -@@ -122,7 +122,7 @@ for obj in objects: - try: - from cryptography import x509 - -- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) -+ cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) - if cert.not_valid_after < datetime.datetime.now(): - print('!'*74) - print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) --- -2.38.1 - diff --git a/package/ca-certificates/ca-certificates.hash b/package/ca-certificates/ca-certificates.hash index a1675b999e73..8a5b48dd7916 100644 --- a/package/ca-certificates/ca-certificates.hash +++ b/package/ca-certificates/ca-certificates.hash @@ -1,6 +1,4 @@ # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc : -sha1 bce5a8fac45456dbebf256f3a812c6cd0a853e3e ca-certificates_20211016.tar.xz -sha256 2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88 ca-certificates_20211016.tar.xz - +sha256 83de934afa186e279d1ed08ea0d73f5cf43a6fbfb5f00874b6db3711c64576f3 ca-certificates_20230311.tar.xz # Locally computed sha256 e85e1bcad3a915dc7e6f41412bc5bdeba275cadd817896ea0451f2140a93967c debian/copyright diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 0b6962ab7b86..202d0b92ac51 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -4,9 +4,9 @@ # ################################################################################ -CA_CERTIFICATES_VERSION = 20211016 +CA_CERTIFICATES_VERSION = 20230311 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz -CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates +CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20230317T205011Z/pool/main/c/ca-certificates CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data) CA_CERTIFICATES_LICENSE_FILES = debian/copyright From 3b645ffda6529278212ab93eb038da28014502cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Mar 2023 20:12:12 +0100 Subject: [PATCH 0112/2890] package/libmicrohttpd: security bump to version 0.9.76 Fix CVE-2023-27371: GNU libmicrohttpd before 0.9.76 allows remote DoS (Denial of Service) due to improper parsing of a multipart/form-data boundary in the postprocessor.c MHD_create_post_processor() method. This allows an attacker to remotely send a malicious HTTP POST packet that includes one or more '\0' bytes in a multipart/form-data boundary field, which - assuming a specific heap layout - will result in an out-of-bounds read and a crash in the find_boundary() function. https://lists.gnu.org/archive/html/libmicrohttpd/2023-02/msg00000.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libmicrohttpd/libmicrohttpd.hash | 2 +- package/libmicrohttpd/libmicrohttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index 7f95e78a6e9b..ce30e2ba1188 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9278907a6f571b391aab9644fd646a5108ed97311ec66f6359cebbedb0a4e3bb libmicrohttpd-0.9.75.tar.gz +sha256 f0b1547b5a42a6c0f724e8e1c1cb5ce9c4c35fb495e7d780b9930d35011ceb4c libmicrohttpd-0.9.76.tar.gz sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index f75178bc0a2e..4e7b72b65c3a 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.75 +LIBMICROHTTPD_VERSION = 0.9.76 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_CPE_ID_VENDOR = gnu From 9d39b2aed23dc822cfa56e6cc54fe605e0fd99d2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Mar 2023 20:25:26 +0100 Subject: [PATCH 0113/2890] package/wireshark: security bump to version 4.0.4 Fix CVE-2023-1161: ISO 15765 and ISO 10681 dissector crash in Wireshark 4.0.0 to 4.0.3 and 3.6.0 to 3.6.11 allows denial of service via packet injection or crafted capture file https://www.wireshark.org/security/wnpa-sec-2023-08.html https://www.wireshark.org/news/20230302.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 7128b560aedc..d89caa5de81a 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.3.txt -sha1 243b0057cfe6d447662e81b5646110aaf8b63c81 wireshark-4.0.3.tar.xz -sha256 6c51e15bcc0afb93734e686dbff354ffd159f570bd2904bcbbad6f3feb7e9511 wireshark-4.0.3.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.4.txt +sha1 ae3c28d6966c420ee3a8d058ea212a1b6adab50f wireshark-4.0.4.tar.xz +sha256 a4a09f6564f00639036ffe5064ac4dc2176adfa3e484c539c9c73f835436e74b wireshark-4.0.4.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 12c36575df10..f5a8e1f07065 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.3 +WIRESHARK_VERSION = 4.0.4 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 31a0d92bf3362c3852e75191e6c8e6ac230e5dcc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Mar 2023 20:53:27 +0100 Subject: [PATCH 0114/2890] package/vim: security bump to version 9.0.1414 Fix CVE-2023-1127, CVE-2023-1170, CVE-2023-1175, CVE-2023-1264 and CVE-2023-1355 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 4000beedc180..26bc913b8a27 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 bcaf9b21ab00ab49de4f3bdfda1bcda82533ec16c412824226544a3fce6506ff vim-9.0.1260.tar.gz +sha256 c2bddf283a19c8714d7b21716e0a6a3214f9edb60b080f233cce4143fe228ff3 vim-9.0.1414.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 d187aff219161f37138479257f82d687ea10b2cdd17d58b53a3ec9b79d6dc870 README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index e3648bfab911..bb6d4a8d277f 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.1260 +VIM_VERSION = 9.0.1414 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From 5f06ecf5e1516cac8911dbf9b05c66c0f7060379 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Mar 2023 08:34:19 +0100 Subject: [PATCH 0115/2890] package/agentpp: security bump to version 4.6.0 - Fixed (security) [APP-70]: Memory leak in MibLeaf::set if same OID is set twice in the same PDU. - Fix the following build failure raised since bump of snmppp to version 3.5.0 in commit e011fa0415883b9d44df616cfaf6956e1a11da88: snmp_pp_ext.cpp: In member function 'int Agentpp::Snmpx::send(const Agentpp::Pdux&, Snmp_pp::SnmpTarget*)': snmp_pp_ext.cpp:1172:47: error: binding reference of type 'Snmp_pp::Pdu&' to 'const Snmp_pp::Pdu' discards qualifiers 1172 | status = snmpmsg.loadv3(Snmp::get_mpv3(), pdu, engine_id, security_name, | Fixes: - http://autobuild.buildroot.net/results/d7347b8b3953596b66da6ca6d85f084fb427934c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/agentpp/agentpp.hash | 2 +- package/agentpp/agentpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/agentpp/agentpp.hash b/package/agentpp/agentpp.hash index 99aae7026363..527414eed546 100644 --- a/package/agentpp/agentpp.hash +++ b/package/agentpp/agentpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5f2cfe98fd1d50683e02c65fccd9423351254df427e5825e4f321c488a9234eb agent++-4.5.4.tar.gz +sha256 e09dc2d40277d468c18f1539ad18f43e0c3a95b10fad8a02184e9ace8bac0d67 agent++-4.6.0.tar.gz sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index d020228e44bf..0ef549426e56 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -AGENTPP_VERSION = 4.5.4 +AGENTPP_VERSION = 4.6.0 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 From 11f8c11dfb61f1efa92d80de2d5ee915d73ff656 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Mar 2023 18:13:31 +0100 Subject: [PATCH 0116/2890] package/python-web2py: security bump to version 2.23.1 Fix CVE-2023-22432: Open redirect vulnerability exists in web2py versions prior to 2.23.1. When using the tool, a web2py user may be redirected to an arbitrary website by accessing a specially crafted URL. As a result, the user may become a victim of a phishing attack. https://github.com/web2py/web2py/compare/v2.23.0...v2.23.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-web2py/python-web2py.hash | 2 +- package/python-web2py/python-web2py.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index a8534977688e..c0ce0cc3520d 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 356f88b671e2bcdd9c89df526ee063ee9d6f4f57b60182ec2684adddcc426e99 python-web2py-2.23.0.tar.gz +sha256 f4066d76290b333bc1bb1cf4c23b612eebde712b7112e90a72e7609a14690d2c python-web2py-2.23.1.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 4425b09d1233..2a666cae1742 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.23.0 +PYTHON_WEB2PY_VERSION = 2.23.1 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From 556c32264c98f5696b523c3028d121adaed1e386 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Mar 2023 18:15:43 +0100 Subject: [PATCH 0117/2890] package/sudo: security bump to version 1.9.13p3 - Fix CVE-2023-27320: Sudo before 1.9.13p3 has a double free in the per-command chroot feature. - Update patch - Update hash of LICENSE.md (year and indentation updated: https://github.com/sudo-project/sudo/commit/dd934d6a218c05d2df61b5306e38c71edaa6ac59 https://github.com/sudo-project/sudo/commit/e5634ae99184d50afbdcb8a69dd4018b1a14871d) https://www.sudo.ws/security/advisories/double_free https://www.sudo.ws/releases/stable/#1.9.13p3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...onfigure.ac-fix-openssl-static-build.patch | 42 +++++++++---------- package/sudo/sudo.hash | 4 +- package/sudo/sudo.mk | 6 +-- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch index 32edd148a0ca..dc91af611919 100644 --- a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch +++ b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch @@ -1,6 +1,6 @@ -From 5cfc7e277d0b262a1d12e867c47a36301fb7edb7 Mon Sep 17 00:00:00 2001 +From 1fed5adc166d5f2190a6b6ad048ec2d803316327 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine -Date: Wed, 22 Feb 2023 10:01:25 +0100 +Date: Wed, 22 Feb 2023 10:13:30 +0100 Subject: [PATCH] configure.ac: fix openssl static build Do not use AX_APPEND_FLAG as it will break static builds by removing @@ -24,26 +24,24 @@ Fixes: - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/sudo-project/sudo/pull/244] +[Retrieved from: +https://github.com/sudo-project/sudo/commit/1fed5adc166d5f2190a6b6ad048ec2d803316327] --- - configure.ac | 4 +++- + m4/openssl.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 8eccad7e4..523d8e56b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3082,7 +3082,9 @@ if test "${enable_openssl-no}" != no; then - SUDO_APPEND_LIBPATH([LIBTLS], [$f]) - ;; - *) -- AX_APPEND_FLAG([$f], [LIBTLS]) -+ # Do not use AX_APPEND_FLAG as it will break static builds by removing -+ # duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto -+ LIBTLS="$LIBTLS $f" - ;; - esac - done --- -2.39.0 - +diff --git a/m4/openssl.m4 b/m4/openssl.m4 +index a2e4941ae8..b4cbd821db 100644 +--- a/m4/openssl.m4 ++++ b/m4/openssl.m4 +@@ -44,7 +44,9 @@ AC_DEFUN([SUDO_CHECK_OPENSSL], [ + SUDO_APPEND_LIBPATH([LIBTLS], [$f]) + ;; + *) +- AX_APPEND_FLAG([$f], [LIBTLS]) ++ # Do not use AX_APPEND_FLAG as it will break static builds by removing ++ # duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto ++ LIBTLS="$LIBTLS $f" + ;; + esac + done diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index c920b9fe7449..720b21d849c9 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ # From: https://www.sudo.ws/getting/download/ -sha256 b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539 sudo-1.9.12p2.tar.gz +sha256 92334a12bb93e0c056b09f53e255ccb7d6f67c6350e2813cd9593ceeca78560b sudo-1.9.13p3.tar.gz # Locally calculated -sha256 d2f93a3b17ed5586fddd07be33ad767146c1a81a22682baa68bb4360a31d020a LICENSE.md +sha256 ea33b3971e8e4d9657cd6794a952aaa71b22bd16745f1645455b6ead010e0a28 LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 3b5c8989175d..e70e8bd31f08 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUDO_VERSION_MAJOR = 1.9.12 -SUDO_VERSION_MINOR = p2 +SUDO_VERSION_MAJOR = 1.9.13 +SUDO_VERSION_MINOR = p3 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause @@ -13,7 +13,7 @@ SUDO_LICENSE_FILES = LICENSE.md SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR) SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR) SUDO_SELINUX_MODULES = sudo -# We're patching configure.ac +# We're patching m4/openssl.m4 SUDO_AUTORECONF = YES # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install From a9d4b6a32fed767d7074febc1e3a9b19fbcfa9bc Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 21 Mar 2023 20:03:03 +0100 Subject: [PATCH 0118/2890] package/coreutils: bump version to 9.2 For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2023-03/msg00005.html Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.hash | 2 +- package/coreutils/coreutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/coreutils/coreutils.hash b/package/coreutils/coreutils.hash index eb9a5744c655..72f63b242d26 100644 --- a/package/coreutils/coreutils.hash +++ b/package/coreutils/coreutils.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423 coreutils-9.1.tar.xz +sha256 6885ff47b9cdb211de47d368c17853f406daaf98b148aaecdf10de29cc04b0b3 coreutils-9.2.tar.xz # Locally computed sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 931859b0aca2..9b07bb31d266 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -COREUTILS_VERSION = 9.1 +COREUTILS_VERSION = 9.2 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPL-3.0+ From 812083c1d35f84d85a7e1a61ec00cf1162ebd64a Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 21 Mar 2023 20:04:03 +0100 Subject: [PATCH 0119/2890] package/grep: bump version to 3.9 For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2023-03/msg00001.html Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/grep/grep.hash | 4 ++-- package/grep/grep.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/grep/grep.hash b/package/grep/grep.hash index 6f3bca89ad4f..c83e4653c3d1 100644 --- a/package/grep/grep.hash +++ b/package/grep/grep.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -# http://ftp.gnu.org/gnu/grep/grep-3.8.tar.xz.sig +# https://ftp.gnu.org/gnu/grep/grep-3.9.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382 grep-3.8.tar.xz +sha256 abcd11409ee23d4caf35feb422e53bbac867014cfeed313bb5f488aca170b599 grep-3.9.tar.xz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 318e00940dd2..309987010f72 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ################################################################################ -GREP_VERSION = 3.8 +GREP_VERSION = 3.9 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPL-3.0+ From 68ca5f1e1f9f3f79e5a48928ad2dfac0cceee843 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 21 Mar 2023 20:05:01 +0100 Subject: [PATCH 0120/2890] package/openssh: security bump to version 9.3p1 From [1]: * sshd(8): fix a pre-authentication double-free memory fault introduced in OpenSSH 9.1. This is not believed to be exploitable, and it occurs in the unprivileged pre-auth process that is subject to chroot(2) and is further sandboxed on most major platforms. * ssh(8): in OpenSSH releases after 8.7, the PermitRemoteOpen option would ignore its first argument unless it was one of the special keywords "any" or "none", causing the permission list to fail open if only one permission was specified. bz3515 * ssh(1): if the CanonicalizeHostname and CanonicalizePermittedCNAMEs options were enabled, and the system/libc resolver did not check that names in DNS responses were valid, then use of these options could allow an attacker with control of DNS to include invalid characters (possibly including wildcards) in names added to known_hosts files when they were updated. These names would still have to match the CanonicalizePermittedCNAMEs allow-list, so practical exploitation appears unlikely. From [2]: * ssh-add(1): when adding smartcard keys to ssh-agent(1) with the per-hop destination constraints (ssh-add -h ...) added in OpenSSH 8.9, a logic error prevented the constraints from being communicated to the agent. This resulted in the keys being added without constraints. The common cases of non-smartcard keys and keys without destination constraints are unaffected. This problem was reported by Luci Stanescu. * ssh(1): Portable OpenSSH provides an implementation of the getrrsetbyname(3) function if the standard library does not provide it, for use by the VerifyHostKeyDNS feature. A specifically crafted DNS response could cause this function to perform an out-of-bounds read of adjacent stack data, but this condition does not appear to be exploitable beyond denial-of- service to the ssh(1) client. The getrrsetbyname(3) replacement is only included if the system's standard library lacks this function and portable OpenSSH was not compiled with the ldns library (--with-ldns). getrrsetbyname(3) is only invoked if using VerifyHostKeyDNS to fetch SSHFP records. This problem was found by the Coverity static analyzer. [1] https://www.openssh.com/txt/release-9.2 [2] https://www.openssh.com/txt/release-9.3 Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/openssh/openssh.hash | 4 ++-- package/openssh/openssh.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index eefb11ec15e6..2be54431ec5d 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-9.1 (base64 encoded) -sha256 19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288 openssh-9.1p1.tar.gz +# From https://www.openssh.com/txt/release-9.3 (base64 encoded) +sha256 e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8 openssh-9.3p1.tar.gz # Locally calculated sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index b70e327620a0..26d6bd504d81 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 9.1 +OPENSSH_VERSION_MAJOR = 9.3 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) From 6ca823f6eb478fe5b9db06ff9bec16cb20e4d6e6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 18:07:14 -0600 Subject: [PATCH 0121/2890] package/python-aexpect: bump to version 1.7.0 Drop no longer required six runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-aexpect/Config.in | 1 - package/python-aexpect/python-aexpect.hash | 4 ++-- package/python-aexpect/python-aexpect.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-aexpect/Config.in b/package/python-aexpect/Config.in index cc805da65727..59671621dccc 100644 --- a/package/python-aexpect/Config.in +++ b/package/python-aexpect/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_AEXPECT bool "python-aexpect" - select BR2_PACKAGE_PYTHON_SIX # runtime help Aexpect. diff --git a/package/python-aexpect/python-aexpect.hash b/package/python-aexpect/python-aexpect.hash index efe4f55fb839..ff30c765e391 100644 --- a/package/python-aexpect/python-aexpect.hash +++ b/package/python-aexpect/python-aexpect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aexpect/json -md5 d37473ff0024c15938bfe86a543537e6 aexpect-1.6.4.tar.gz -sha256 3998aa84ae54963fd59488f0caa533f6edbb31bc6cb842da09b041cbad56ad88 aexpect-1.6.4.tar.gz +md5 bb05319c277cfe97114780579d251c30 aexpect-1.7.0.tar.gz +sha256 11bfeea78ef6147ac8f6e29c2a720bd332598383d88274cdca5e6413c2070d52 aexpect-1.7.0.tar.gz # Locally computed sha256 checksums sha256 7be26abf35e531a226dc742d2379d42d372cb61f027a6e26477c0e2f1a03bfcb LICENSE diff --git a/package/python-aexpect/python-aexpect.mk b/package/python-aexpect/python-aexpect.mk index 8b5e16513583..1cfcc9ffafcb 100644 --- a/package/python-aexpect/python-aexpect.mk +++ b/package/python-aexpect/python-aexpect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AEXPECT_VERSION = 1.6.4 +PYTHON_AEXPECT_VERSION = 1.7.0 PYTHON_AEXPECT_SOURCE = aexpect-$(PYTHON_AEXPECT_VERSION).tar.gz -PYTHON_AEXPECT_SITE = https://files.pythonhosted.org/packages/3b/22/f87ffa70348dde4597d9314995be89c8d4c7728260033b972a8d691e3f7d +PYTHON_AEXPECT_SITE = https://files.pythonhosted.org/packages/dd/32/738b5190adb5ed387d3e755885f646b714fbf9c22adbda7ff988db7ede49 PYTHON_AEXPECT_SETUP_TYPE = setuptools PYTHON_AEXPECT_LICENSE = GPL-2.0+ PYTHON_AEXPECT_LICENSE_FILES = LICENSE From c736685a446c5d16da4bed3a15a9925b15f6ba41 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 18:09:04 -0600 Subject: [PATCH 0122/2890] package/python-aioconsole: bump to version 0.6.1 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 107910b6be6e..8770d5593242 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 ae7bae13cb8aab6b1a4d2c25284ffcd3 aioconsole-0.5.1.tar.gz -sha256 c8ddd9fd21db71ea51fb9b0d20d21d11c409c92988edf07c935d705fa60e026b aioconsole-0.5.1.tar.gz +md5 3e58234291434cb33cbb6396323918ad aioconsole-0.6.1.tar.gz +sha256 520313bc5d7ed6bea3baf072ce7e622479afd67c01b3fdcc076bc528da354f6f aioconsole-0.6.1.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index dc0eb36158bd..5641254f5d9c 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.5.1 +PYTHON_AIOCONSOLE_VERSION = 0.6.1 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/71/74/cd64dbc518f71486b235f0e1538ea4b7cbf4375a8bdc6f96c9c9595291ab +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/27/a2/4bbeecceb6786a058e92469686ae1b7d3a616b3f5b99e00b96c3064349e2 PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From e307992f4b2272759789f9cc218827f2467407d7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 18:11:15 -0600 Subject: [PATCH 0123/2890] package/python-aiofiles: bump to version 23.1.0 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-aiofiles/python-aiofiles.hash | 4 ++-- package/python-aiofiles/python-aiofiles.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiofiles/python-aiofiles.hash b/package/python-aiofiles/python-aiofiles.hash index d1594c3989ce..e7799c7ff7b7 100644 --- a/package/python-aiofiles/python-aiofiles.hash +++ b/package/python-aiofiles/python-aiofiles.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiofiles/json -md5 b22db90039c881f6aa64431c6b23f30f aiofiles-22.1.0.tar.gz -sha256 9107f1ca0b2a5553987a94a3c9959fe5b491fdf731389aa5b7b1bd0733e32de6 aiofiles-22.1.0.tar.gz +md5 d648a31366030470c97401741747065f aiofiles-23.1.0.tar.gz +sha256 edd247df9a19e0db16534d4baaf536d6609a43e1de5401d7a4c1c148753a1635 aiofiles-23.1.0.tar.gz # Locally computed sha256 checksums sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index b65d2cfa82b7..96bd636a4aed 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOFILES_VERSION = 22.1.0 +PYTHON_AIOFILES_VERSION = 23.1.0 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz -PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/86/26/6e5060a159a6131c430e8a01ec8327405a19a449a506224b394e36f2ebc9 +PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/40/a0/07be94aecba162ed5147359f9883e82afd2ac13aed33678a008fc8c36f8b PYTHON_AIOFILES_SETUP_TYPE = setuptools PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE From fadc1876e14c1346fad50f26ab72966174a46158 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 18:13:27 -0600 Subject: [PATCH 0124/2890] package/python-aiohttp-jinja2: bump to version 1.5.1 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash | 4 ++-- package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash index fbf244e47030..0a7b7cc0581e 100644 --- a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash +++ b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-jinja2/json -md5 50f74689fd60a5bc0b0a74545277e9bc aiohttp-jinja2-1.5.tar.gz -sha256 7c3ba5eac060b691f4e50534af2d79fca2a75712ebd2b25e6fcb1295859f910b aiohttp-jinja2-1.5.tar.gz +md5 8f72451a7da006b4b91ef18ec6f75885 aiohttp-jinja2-1.5.1.tar.gz +sha256 8d149b2a57d91f794b33a394ea5bc66b567f38c74a5a6a9477afc2450f105c01 aiohttp-jinja2-1.5.1.tar.gz # Locally computed sha256 checksums sha256 d9d867affaeac220a60381cc544681dcd37c668ed6ea5ddbf9948617f828889a LICENSE diff --git a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk index 371b4f0b3ea9..17f9a4018a84 100644 --- a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk +++ b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_JINJA2_VERSION = 1.5 +PYTHON_AIOHTTP_JINJA2_VERSION = 1.5.1 PYTHON_AIOHTTP_JINJA2_SOURCE = aiohttp-jinja2-$(PYTHON_AIOHTTP_JINJA2_VERSION).tar.gz -PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/15/d7/8bdbdb65e2926de332d3c430839d655db61d30a7b5a4a9b2edafbeb3aa20 +PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/4e/4c/fadbfcc1269fa79e69fcdb29027840ab022a91471a5aeaa8fd8b27cc5406 PYTHON_AIOHTTP_JINJA2_SETUP_TYPE = setuptools PYTHON_AIOHTTP_JINJA2_LICENSE = Apache-2.0 PYTHON_AIOHTTP_JINJA2_LICENSE_FILES = LICENSE From a1e7679a38edc3d4e4e71e6aed1ffd0f4b5fe312 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 18:17:59 -0600 Subject: [PATCH 0125/2890] package/python-aiohttp: bump to version 3.8.4 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-aiohttp/python-aiohttp.hash | 4 ++-- package/python-aiohttp/python-aiohttp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index e59b6969e63c..0f687c78271e 100644 --- a/package/python-aiohttp/python-aiohttp.hash +++ b/package/python-aiohttp/python-aiohttp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp/json -md5 642653db642be1508e50fcdeafe0f928 aiohttp-3.8.3.tar.gz -sha256 3828fb41b7203176b82fe5d699e0d845435f2374750a44b480ea6b930f6be269 aiohttp-3.8.3.tar.gz +md5 8208bc4b519ac4520720577f93561855 aiohttp-3.8.4.tar.gz +sha256 bf2e1a9162c1e441bf805a1fd166e249d574ca04e03b34f97e2928769e91ab5c aiohttp-3.8.4.tar.gz # Locally computed sha256 checksums sha256 9f80d0db7d755a941db4572172c270ecbd8f082ba215ddd095985942ed94a9eb LICENSE.txt diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 8b0b15f13b17..72fb34fd25d1 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.8.3 +PYTHON_AIOHTTP_VERSION = 3.8.4 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/ff/4f/62d9859b7d4e6dc32feda67815c5f5ab4421e6909e48cbc970b6a40d60b7 +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/c2/fd/1ff4da09ca29d8933fda3f3514980357e25419ce5e0f689041edb8f17dab PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt From 42d45a4267d5ff92d85b9b5faeba21e4c46eb357 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 18:25:06 -0600 Subject: [PATCH 0126/2890] package/python-alembic: bump to version 1.10.2 License hash changed due to date update: https://github.com/sqlalchemy/alembic/commit/e3055cd5baad328641366026af66639f333c520c Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-alembic/python-alembic.hash | 6 +++--- package/python-alembic/python-alembic.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash index f94f5ab10a92..c84c46c84c79 100644 --- a/package/python-alembic/python-alembic.hash +++ b/package/python-alembic/python-alembic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/alembic/json -md5 999392ffc900da18afbf10d2ac31bdc6 alembic-1.9.1.tar.gz -sha256 f9f76e41061f5ebe27d4fe92600df9dd612521a7683f904dab328ba02cffa5a2 alembic-1.9.1.tar.gz +md5 de9d9f92a49a5e3ae5a978018927f474 alembic-1.10.2.tar.gz +sha256 457eafbdc0769d855c2c92cbafe6b7f319f916c80cf4ed02b8f394f38b51b89d alembic-1.10.2.tar.gz # Locally computed sha256 checksums -sha256 f0e3f7a5080879ccae798882d9bee3d48fe335d0bad84ca8eec86fa594375ea0 LICENSE +sha256 b285268a86f4416eaf4d05b2ae3880c156f7c59a8f935a402bc056eafb33af08 LICENSE diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk index 64ce85bead41..4f605b8f6012 100644 --- a/package/python-alembic/python-alembic.mk +++ b/package/python-alembic/python-alembic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ALEMBIC_VERSION = 1.9.1 +PYTHON_ALEMBIC_VERSION = 1.10.2 PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz -PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/81/87/5c531d2923c61e7ae68b23c8660df289ae4241a0d38f3fbcbd8dba64ca6b +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/d6/02/66ed327f944f3f85423096c438d7d290da5af21a7aecf9e5b9f09d9e34b2 PYTHON_ALEMBIC_SETUP_TYPE = setuptools PYTHON_ALEMBIC_LICENSE = MIT PYTHON_ALEMBIC_LICENSE_FILES = LICENSE From 6911934ebe0ce12f67914c5d6b6ae84033f43abc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 18:41:23 -0600 Subject: [PATCH 0127/2890] package/python-argh: bump to version 0.28.1 Migrate to flit build backend. Use license file instead of readme hashes. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-argh/python-argh.hash | 7 ++++--- package/python-argh/python-argh.mk | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-argh/python-argh.hash b/package/python-argh/python-argh.hash index 15f72eb015c9..abfcec98f30e 100644 --- a/package/python-argh/python-argh.hash +++ b/package/python-argh/python-argh.hash @@ -1,5 +1,6 @@ # md5 from https://pypi.python.org/pypi/argh/json -md5 edda25f3f0164a963dd89c0e3c619973 argh-0.26.2.tar.gz +md5 d51d4ed7d82ce24a981169074f3e64e1 argh-0.28.1.tar.gz +sha256 b2093086f0e809a3ecc24b64a2145309ee8f56d034936cd59e57c558a357329d argh-0.28.1.tar.gz # Locally computed -sha256 e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65 argh-0.26.2.tar.gz -sha256 9c318783389a2e78735dc3d633e745e5648b826744521857045e84ed2e79ce2e README.rst +sha256 2594f46b9b23a5fddeca090faeb270c7ceee8116675fe35082be859aa7466e89 COPYING +sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER diff --git a/package/python-argh/python-argh.mk b/package/python-argh/python-argh.mk index ac514174c8c4..82cef822e9cb 100644 --- a/package/python-argh/python-argh.mk +++ b/package/python-argh/python-argh.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_ARGH_VERSION = 0.26.2 +PYTHON_ARGH_VERSION = 0.28.1 PYTHON_ARGH_SOURCE = argh-$(PYTHON_ARGH_VERSION).tar.gz -PYTHON_ARGH_SITE = https://pypi.python.org/packages/e3/75/1183b5d1663a66aebb2c184e0398724b624cecd4f4b679cb6e25de97ed15 -PYTHON_ARGH_SETUP_TYPE = setuptools +PYTHON_ARGH_SITE = https://files.pythonhosted.org/packages/bf/77/6758074453c83c7ac0456d397e95aaa91b33fbd2ec977dcf38be736ea177 +PYTHON_ARGH_SETUP_TYPE = flit PYTHON_ARGH_LICENSE = LGPL-3.0+ -PYTHON_ARGH_LICENSE_FILES = README.rst +PYTHON_ARGH_LICENSE_FILES = COPYING COPYING.LESSER $(eval $(python-package)) From ff8d9b936638850279808848d631b42038eabeeb Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 19:12:17 -0600 Subject: [PATCH 0128/2890] package/python-async-lru: bump to version 2.0.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-async-lru/python-async-lru.hash | 4 ++-- package/python-async-lru/python-async-lru.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-async-lru/python-async-lru.hash b/package/python-async-lru/python-async-lru.hash index 231af32baa0c..c6f11aff1de2 100644 --- a/package/python-async-lru/python-async-lru.hash +++ b/package/python-async-lru/python-async-lru.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/async-lru/json -md5 4dfcb328f2e9a8fdc9cf78dfdb6d3eef async-lru-1.0.3.tar.gz -sha256 c2cb9b2915eb14e6cf3e717154b40f715bf90e596d73623677affd0d1fbcd32a async-lru-1.0.3.tar.gz +md5 825ff7d35d1cd76f1b1ae44f38bf69f5 async-lru-2.0.2.tar.gz +sha256 3b87ec4f2460c52cc7916a0138cc606b584c75d1ef7d661853c95d1d3acb869a async-lru-2.0.2.tar.gz # Locally computed sha256 checksums sha256 ea65975679bc2093be925d520358e41096bd96fddedee3e929160a5faadcf573 LICENSE diff --git a/package/python-async-lru/python-async-lru.mk b/package/python-async-lru/python-async-lru.mk index 872540b713ce..d707249e2919 100644 --- a/package/python-async-lru/python-async-lru.mk +++ b/package/python-async-lru/python-async-lru.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASYNC_LRU_VERSION = 1.0.3 +PYTHON_ASYNC_LRU_VERSION = 2.0.2 PYTHON_ASYNC_LRU_SOURCE = async-lru-$(PYTHON_ASYNC_LRU_VERSION).tar.gz -PYTHON_ASYNC_LRU_SITE = https://files.pythonhosted.org/packages/fe/67/4cb179c14ffa8b4a35fbe02255744bee4cbbaf61b35612c96ba4a618e4d5 +PYTHON_ASYNC_LRU_SITE = https://files.pythonhosted.org/packages/92/16/be197573adca3d584dbd64d508488e95e36324ea036d751564d2f88d74bf PYTHON_ASYNC_LRU_SETUP_TYPE = setuptools PYTHON_ASYNC_LRU_LICENSE = MIT PYTHON_ASYNC_LRU_LICENSE_FILES = LICENSE From b3c4e0f3181ccfa3fc84230a33112dd25a0bd410 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 19:19:31 -0600 Subject: [PATCH 0129/2890] package/python-autobahn: bump to version 23.1.2 License hash changed due to copyright header change: https://github.com/crossbario/autobahn-python/commit/49c41440e16528ee6ab267df0f9989fb1ed81f7c Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-autobahn/python-autobahn.hash | 6 +++--- package/python-autobahn/python-autobahn.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index f9b68dcb2210..4fa7c451f59c 100644 --- a/package/python-autobahn/python-autobahn.hash +++ b/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 98d8451385ccd8ece2d2fac023c61a19 autobahn-22.12.1.tar.gz -sha256 43b4e8b1aeaeb20a0cc0a81572e613dc958057c0ab248a7d6b41b2763270f925 autobahn-22.12.1.tar.gz +md5 55cd275bc3d9c7e354f4b6a87b87f466 autobahn-23.1.2.tar.gz +sha256 c5ef8ca7422015a1af774a883b8aef73d4954c9fcd182c9b5244e08e973f7c3a autobahn-23.1.2.tar.gz # Locally computed sha256 checksums -sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE +sha256 ab1dd7a42dbdae302346c5a4571f2149691cc1ec06836232bf4923527e3fe41c LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index 4c1415196086..c44acb80aa46 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 22.12.1 +PYTHON_AUTOBAHN_VERSION = 23.1.2 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/a8/6f/78b90951f263232e468439627f31a2c0846e36043c95af96dc527a4aeee6 +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/53/99/b6e0ffa0e8bafe9dfae1c9ab46d44d07317cbf297fbf8f07aff8a80e5bd8 PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar From 49c65502439c0f24323906e96652387243879baa Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 19:34:17 -0600 Subject: [PATCH 0130/2890] package/python-babel: bump to version 2.12.1 License hash changed due to year update: https://github.com/python-babel/babel/commit/9beda0bed2600af47827ad200b0c5864c542c617 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-babel/python-babel.hash | 6 +++--- package/python-babel/python-babel.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-babel/python-babel.hash b/package/python-babel/python-babel.hash index 2b2f56d8c648..f2026cafb3c6 100644 --- a/package/python-babel/python-babel.hash +++ b/package/python-babel/python-babel.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/babel/json -md5 9ee7784fd452d456206ecd3a12694010 Babel-2.11.0.tar.gz -sha256 5ef4b3226b0180dedded4229651c8b0e1a3a6a2837d45a073272f313e4cf97f6 Babel-2.11.0.tar.gz +md5 9ac7d8aac42c17a1e6d922017058d2c8 Babel-2.12.1.tar.gz +sha256 cc2d99999cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455 Babel-2.12.1.tar.gz # Locally computed sha256 checksums -sha256 2499aec3c5f041c3ac2c448a15fb233314e4c20cbac1530be04ec31b2788631c LICENSE +sha256 908e0ad72053ae27c1d17e3340bd14cff9bf935992ed56526d17c983ab6e7af7 LICENSE diff --git a/package/python-babel/python-babel.mk b/package/python-babel/python-babel.mk index 35857dc12732..890a8b02b95b 100644 --- a/package/python-babel/python-babel.mk +++ b/package/python-babel/python-babel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BABEL_VERSION = 2.11.0 +PYTHON_BABEL_VERSION = 2.12.1 PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz -PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/ff/80/45b42203ecc32c8de281f52e3ec81cb5e4ef16127e9e8543089d8b1649fb +PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/ba/42/54426ba5d7aeebde9f4aaba9884596eb2fe02b413ad77d62ef0b0422e205 PYTHON_BABEL_SETUP_TYPE = setuptools PYTHON_BABEL_LICENSE = BSD-3-Clause PYTHON_BABEL_LICENSE_FILES = LICENSE From 1c148c93c9cc69926253ce13f7bfda2a98b4be38 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 19:47:03 -0600 Subject: [PATCH 0131/2890] package/python-beautifulsoup4: bump to version 4.12.0 Verified license remains MIT after hash changed. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-beautifulsoup4/python-beautifulsoup4.hash | 6 +++--- package/python-beautifulsoup4/python-beautifulsoup4.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-beautifulsoup4/python-beautifulsoup4.hash b/package/python-beautifulsoup4/python-beautifulsoup4.hash index 4641d2e3a3b8..1777563190a3 100644 --- a/package/python-beautifulsoup4/python-beautifulsoup4.hash +++ b/package/python-beautifulsoup4/python-beautifulsoup4.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/beautifulsoup4/json -md5 22f22f89cf9da41b22e1ece9639c66a3 beautifulsoup4-4.11.1.tar.gz -sha256 ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693 beautifulsoup4-4.11.1.tar.gz +md5 428d2737d94d238b146081c03d3b2b87 beautifulsoup4-4.12.0.tar.gz +sha256 c5fceeaec29d09c84970e47c65f2f0efe57872f7cff494c9691a26ec0ff13234 beautifulsoup4-4.12.0.tar.gz # Locally computed sha256 checksums -sha256 9e41dab3a48f5c734a9d5446557b28a6616e4924ee51d205598e4416bb93ce25 LICENSE +sha256 55b4d8d4b1e5bc86d10efac91b74c87bcb77526b0f5b9edaf8b9cd2adc7397b2 LICENSE diff --git a/package/python-beautifulsoup4/python-beautifulsoup4.mk b/package/python-beautifulsoup4/python-beautifulsoup4.mk index 78f885ba08b0..7896dd0f39d6 100644 --- a/package/python-beautifulsoup4/python-beautifulsoup4.mk +++ b/package/python-beautifulsoup4/python-beautifulsoup4.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BEAUTIFULSOUP4_VERSION = 4.11.1 +PYTHON_BEAUTIFULSOUP4_VERSION = 4.12.0 PYTHON_BEAUTIFULSOUP4_SOURCE = beautifulsoup4-$(PYTHON_BEAUTIFULSOUP4_VERSION).tar.gz -PYTHON_BEAUTIFULSOUP4_SITE = https://files.pythonhosted.org/packages/e8/b0/cd2b968000577ec5ce6c741a54d846dfa402372369b8b6861720aa9ecea7 +PYTHON_BEAUTIFULSOUP4_SITE = https://files.pythonhosted.org/packages/c5/4c/b5b7d6e1d4406973fb7f4e5df81c6f07890fa82548ac3b945deed1df9d48 PYTHON_BEAUTIFULSOUP4_SETUP_TYPE = setuptools PYTHON_BEAUTIFULSOUP4_LICENSE = MIT PYTHON_BEAUTIFULSOUP4_LICENSE_FILES = LICENSE From e4f5e974cafe915e5297a812c828ad47d619783c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 19:51:45 -0600 Subject: [PATCH 0132/2890] package/python-bleak: bump to version 0.20.0 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-bleak/python-bleak.hash | 4 ++-- package/python-bleak/python-bleak.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bleak/python-bleak.hash b/package/python-bleak/python-bleak.hash index 001ef65b65a5..2cd038cb68b5 100644 --- a/package/python-bleak/python-bleak.hash +++ b/package/python-bleak/python-bleak.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bleak/json -md5 d038483ec145c3d32c1ef03e04c42621 bleak-0.19.5.tar.gz -sha256 87845a96453c58c19031c735444a7b3156800534bcd3f23ba74e119e9ae3cd88 bleak-0.19.5.tar.gz +md5 6f9881cc85648683927ab0b9c58a1a52 bleak-0.20.0.tar.gz +sha256 7f6fe69454ad5d4c0ab05ae4a9aa1aabd6926d7128eab2fac4ef8a58a72999ee bleak-0.20.0.tar.gz # Locally computed sha256 checksums sha256 c4029a2b63b3824ab68be841f414addbdde20cb79cdbe272fa80c0b2abe65374 LICENSE diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index 95ac1d176641..7d3dc2831f26 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLEAK_VERSION = 0.19.5 +PYTHON_BLEAK_VERSION = 0.20.0 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz -PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/e6/b4/e63829826a157d180831a1c5d3720e75d613c1290cb239510d148b906836 +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/aa/86/5084561ed4f31aec0322bef015db949a9f2bf0b4f6bd72b16479cf03f459 PYTHON_BLEAK_SETUP_TYPE = setuptools PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE From 4c330736fa619e5ebc6af1ad6cfde9df0cd391f2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 19:54:00 -0600 Subject: [PATCH 0133/2890] package/python-boto3: bump to version 1.26.96 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-boto3/python-boto3.hash | 4 ++-- package/python-boto3/python-boto3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-boto3/python-boto3.hash b/package/python-boto3/python-boto3.hash index eecc87ab2dd0..6b3947978ecd 100644 --- a/package/python-boto3/python-boto3.hash +++ b/package/python-boto3/python-boto3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/boto3/json -md5 e3777333a201a2511dd7c814782fe9f0 boto3-1.26.45.tar.gz -sha256 cc7f652df93e1ce818413fd82ffd645d4f92a64fec67c72946212d3750eaa80f boto3-1.26.45.tar.gz +md5 0913e2ad8eb208bccb826b10c92ccb5c boto3-1.26.96.tar.gz +sha256 7017102c58b9984749bef3b9f476940593c311504354b9ee9dd7bb0b4657a77d boto3-1.26.96.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/python-boto3/python-boto3.mk b/package/python-boto3/python-boto3.mk index 4d8fe587018a..572954e81af0 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.26.45 +PYTHON_BOTO3_VERSION = 1.26.96 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/f5/5d/62bfcda02d90699d41d5ff2573f88b5555354fb87308e8a3427fef3956c5 +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/c2/9b/8e9124c3d0306ab2ee865e6adffcfcb0127bf0c327386d62d2c9db19b6ae PYTHON_BOTO3_SETUP_TYPE = setuptools PYTHON_BOTO3_LICENSE = Apache-2.0 PYTHON_BOTO3_LICENSE_FILES = LICENSE From 1197165d1ca3ffb1edb03ff9d4ed6e8ae4069414 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 19:57:03 -0600 Subject: [PATCH 0134/2890] package/python-botocore: bump to version 1.29.96 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-botocore/python-botocore.hash | 4 ++-- package/python-botocore/python-botocore.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-botocore/python-botocore.hash b/package/python-botocore/python-botocore.hash index 0e9d0572d799..57d07a671133 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/botocore/json -md5 3946a693e09b65a0f6615a1a30f606d7 botocore-1.29.45.tar.gz -sha256 62ae03e591ff25555854aa338da35190ffe18c0b1be2ebf5cfb277164233691f botocore-1.29.45.tar.gz +md5 c608709a5cf3e67442f4254a34d1faab botocore-1.29.96.tar.gz +sha256 b9781108810e33f8406942c3e3aab748650c59d5cddb7c9d323f4e2682e7b0b6 botocore-1.29.96.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index ceb3fbe6ead9..6d0747c0df48 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.29.45 +PYTHON_BOTOCORE_VERSION = 1.29.96 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/9d/4f/1c24126941d1f8c1f2ecf459f88959d59566af34a55a81d926368fd2e6e5 +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/2d/b5/4a986aeb4e3d182f7ef116705962d3c98c0263beaf87c49836b7dfb91837 PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt From f345271e43256d3c75f0a1144184266e29d5dae4 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 20:00:32 -0600 Subject: [PATCH 0135/2890] package/python-bottle: bump to version 0.12.25 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-bottle/python-bottle.hash | 4 ++-- package/python-bottle/python-bottle.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bottle/python-bottle.hash b/package/python-bottle/python-bottle.hash index 58bc52e3cb13..48a576aaecfd 100644 --- a/package/python-bottle/python-bottle.hash +++ b/package/python-bottle/python-bottle.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bottle/json -md5 d07df795cd4baa596ee803e964ba77fd bottle-0.12.23.tar.gz -sha256 683de3aa399fb26e87b274dbcf70b1a651385d459131716387abdc3792e04167 bottle-0.12.23.tar.gz +md5 7d79d6131ecd524530f4e919bc60f444 bottle-0.12.25.tar.gz +sha256 e1a9c94970ae6d710b3fb4526294dfeb86f2cb4a81eff3a4b98dc40fb0e5e021 bottle-0.12.25.tar.gz # Locally computed sha256 checksums sha256 d0e7211f1c3c1a1c56f39d18bcb07f27f480c8a9552617756dda3a335933b8a6 LICENSE diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk index e1691972c3fb..b35f726f9598 100644 --- a/package/python-bottle/python-bottle.mk +++ b/package/python-bottle/python-bottle.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTTLE_VERSION = 0.12.23 +PYTHON_BOTTLE_VERSION = 0.12.25 PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz -PYTHON_BOTTLE_SITE = https://files.pythonhosted.org/packages/7c/58/75f3765b0a3f86ef0b6e0b23d0503920936752ca6e0fc27efce7403b01bd +PYTHON_BOTTLE_SITE = https://files.pythonhosted.org/packages/fd/04/1c09ab851a52fe6bc063fd0df758504edede5cc741bd2e807bf434a09215 PYTHON_BOTTLE_LICENSE = MIT PYTHON_BOTTLE_LICENSE_FILES = LICENSE PYTHON_BOTTLE_CPE_ID_VENDOR = bottlepy From 2bd5301db0a5f30e863ebcb146d63653848f13e1 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 21 Mar 2023 20:05:32 -0600 Subject: [PATCH 0136/2890] package/python-bsdiff4: bump to version 1.2.3 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-bsdiff4/python-bsdiff4.hash | 4 ++-- package/python-bsdiff4/python-bsdiff4.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bsdiff4/python-bsdiff4.hash b/package/python-bsdiff4/python-bsdiff4.hash index bb84bb09a5f4..f053922ac0f7 100644 --- a/package/python-bsdiff4/python-bsdiff4.hash +++ b/package/python-bsdiff4/python-bsdiff4.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bsdiff4/json -md5 fc5ea1adfe629a7c7ac6f4bb1a0dca93 bsdiff4-1.2.2.tar.gz -sha256 1880ac3f52a6c46ae6bcc6db117e4fb35f9b0ccd5af75fd4fee6907d00d6983c bsdiff4-1.2.2.tar.gz +md5 67cf87c5d66fe389949a314849f68863 bsdiff4-1.2.3.tar.gz +sha256 1b95ce93b9f306846f6c91c9d0e3eb6590a4c85ac2bbe72b5f60d9db82ad2a1c bsdiff4-1.2.3.tar.gz # Locally computed sha256 checksums sha256 c6c921c90383f1c43beb53c49a652d28309a410a7c394c729fd8870271451cf0 LICENSE diff --git a/package/python-bsdiff4/python-bsdiff4.mk b/package/python-bsdiff4/python-bsdiff4.mk index 7a50e3379a40..05fe1bef25c4 100644 --- a/package/python-bsdiff4/python-bsdiff4.mk +++ b/package/python-bsdiff4/python-bsdiff4.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BSDIFF4_VERSION = 1.2.2 +PYTHON_BSDIFF4_VERSION = 1.2.3 PYTHON_BSDIFF4_SOURCE = bsdiff4-$(PYTHON_BSDIFF4_VERSION).tar.gz -PYTHON_BSDIFF4_SITE = https://files.pythonhosted.org/packages/34/e2/e28dd282974f919a6b9adb3b7e64bb1fa4390046706c3e58a60b94aeb497 +PYTHON_BSDIFF4_SITE = https://files.pythonhosted.org/packages/a8/0e/a677b62d35e3a9d074eafb5b16b569d5d6870a6ead02e8c830e4d4e73db7 PYTHON_BSDIFF4_LICENSE = BSD-2-Clause, BSD-Protection (core.c) PYTHON_BSDIFF4_LICENSE_FILES = LICENSE PYTHON_BSDIFF4_CPE_ID_VENDOR = pypi From 4b0346feda49237065ac4a80ed440b88b7dca315 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 16 Mar 2023 22:44:24 +0100 Subject: [PATCH 0137/2890] package/less: bump to version 608 For change log, see: https://www.greenwoodsoftware.com/less/news.608.html Note 1: the package patch is kept, as it is included in version 609. Note 2: the license file hash changed due to the year update. Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/less/less.hash | 6 +++--- package/less/less.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/less/less.hash b/package/less/less.hash index eed8340ec191..19be26cae03b 100644 --- a/package/less/less.hash +++ b/package/less/less.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # using DSA key F153A7C833235259 -# http://www.greenwoodsoftware.com/less/less-590.sig -sha256 6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10 less-590.tar.gz +# https://www.greenwoodsoftware.com/less/less-608.sig +sha256 a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209 less-608.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/less/less.mk b/package/less/less.mk index f01f94d6c852..dfbd411863a7 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -4,7 +4,7 @@ # ################################################################################ -LESS_VERSION = 590 +LESS_VERSION = 608 LESS_SITE = http://www.greenwoodsoftware.com/less LESS_LICENSE = GPL-3.0+ LESS_LICENSE_FILES = COPYING From 0c7ba302bd5d1d46d5f4e2a73a5ba235c08d9b22 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 16 Mar 2023 23:11:45 +0100 Subject: [PATCH 0138/2890] package/hwloc: bump to version 2.9.0 For change log, see: - https://github.com/open-mpi/hwloc/blob/hwloc-2.9.0/NEWS#L20 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/hwloc/hwloc.hash | 8 ++++---- package/hwloc/hwloc.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index b14647219553..963a1fd93019 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,6 +1,6 @@ -# From https://www.open-mpi.org/software/hwloc/v2.8/ -md5 1d40ecdded67bbe4bafc8f8e8479376c hwloc-2.8.0.tar.bz2 -sha1 314faaeda9f1982da97fca93b83307bc34d5b414 hwloc-2.8.0.tar.bz2 -sha256 348a72fcd48c32a823ee1da149ae992203e7ad033549e64aed6ea6eeb01f42c1 hwloc-2.8.0.tar.bz2 +# From https://www.open-mpi.org/software/hwloc/v2.9/ +md5 49869a8e19754299db512572abc5eb2b hwloc-2.9.0.tar.bz2 +sha1 ee178b64234fdbf70f576b79963459ab80880583 hwloc-2.9.0.tar.bz2 +sha256 2070e963596a2421b9af8eca43bdec113ee1107aaf7ccb475d4d3767a8856887 hwloc-2.9.0.tar.bz2 # Locally computed sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 3f73b3ecc8c2..c97e46999ce4 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWLOC_VERSION_MAJOR = 2.8 +HWLOC_VERSION_MAJOR = 2.9 HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).0 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) From 5672e74fdc89a8f5a25789b454c28d5b9c33c3d4 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:21:51 -0600 Subject: [PATCH 0139/2890] package/pkg-autotools: drop FOO_GETTEXTIZE_OPTS support No package in the current tree is currently utilizing this option. The long term solution is to use autopoint over gettextize in which case these options aren't relevant anyway. Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- package/pkg-autotools.mk | 6 +----- package/pkg-generic.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 717ff815938d..55d95d204eb6 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -92,7 +92,7 @@ endef # define GETTEXTIZE_HOOK @$(call MESSAGE,"Gettextizing") - $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) $($(PKG)_GETTEXTIZE_OPTS) + $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) endef # @@ -152,10 +152,6 @@ ifndef $(2)_GETTEXTIZE endif endif -ifeq ($(4),host) - $(2)_GETTEXTIZE_OPTS ?= $$($(3)_GETTEXTIZE_OPTS) -endif - ifeq ($(4),host) $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS) endif diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index d460251f48ed..fc873c045ad6 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1206,9 +1206,16 @@ $(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_ $(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS)) $(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS)) $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) -$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) +# Check for deprecated variables that have no replacement +ifneq ($$($(2)_GETTEXTIZE_OPT),) +$$(error "$(2)_GETTEXTIZE_OPT is no longer supported. Please fix your .mk file.") +endif +ifneq ($$($(2)_GETTEXTIZE_OPTS),) +$$(error "$(2)_GETTEXTIZE_OPTS is no longer supported. Please fix your .mk file.") +endif + PACKAGES += $(1) ifneq ($$($(2)_PERMISSIONS),) From 067a69412a5d274ed3771c52fb9864cc37cb16d8 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:21:52 -0600 Subject: [PATCH 0140/2890] manual: remove LIBFOO_GETTEXTIZE_OPTS Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- docs/manual/adding-packages-autotools.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt index a041d91eb623..8655a79693d3 100644 --- a/docs/manual/adding-packages-autotools.txt +++ b/docs/manual/adding-packages-autotools.txt @@ -136,12 +136,6 @@ cases, typical packages will therefore only use a few of them. 'gettextize'.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid values are +YES+ and +NO+. The default is +NO+. -* +LIBFOO_GETTEXTIZE_OPTS+, to specify additional options passed to - the 'gettextize' program, if +LIBFOO_GETTEXTIZE=YES+. You may - use that if, for example, the +.po+ files are not located in the - standard place (i.e. in +po/+ at the root of the package.) By - default, '-f'. - * +LIBFOO_LIBTOOL_PATCH+ tells whether the Buildroot patch to fix libtool cross-compilation issues should be applied or not. Valid values are +YES+ and +NO+. By From 658e7626e54965669bf51e5e6d470d2638b1ac33 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:21:53 -0600 Subject: [PATCH 0141/2890] package/pkg-autotools: set AUTOPOINT via AUTOCONF_ENV Previously, AUTOPOINT was hardcoded to /bin/true in autoconf.mk. Moving the definition of this variable into AUTOCONF_ENV as part of the autotools infrastructure will allow us to conditionally set the variable based on package flags to support migrating away from FOO_GETTEXTIZE. While we're at it, split the overly long line that defines AUTORECONF, wrapping at 80 columns. Signed-off-by: Vincent Fazio [Arnout: split long line] Signed-off-by: Arnout Vandecappelle --- package/autoconf/autoconf.mk | 5 ++++- package/pkg-autotools.mk | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 7e0850422b01..15ce9d5927e2 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -23,4 +23,7 @@ $(eval $(host-autotools-package)) # variables used by other packages AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" AUTOHEADER = $(HOST_DIR)/bin/autoheader -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true GTKDOCIZE=/bin/true $(HOST_DIR)/bin/autoreconf -f -i +AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" \ + AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" \ + AUTOMAKE="$(AUTOMAKE)" GTKDOCIZE=/bin/true \ + $(HOST_DIR)/bin/autoreconf -f -i diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 55d95d204eb6..418cd10945ab 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -241,6 +241,7 @@ ifeq ($$($(2)_GETTEXTIZE),YES) $(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK $(2)_DEPENDENCIES += host-gettext endif +$(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK # default values are not evaluated yet, so don't rely on this defaulting to YES ifneq ($$($(2)_LIBTOOL_PATCH),NO) From bb7822abad0d09cbd4a7bf794ae1ec95d2daca73 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:21:54 -0600 Subject: [PATCH 0142/2890] package/pkg-autotools: add FOO_AUTOPOINT flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a new variable to run autopoint during autoreconf. This variable depends on FOO_AUTORECONF = YES. It is mutually exclusive to FOO_GETTEXTIZE. If both are set, FOO_AUTOPOINT is ignored to preserve previous behavior. This support is being added per a previous discussion [1]. The usage of gettextize needs to be removed cuz mama says so [2]. ... is not part of the GNU build system, in the sense that it should not be invoked automatically, and not be invoked by someone who doesn’t assume the responsibilities of a package maintainer. For the latter purpose, a separate tool is provided, see Invoking the autopoint Program [3] Using gettextize has the unintended consequence of updating the package based on the version of host-gettext vs what was chosen by the upstream maintainer. As mama said above, we should use autopoint. Do as she says to avoid further scolding (gettextize shoehorning and package patching). [1] https://patchwork.ozlabs.org/project/buildroot/patch/20170827110920.15579-1-aleksander@aleksander.es/ [2] https://www.gnu.org/software/gettext/manual/html_node/gettextize-Invocation.html [3] https://www.gnu.org/software/gettext/manual/html_node/autopoint-Invocation.html Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- package/pkg-autotools.mk | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 418cd10945ab..48485567d7a9 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -152,6 +152,15 @@ ifndef $(2)_GETTEXTIZE endif endif +ifndef $(2)_AUTOPOINT + ifdef $(3)_AUTOPOINT + $(2)_AUTOPOINT = $$($(3)_AUTOPOINT) + else + $(2)_AUTOPOINT ?= NO + endif +endif + + ifeq ($(4),host) $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS) endif @@ -240,8 +249,14 @@ ifeq ($$($(2)_AUTORECONF),YES) ifeq ($$($(2)_GETTEXTIZE),YES) $(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK $(2)_DEPENDENCIES += host-gettext -endif $(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true +# autopoint is provided by gettext +else ifeq ($$($(2)_AUTOPOINT),YES) +$(2)_DEPENDENCIES += host-gettext +$(2)_AUTORECONF_ENV += AUTOPOINT=$$(HOST_DIR)/bin/autopoint +else +$(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true +endif $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK # default values are not evaluated yet, so don't rely on this defaulting to YES ifneq ($$($(2)_LIBTOOL_PATCH),NO) From 323abee789c7f63db3df14a235b3106e7adab4ba Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:21:55 -0600 Subject: [PATCH 0143/2890] package/aumix: migrate to new autopoint flag Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- package/aumix/aumix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/aumix/aumix.mk b/package/aumix/aumix.mk index a4001f5bbb7d..03072d5d359f 100644 --- a/package/aumix/aumix.mk +++ b/package/aumix/aumix.mk @@ -8,7 +8,7 @@ AUMIX_VERSION = 2.9.1 AUMIX_SOURCE = aumix-$(AUMIX_VERSION).tar.bz2 AUMIX_SITE = http://jpj.net/~trevor/aumix/releases AUMIX_AUTORECONF = YES -AUMIX_GETTEXTIZE = YES +AUMIX_AUTOPOINT = YES AUMIX_LICENSE = GPL-2.0+ AUMIX_LICENSE_FILES = COPYING From b75e7dc15a682f73832384e7116a6c36dca0acee Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:21:56 -0600 Subject: [PATCH 0144/2890] package/dc3dd: migrate to new autopoint flag Signed-off-by: Vincent Fazio [Arnout: also update comment] Signed-off-by: Arnout Vandecappelle --- package/dc3dd/dc3dd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dc3dd/dc3dd.mk b/package/dc3dd/dc3dd.mk index cc89bb63d01a..f47f34a81aa6 100644 --- a/package/dc3dd/dc3dd.mk +++ b/package/dc3dd/dc3dd.mk @@ -11,8 +11,8 @@ DC3DD_SITE = https://downloads.sourceforge.net/project/dc3dd/dc3dd/$(DC3DD_VERSI DC3DD_LICENSE = GPL-3.0+ DC3DD_LICENSE_FILES = COPYING # We are patching Makefile.am, so we need to autoreconf. We also need to -# enable gettextize as dc3dd comes with an old gettext infra. +# enable autopoint as dc3dd comes with an old gettext infra. DC3DD_AUTORECONF = YES -DC3DD_GETTEXTIZE = YES +DC3DD_AUTOPOINT = YES $(eval $(autotools-package)) From 92aea79dedff95a9d289ad464e00aa69d8da97ac Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:21:57 -0600 Subject: [PATCH 0145/2890] package/flex: migrate to new autopoint flag Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- package/flex/flex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 85da5ddae8ae..f1e731ce2e90 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -20,7 +20,7 @@ HOST_FLEX_DEPENDENCIES = host-m4 # 0002-build-make-it-possible-to-disable-the-build-of-the-f.patch # 0003-build-make-it-possible-to-disable-the-build-of-the-d.patch FLEX_AUTORECONF = YES -FLEX_GETTEXTIZE = YES +FLEX_AUTOPOINT = YES FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 \ ac_cv_func_reallocarray=no From b21fc7532ce1aedadb2e6efc710add665eebd82d Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:21:58 -0600 Subject: [PATCH 0146/2890] package/hddtemp: migrate to new autopoint flag Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- package/hddtemp/hddtemp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hddtemp/hddtemp.mk b/package/hddtemp/hddtemp.mk index 4f45647dffae..42dcb3d4169d 100644 --- a/package/hddtemp/hddtemp.mk +++ b/package/hddtemp/hddtemp.mk @@ -11,7 +11,7 @@ HDDTEMP_LICENSE_FILES = GPL-2 # Fetched from Github with no configure script HDDTEMP_AUTORECONF = YES -HDDTEMP_GETTEXTIZE = YES +HDDTEMP_AUTOPOINT = YES HDDTEMP_DB_PATH = /usr/share/misc/hddtemp.db HDDTEMP_CONF_OPTS = --with-db-path=$(HDDTEMP_DB_PATH) From cf7b3a1a36c7f60cc32117f4521c6571f68416a3 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:21:59 -0600 Subject: [PATCH 0147/2890] package/libuio: migrate to new autopoint flag Drop patch that is no longer necessary after moving to new package flag. Add patch to fix builds due to missing required files. Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- ...0001-configure-remove-po-Makefile.in.patch | 26 ---------------- ...c-set-automake-strictness-to-foreign.patch | 31 +++++++++++++++++++ package/libuio/libuio.mk | 2 +- 3 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 package/libuio/0001-configure-remove-po-Makefile.in.patch create mode 100644 package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch diff --git a/package/libuio/0001-configure-remove-po-Makefile.in.patch b/package/libuio/0001-configure-remove-po-Makefile.in.patch deleted file mode 100644 index 067465cc31d5..000000000000 --- a/package/libuio/0001-configure-remove-po-Makefile.in.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c5fa0b778e1c2a7d03ff6e661bdfa2faef878f68 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 1 Jul 2016 17:56:30 +0200 -Subject: [PATCH] configure: remove po/Makefile.in - -The file po/Makefile.in is automatically added to AC_OUTPUT while using gettexize - -Signed-off-by: Romain Naour ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f7fb40f..a25e463 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,5 +55,4 @@ dnl last but not least - AC_OUTPUT([Makefile - libuio.dox - libuio-uninstalled.pc -- libuio.pc -- po/Makefile.in]) -+ libuio.pc]) --- -2.5.5 - diff --git a/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch b/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch new file mode 100644 index 000000000000..1ce91f01f386 --- /dev/null +++ b/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch @@ -0,0 +1,31 @@ +From 546e07b2405455c03b7eb0d392c331e189913bc4 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 31 Jan 2023 19:06:29 -0600 +Subject: [PATCH] configure.ac: set automake strictness to foreign + +libuio does not conform to the GNU's strict layout requirements. [1] + +Set the strictness to foreign to account for this. + +[1] https://www.gnu.org/software/automake/manual/html_node/Strictness.html + +Signed-off-by: Vincent Fazio +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 101abd3..ef46171 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,6 @@ + dnl Every other copy of the package version number gets its value from here + AC_INIT(libuio, 0.2.8, https://github.com/linutronix/libuio/issues) +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + + AM_CONFIG_HEADER(config.h) + +-- +2.25.1 + diff --git a/package/libuio/libuio.mk b/package/libuio/libuio.mk index a0285277abcf..d5019af594b5 100644 --- a/package/libuio/libuio.mk +++ b/package/libuio/libuio.mk @@ -14,7 +14,7 @@ LIBUIO_LIBS = $(TARGET_NLS_LIBS) LIBUIO_INSTALL_STAGING = YES # Fetched from github, no pre-generated configure script provided -LIBUIO_GETTEXTIZE = YES +LIBUIO_AUTOPOINT = YES LIBUIO_AUTORECONF = YES # Avoid build issue when makeinfo is missing From 8962eb6749f62fbf1f5ef3ef65d385a13e029e98 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:22:00 -0600 Subject: [PATCH 0148/2890] package/motion: migrate to new autopoint flag Drop patch that is no longer necessary. Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- ...1-configure.ac-remove-po-Makefile.in.patch | 29 ------------------- package/motion/motion.mk | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 package/motion/0001-configure.ac-remove-po-Makefile.in.patch diff --git a/package/motion/0001-configure.ac-remove-po-Makefile.in.patch b/package/motion/0001-configure.ac-remove-po-Makefile.in.patch deleted file mode 100644 index 9b514bafcd00..000000000000 --- a/package/motion/0001-configure.ac-remove-po-Makefile.in.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0e05d4116678de3a7d913177a8fc63f10e58ad24 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 18 Jan 2020 00:00:21 +0100 -Subject: [PATCH] configure.ac: remove po/Makefile.in - -The file po/Makefile.in is automatically added to AC_OUTPUT while using -gettexize - -Signed-off-by: Fabrice Fontaine -[Upstream status: not upstreamable] ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3876adb..221dacf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -471,7 +471,6 @@ LDFLAGS="$TEMP_LDFLAGS" - AC_CONFIG_FILES([ - Makefile - src/Makefile -- po/Makefile.in - man/Makefile - data/camera1-dist.conf - data/camera2-dist.conf --- -2.24.1 - diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 4e9ccdc3f717..2cce6cd1ff74 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -12,7 +12,7 @@ MOTION_CPE_ID_VENDOR = motion_project MOTION_DEPENDENCIES = host-pkgconf jpeg libmicrohttpd $(TARGET_NLS_DEPENDENCIES) # From git MOTION_AUTORECONF = YES -MOTION_GETTEXTIZE = YES +MOTION_AUTOPOINT = YES MOTION_CONF_OPTS += --without-optimizecpu From 3c75542074140853a3017eaa34a96884e3ec12b3 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:22:01 -0600 Subject: [PATCH 0149/2890] package/rrdtool: migrate to new autopoint flag Signed-off-by: Vincent Fazio [Arnout: also update comment] Signed-off-by: Arnout Vandecappelle --- package/rrdtool/rrdtool.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk index 2731b7b39d96..051aec1c1930 100644 --- a/package/rrdtool/rrdtool.mk +++ b/package/rrdtool/rrdtool.mk @@ -10,9 +10,9 @@ RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIG RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) # autoreconf needed to avoid link failure due to missing -lintl, -# gettextize needed as a consequence of autoreconf +# autopoint needed as a consequence of autoreconf RRDTOOL_AUTORECONF = YES -RRDTOOL_GETTEXTIZE = YES +RRDTOOL_AUTOPOINT = YES RRDTOOL_INSTALL_STAGING = YES RRDTOOL_CONF_OPTS = \ --disable-examples \ From 33c85dc3ec02028847fd0b5fa6570fb4e892358a Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 25 Mar 2023 21:46:05 +0100 Subject: [PATCH 0150/2890] package/speechd: migrate to new autopoint flag Signed-off-by: Arnout Vandecappelle --- package/speechd/speechd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 5944ea3a2869..ae777c6d3069 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -11,7 +11,7 @@ SPEECHD_LICENSE_FILES = COPYING.GPL-2 COPYING.GPL-3 COPYING.LGPL SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES -SPEECHD_GETTEXTIZE = YES +SPEECHD_AUTOPOINT = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" SPEECHD_CONF_OPTS = \ From 98de5e4aad1c2cae97cbcaa8fd2771a4a69f8d4c Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:22:02 -0600 Subject: [PATCH 0151/2890] package/popt: remove POPT_GETTEXTIZE Commit 895bfba dropped POPT_AUTORECONF but did not drop POPT_GETTEXTIZE, which requires POPT_AUTORECONF = YES. Fixes: 895bfba ("package/popt: bump to version 1.19") Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- package/popt/popt.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/popt/popt.mk b/package/popt/popt.mk index 842cf0d03526..5cee8e9673ce 100644 --- a/package/popt/popt.mk +++ b/package/popt/popt.mk @@ -11,7 +11,6 @@ POPT_LICENSE = MIT POPT_LICENSE_FILES = COPYING POPT_CPE_ID_VENDOR = popt_project -POPT_GETTEXTIZE = YES POPT_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) POPT_CONF_ENV = ac_cv_va_copy=yes From e32123b866442a1ccf65627b98147c91128b5912 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:22:03 -0600 Subject: [PATCH 0152/2890] package/pkg-autotools: drop support for FOO_GETTEXTIZE Remove all support for FOO_GETTEXTIZE and alert users to FOO_AUTOPOINT as the recommended solution in its stead. We can use the standard check-deprecated-variable for this, because from a user perspective FOO_AUTOPOINT is pretty-much a drop-in replacement. The warnings about FOO_GETTEXTIZE_OPTS are no longer relevant, because they will only make sense if FOO_GETTEXTIZE was already set. Signed-off-by: Vincent Fazio [Arnout: - use check-deprecated-variable; - remove FOO_GETTEXTIZE_OPTS warnings; - remove definition of GETTEXTIZE] Signed-off-by: Arnout Vandecappelle --- package/pkg-autotools.mk | 23 +---------------------- package/pkg-generic.mk | 9 +-------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 48485567d7a9..f17186dfe42a 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -87,14 +87,6 @@ define CONFIGURE_FIX_POWERPC64_HOOK support/scripts/fix-configure-powerpc64.sh $($(PKG)_DIR) endef -# -# Hook to gettextize the package if needed -# -define GETTEXTIZE_HOOK - @$(call MESSAGE,"Gettextizing") - $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) -endef - # # Hook to autoreconf the package if needed # @@ -144,14 +136,6 @@ ifndef $(2)_AUTORECONF endif endif -ifndef $(2)_GETTEXTIZE - ifdef $(3)_GETTEXTIZE - $(2)_GETTEXTIZE = $$($(3)_GETTEXTIZE) - else - $(2)_GETTEXTIZE ?= NO - endif -endif - ifndef $(2)_AUTOPOINT ifdef $(3)_AUTOPOINT $(2)_AUTOPOINT = $$($(3)_AUTOPOINT) @@ -245,13 +229,8 @@ $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK ifeq ($$($(2)_AUTORECONF),YES) -# This has to come before autoreconf -ifeq ($$($(2)_GETTEXTIZE),YES) -$(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK -$(2)_DEPENDENCIES += host-gettext -$(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true # autopoint is provided by gettext -else ifeq ($$($(2)_AUTOPOINT),YES) +ifeq ($$($(2)_AUTOPOINT),YES) $(2)_DEPENDENCIES += host-gettext $(2)_AUTORECONF_ENV += AUTOPOINT=$$(HOST_DIR)/bin/autopoint else diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index fc873c045ad6..5d1c1da12835 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1207,14 +1207,7 @@ $(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS $(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS)) $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) - -# Check for deprecated variables that have no replacement -ifneq ($$($(2)_GETTEXTIZE_OPT),) -$$(error "$(2)_GETTEXTIZE_OPT is no longer supported. Please fix your .mk file.") -endif -ifneq ($$($(2)_GETTEXTIZE_OPTS),) -$$(error "$(2)_GETTEXTIZE_OPTS is no longer supported. Please fix your .mk file.") -endif +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE,$(2)_AUTOPOINT)) PACKAGES += $(1) From e9e1cd239f179e15f7f4214e274282d4e2bb5b7d Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:22:04 -0600 Subject: [PATCH 0153/2890] package/gettext: drop GETTEXTIZE variable This variable is no longer used anywhere in the tree so remove it. Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- package/gettext/gettext.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 146d40e13b0c..a86e26f69e60 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -4,7 +4,5 @@ # ################################################################################ -GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/bin/autom4te $(HOST_DIR)/bin/gettextize -f - $(eval $(virtual-package)) $(eval $(host-virtual-package)) From 2bc95879f7d61d5e02bb5e90e3ba0eeade8fa166 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:22:05 -0600 Subject: [PATCH 0154/2890] manual: drop LIBFOO_GETTEXTIZE, add LIBFOO_AUTOPOINT Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- docs/manual/adding-packages-autotools.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt index 8655a79693d3..ad96957f3d85 100644 --- a/docs/manual/adding-packages-autotools.txt +++ b/docs/manual/adding-packages-autotools.txt @@ -130,10 +130,9 @@ cases, typical packages will therefore only use a few of them. passed to the 'autoreconf' program if +LIBFOO_AUTORECONF=YES+. By default, empty. -* +LIBFOO_GETTEXTIZE+, tells whether the package should be - gettextized or not (i.e. if the package uses a different gettext - version than Buildroot provides, and it is needed to run - 'gettextize'.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid +* +LIBFOO_AUTOPOINT+, tells whether the package should be + autopointed or not (i.e. if the package needs I18N infrastructure + copied in.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid values are +YES+ and +NO+. The default is +NO+. * +LIBFOO_LIBTOOL_PATCH+ tells whether the Buildroot From 48311b11e0d46b4b8e5ca08da63f4a7d9bc3a55a Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 25 Mar 2023 22:06:08 +0100 Subject: [PATCH 0155/2890] package/python-marshmallow-sqlalchemy: fix spaces in hash file check-package complains with: package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Arnout Vandecappelle --- .../python-marshmallow-sqlalchemy.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash index db061b623f22..d3d1b3876f82 100644 --- a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/marshmallow-sqlalchemy/json -md5 e1b2858be2f0ce6dead48e67080631c4 marshmallow-sqlalchemy-0.29.0.tar.gz +md5 e1b2858be2f0ce6dead48e67080631c4 marshmallow-sqlalchemy-0.29.0.tar.gz sha256 3523a774390ef0c1c0f7c708a7519809c5396cf608720f14f55c36f74ff5bbec marshmallow-sqlalchemy-0.29.0.tar.gz # Locally computed sha256 checksums sha256 625df8e2758a271b4bc90525c0b6161814e0f72cb3504b03ab5206b7abf50072 LICENSE From 0472287484e5914f7437cfd9f05524ab38b810fe Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 10:00:30 +0200 Subject: [PATCH 0156/2890] package/protozero: fix double space in Config.in comment Signed-off-by: Peter Seiderer Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/protozero/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/protozero/Config.in b/package/protozero/Config.in index 19048dfe8da0..e6347e6f7f3a 100644 --- a/package/protozero/Config.in +++ b/package/protozero/Config.in @@ -16,5 +16,5 @@ config BR2_PACKAGE_PROTOZERO https://github.com/mapbox/protozero -comment "protozero needs a toolchain w/ C++, gcc >= 4.7" +comment "protozero needs a toolchain w/ C++, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 From 2b2a679dfba428014900f1adaffee05d515f0e20 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 10:00:31 +0200 Subject: [PATCH 0157/2890] package/lcdproc: fix double space in Config.in comment Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/lcdproc/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lcdproc/Config.in b/package/lcdproc/Config.in index 042abd69df96..e5ff432d407f 100644 --- a/package/lcdproc/Config.in +++ b/package/lcdproc/Config.in @@ -1,4 +1,4 @@ -comment "lcdproc needs a toolchain w/ dynamic library" +comment "lcdproc needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS config BR2_PACKAGE_LCDPROC From e81ca405164fbef1c43fc01aa2f95f67090d3bde Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 10:00:32 +0200 Subject: [PATCH 0158/2890] package/libosmium: fix double space in Config.in comment Signed-off-by: Peter Seiderer Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/libosmium/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libosmium/Config.in b/package/libosmium/Config.in index 3a4c64e9d22a..825e2b7e338a 100644 --- a/package/libosmium/Config.in +++ b/package/libosmium/Config.in @@ -13,6 +13,6 @@ config BR2_PACKAGE_LIBOSMIUM https://osmcode.org/libosmium/ -comment "libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" +comment "libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS From 9611a3b323676637b9bc463268cfead66c8146fb Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 10:00:33 +0200 Subject: [PATCH 0159/2890] package/osm2pgsql: fix double space in Config.in comment Signed-off-by: Peter Seiderer Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/osm2pgsql/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index e903e92c49e7..3e73572a800e 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -22,7 +22,7 @@ config BR2_PACKAGE_OSM2PGSQL https://osm2pgsql.org -comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS From 05d3fdfd1314cce610f4fd2a55599b0595fcf2fc Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 10:00:34 +0200 Subject: [PATCH 0160/2890] package/zerofree: fix double space in Config.in comment Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/zerofree/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zerofree/Config.in b/package/zerofree/Config.in index 99466d6baec0..e7007819d876 100644 --- a/package/zerofree/Config.in +++ b/package/zerofree/Config.in @@ -9,6 +9,6 @@ config BR2_PACKAGE_ZEROFREE https://frippery.org/uml/ -comment "zerofree needs a toolchain w/ dynamic library" +comment "zerofree needs a toolchain w/ dynamic library" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS From c5e94221974326685dba526397747658c28bba4e Mon Sep 17 00:00:00 2001 From: Simon Rowe Date: Thu, 23 Mar 2023 14:13:26 +0000 Subject: [PATCH 0161/2890] package/lvm2: enable package with musl LVM relies on the glibc-specific behaviour of assigning to the standard streams (stdin etc). As a result the package is currently disabled when using musl. This commit backports two patches from upstream lvm2 (not yet in a release) that fix some build issues with musl, and two additional patches taken from the Gentoo distribution to address more issues. With those 4 patches combined, lvm2 builds fine with musl and can therefore be re-enabled in musl configurations. Signed-off-by: Simon Rowe Signed-off-by: Thomas Petazzoni --- ...sible-better-compilation-with-musl-c.patch | 30 ++++++++ ...m-preallocate-memory-only-with-glibc.patch | 34 ++++++++++ ...e-freopen-to-reopen-standard-streams.patch | 68 +++++++++++++++++++ ...e-freopen-to-reopen-standard-streams.patch | 44 ++++++++++++ package/lvm2/Config.in | 5 -- 5 files changed, 176 insertions(+), 5 deletions(-) create mode 100644 package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch create mode 100644 package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch create mode 100644 package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch create mode 100644 package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch diff --git a/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch b/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch new file mode 100644 index 000000000000..f537331a2c34 --- /dev/null +++ b/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch @@ -0,0 +1,30 @@ +From bac596b3685520acaa404dc3ebd2131e6de96d47 Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac +Date: Wed, 16 Feb 2022 00:48:49 +0100 +Subject: [PATCH] clang: possible better compilation with musl c + +Try to help resolving reported compilation problem with +clang & musl C. +https://github.com/lvmteam/lvm2/issues/61 + +Backported from: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4fd76de4b69f8e5e6d5afa03d54cb4b8986c4bcc +Signed-off-by: Simon Rowe +--- + libdaemon/server/daemon-server.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c +index 88905a7dd..96cfc392e 100644 +--- a/libdaemon/server/daemon-server.c ++++ b/libdaemon/server/daemon-server.c +@@ -18,6 +18,7 @@ + + #include + #include ++#include /* help musl C */ + #include + #include + #include +-- +2.22.3 + diff --git a/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch b/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch new file mode 100644 index 000000000000..db16d60acea2 --- /dev/null +++ b/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch @@ -0,0 +1,34 @@ +From b668022f9b8aecf52109c9e0b7e5847054231361 Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac +Date: Fri, 19 Aug 2022 16:15:17 +0200 +Subject: [PATCH] mm: preallocate memory only with glibc + +Use mallinfo() only with glibc. + +Backported from: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8370d117d7ef8a472c95315a3cd085696c90b3be +Signed-off-by: Simon Rowe +--- + lib/mm/memlock.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c +index 3d1a3927c..efcc6d91f 100644 +--- a/lib/mm/memlock.c ++++ b/lib/mm/memlock.c +@@ -160,7 +160,12 @@ static void _touch_memory(void *mem, size_t size) + + static void _allocate_memory(void) + { +-#ifndef VALGRIND_POOL ++#if defined(__GLIBC__) && !defined(VALGRIND_POOL) ++ /* Memory allocation is currently only tested with glibc ++ * for different C libraries, some other mechanisms might be needed ++ * meanwhile let users use lvm2 code without memory preallocation. ++ * Compilation for VALGRIND tracing also goes without preallocation. ++ */ + void *stack_mem; + struct rlimit limit; + int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; +-- +2.22.3 + diff --git a/package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch b/package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch new file mode 100644 index 000000000000..8d0be40320ce --- /dev/null +++ b/package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch @@ -0,0 +1,68 @@ +From 7c74ad9c349e381decc84c218112ea8e7bcc0b9c Mon Sep 17 00:00:00 2001 +From: Simon Rowe +Date: Thu, 23 Mar 2023 09:57:59 +0000 +Subject: [PATCH] cmdline: use freopen() to reopen standard streams + +In glibc stdin, stdout & stderr are variables that can be assigned to +(https://www.gnu.org/software/libc/manual/html_node/Standard-Streams.html) +however this not necessarily true of other C libraries. + +The gentoo musl porting notes +(https://wiki.gentoo.org/wiki/Musl_porting_notes) +recommend the substitution of + + stdX = fopen(...) + +with + + freopen(..., stdX) + +Taken from: https://github.com/gentoo/gentoo/blob/master/sys-fs/lvm2/files/lvm2-2.03.14-r1-fopen-to-freopen.patch +Signed-off-by: Simon Rowe +--- + tools/lvmcmdline.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c +index 1e12bedca..534368575 100644 +--- a/tools/lvmcmdline.c ++++ b/tools/lvmcmdline.c +@@ -3384,7 +3384,11 @@ static int _check_standard_fds(void) + int err = is_valid_fd(STDERR_FILENO); + + if (!is_valid_fd(STDIN_FILENO) && ++#ifdef __GLIBC__ + !(stdin = fopen(_PATH_DEVNULL, "r"))) { ++#else ++ !freopen(_PATH_DEVNULL, "r", stdin)) { ++#endif + if (err) + perror("stdin stream open"); + else +@@ -3394,7 +3398,11 @@ static int _check_standard_fds(void) + } + + if (!is_valid_fd(STDOUT_FILENO) && ++#ifdef __GLIBC__ + !(stdout = fopen(_PATH_DEVNULL, "w"))) { ++#else ++ !freopen(_PATH_DEVNULL, "w", stdout)) { ++#endif + if (err) + perror("stdout stream open"); + /* else no stdout */ +@@ -3402,7 +3410,11 @@ static int _check_standard_fds(void) + } + + if (!is_valid_fd(STDERR_FILENO) && ++#ifdef __GLIBC__ + !(stderr = fopen(_PATH_DEVNULL, "w"))) { ++#else ++ !freopen(_PATH_DEVNULL, "w", stderr)) { ++#endif + printf("stderr stream open: %s\n", + strerror(errno)); + return 0; +-- +2.22.3 + diff --git a/package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch b/package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch new file mode 100644 index 000000000000..0b57fb6fd224 --- /dev/null +++ b/package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch @@ -0,0 +1,44 @@ +From 6d6b953cf7d2b8d06e7b0363b1b06cb2e902aa0f Mon Sep 17 00:00:00 2001 +From: Simon Rowe +Date: Thu, 23 Mar 2023 10:07:02 +0000 +Subject: [PATCH] log: use freopen() to reopen standard streams + +In glibc stdin, stdout & stderr are variables that can be assigned to +(https://www.gnu.org/software/libc/manual/html_node/Standard-Streams.html) +however this not necessarily true of other C libraries. + +The gentoo musl porting notes +(https://wiki.gentoo.org/wiki/Musl_porting_notes) +recommend the substitution of + + stdX = fopen(...) + +with + + freopen(..., stdX) + +Taken from: https://github.com/gentoo/gentoo/blob/master/sys-fs/lvm2/files/lvm2-2.03.14-freopen_n2.patch +Signed-off-by: Simon Rowe +--- + lib/log/log.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/lib/log/log.c b/lib/log/log.c +index 7b4d537b3..5f62c048c 100644 +--- a/lib/log/log.c ++++ b/lib/log/log.c +@@ -208,7 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) + + _check_and_replace_standard_log_streams(old_stream, new_stream); + ++#ifdef __GLIBC__ + *stream = new_stream; ++#else ++ freopen(NULL, mode, *stream); ++#endif + return 1; + } + +-- +2.22.3 + diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in index cc740dd40c62..577a90656af0 100644 --- a/package/lvm2/Config.in +++ b/package/lvm2/Config.in @@ -27,15 +27,10 @@ if BR2_PACKAGE_LVM2 config BR2_PACKAGE_LVM2_STANDARD_INSTALL bool "standard install instead of only dmsetup" default y - # http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html - depends on !BR2_TOOLCHAIN_USES_MUSL help Install the standard suite of lvm2 programs. When this option is not set, only dmsetup is installed. -comment "lvm2 standard install needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL - endif comment "lvm2 needs a toolchain w/ threads, dynamic library" From 7ad6dd20ffe6cfb57133cef5f1fdd0716339172f Mon Sep 17 00:00:00 2001 From: Simon Rowe Date: Thu, 23 Mar 2023 14:13:27 +0000 Subject: [PATCH 0162/2890] package/multipath-tools: enable with musl Now LVM2 can be built using musl drop the toolchain config restriction. Signed-off-by: Simon Rowe Signed-off-by: Thomas Petazzoni --- package/multipath-tools/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/multipath-tools/Config.in b/package/multipath-tools/Config.in index fc4b01b2ac87..222f78b86ce6 100644 --- a/package/multipath-tools/Config.in +++ b/package/multipath-tools/Config.in @@ -1,14 +1,12 @@ -comment "multipath-tools needs udev and a uClibc or glibc toolchain w/ threads, dynamic library" +comment "multipath-tools needs udev and a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_MULTIPATH_TOOLS bool "multipath-tools" depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_SYNC_4 From 37e63bb2c98052939de9b4e6cb30002016055c05 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 27 Mar 2023 16:11:21 +0200 Subject: [PATCH 0163/2890] package/linux-tools: perf: ditch redundant -f 'rm' flag The value of the RM variable in make is 'rm -f' [0], thus the additional -f is redundant. [0] https://www.gnu.org/software/make/manual/make.html#index-RM Signed-off-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- package/linux-tools/linux-tool-perf.mk.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index dda63cccecb4..5431c78152c5 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -166,8 +166,8 @@ endef # target unless BR2_PACKAGE_LINUX_TOOLS_PERF_SCRIPTS is enabled ifeq ($(BR2_PACKAGE_LINUX_TOOLS_PERF_SCRIPTS),) define PERF_INSTALL_REMOVE_SCRIPTS - $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/ - $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/ + $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/scripts/ + $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/tests/ endef endif From 9a3d4e38183e7c7ade63588519796005f43efe78 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 27 Mar 2023 16:11:22 +0200 Subject: [PATCH 0164/2890] docs/manual: ditch redundant -f 'rm' flag The value of the RM variable in make is 'rm -f' [0], thus the additional -f is redundant. Avoid it on the docs to avoid developers taking it as a good example to follow. [0] https://www.gnu.org/software/make/manual/make.html#index-RM Signed-off-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- docs/manual/writing-rules.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 758965d80a0a..13b7fd5bea6a 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -78,7 +78,7 @@ Do not align the +=+ signs. + --------------------- define LIBFOO_REMOVE_DOC - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/doc \ + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/doc \ $(TARGET_DIR)/usr/share/man/man3/libfoo* endef --------------------- @@ -118,7 +118,7 @@ YES: --------------------- ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) define LIBFOO_REMOVE_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/data + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA endif @@ -128,7 +128,7 @@ NO: + --------------------- define LIBFOO_REMOVE_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/data + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) From fb515a4b284228935a0afb65d73a563f2b2c902c Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 27 Mar 2023 15:59:48 +0200 Subject: [PATCH 0165/2890] package/linux-tools: add USB tools (testusb and ffs-test) Extend the linux-tools package to also build the userspace USB tools, which currently include testusb and ffs-test. These tools are in the kernel tree since a long time, and althogh a Makefile had been present since kernel 2.6.39, it has been entirely rewritten (with an install rule) back with kernel 5.9, to allow building the same way as other tools provided with the kernel. We make use of the Makefile install rule, thus version >= 5.9 is required. Support for older kernels may be added later if needed, and is left as an exercise for the motivated party. Signed-off-by: Luca Ceresoli Reviewed-by: Herve Codina [yann.morin.1998@free.fr: fix history of Makefile] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/linux-tools/Config.in | 26 ++++++++++++++ package/linux-tools/linux-tool-usbtools.mk.in | 34 +++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 package/linux-tools/linux-tool-usbtools.mk.in diff --git a/DEVELOPERS b/DEVELOPERS index b6d288c54fa9..67c6004ddf2e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1874,6 +1874,7 @@ F: configs/zynqmp_zcu106_defconfig F: package/agentpp/ F: package/exim/ F: package/libpjsip/ +F: package/linux-tools/linux-tool-usbtools.mk.in F: package/qpid-proton/ F: package/rtl8188eu/ F: package/snmppp/ diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index 8a0b6d5802cc..451b0eeff5bb 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -135,6 +135,32 @@ comment "selftests needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS and a toolchain w/ dyna depends on !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS || \ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 +config BR2_PACKAGE_LINUX_TOOLS_USBTOOLS + bool "USB test programs" + select BR2_PACKAGE_LINUX_TOOLS + help + Build and install the USB test tools. + + These tools exist since Linux 2.6.35, but Buildroot can build + them only with kernel versions 5.9 and later. + +if BR2_PACKAGE_LINUX_TOOLS_USBTOOLS + +config BR2_PACKAGE_LINUX_TOOLS_USBTOOLS_TESTUSB + bool "testusb" + help + testusb issues ioctls to perform the tests implemented by the + kernel driver. It can generate a variety of transfer + patterns. + + See http://www.linux-usb.org/usbtest/ + +config BR2_PACKAGE_LINUX_TOOLS_USBTOOLS_FFSTEST + bool "ffs-test" + help + User mode filesystem api for usb composite function +endif + config BR2_PACKAGE_LINUX_TOOLS_TMON bool "tmon" depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/linux-tools/linux-tool-usbtools.mk.in b/package/linux-tools/linux-tool-usbtools.mk.in new file mode 100644 index 000000000000..797758adce51 --- /dev/null +++ b/package/linux-tools/linux-tool-usbtools.mk.in @@ -0,0 +1,34 @@ +################################################################################ +# +# usbtools +# +################################################################################ + +LINUX_TOOLS += usbtools + +USBTOOLS_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" + +LINUX_TOOLS_USBTOOLS_LIST = \ + $(if $(BR2_PACKAGE_LINUX_TOOLS_USBTOOLS_TESTUSB),testusb) \ + $(if $(BR2_PACKAGE_LINUX_TOOLS_USBTOOLS_FFSTEST),ffs-test) + +define USBTOOLS_BUILD_CMDS + $(Q)if ! grep install $(LINUX_DIR)/tools/usb/Makefile >/dev/null 2>&1 ; then \ + echo "Your kernel version is too old to build the USB tools." ; \ + echo "At least kernel 5.9 must be used." ; \ + exit 1 ; \ + fi + + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/usb \ + ALL_TARGETS="$(LINUX_TOOLS_USBTOOLS_LIST)" \ + $(USBTOOLS_MAKE_OPTS) \ + all +endef + +define USBTOOLS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/usb \ + ALL_TARGETS="$(LINUX_TOOLS_USBTOOLS_LIST)" \ + $(USBTOOLS_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) \ + install +endef From 16cd9494ba6496d7f5f873abd307952efea7da78 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 09:48:20 +0200 Subject: [PATCH 0166/2890] package/flann: needs C++11 support Fixes: - http://autobuild.buildroot.net/results/c92a3df1bc73e00e1e4493500bfb7277cf5064ee .../build/flann-1.9.2/src/cpp/flann/util/lsh_table.h:367:5: error: 'random_device' is not a member of 'std' std::random_device rd; ^ Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/flann/Config.in | 6 ++++-- package/flann/flann.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/flann/Config.in b/package/flann/Config.in index 180d7eae8a0a..8b32e9077c88 100644 --- a/package/flann/Config.in +++ b/package/flann/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FLANN bool "flann" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 select BR2_PACKAGE_LZ4 help FLANN is a library for performing fast approximate nearest @@ -22,5 +23,6 @@ config BR2_PACKAGE_FLANN_EXAMPLES endif -comment "flann needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "flann needs a toolchain w/ C++, dynamic library, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/flann/flann.mk b/package/flann/flann.mk index d1a622e68532..dc75b977afa6 100644 --- a/package/flann/flann.mk +++ b/package/flann/flann.mk @@ -18,7 +18,7 @@ FLANN_CONF_OPTS = \ -DUSE_OPENMP=$(if $(BR2_TOOLCHAIN_HAS_OPENMP),ON,OFF) \ -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=TRUE -FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) +FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11 ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) FLANN_CXXFLAGS += -O0 From a45f2af7fae09e4daee9d017b02e8744b357cf48 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Mar 2023 18:17:33 +0100 Subject: [PATCH 0167/2890] package/snmppp: fix build without SNMPV3 Fix the following build failure without BR2_PACKAGE_SNMPPP_SNMPV3 raised since bump to version 3.5.0 in commit e011fa0415883b9d44df616cfaf6956e1a11da88: msgqueue.cpp: In member function 'int Snmp_pp::CSNMPMessage::ResendMessage()': msgqueue.cpp:263:34: error: 'version3' was not declared in this scope; did you mean 'version1'? 263 | if (m_target->get_version() == version3) { | ^~~~~~~~ | version1 Fixes: - http://autobuild.buildroot.org/results/8ef3e4407a51c53c15e530606227338761dd905b Signed-off-by: Fabrice Fontaine Reviewed-by: Luca Ceresoli Tested-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- .../snmppp/0001-fix-build-without-v3.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/snmppp/0001-fix-build-without-v3.patch diff --git a/package/snmppp/0001-fix-build-without-v3.patch b/package/snmppp/0001-fix-build-without-v3.patch new file mode 100644 index 000000000000..4e81f7bfc157 --- /dev/null +++ b/package/snmppp/0001-fix-build-without-v3.patch @@ -0,0 +1,43 @@ +fix build without v3 + +Fix the following build failure without version3 raised since version +3.5.0: + +msgqueue.cpp: In member function 'int Snmp_pp::CSNMPMessage::ResendMessage()': +msgqueue.cpp:263:34: error: 'version3' was not declared in this scope; did you mean 'version1'? + 263 | if (m_target->get_version() == version3) { + | ^~~~~~~~ + | version1 + +Fixes: + - http://autobuild.buildroot.org/results/8ef3e4407a51c53c15e530606227338761dd905b + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to katz.agentpp.com@magenta.de] + +diff -Nura snmp++-3.5.0.orig/src/msgqueue.cpp snmp++-3.5.0/src/msgqueue.cpp +--- snmp++-3.5.0.orig/src/msgqueue.cpp 2023-03-20 10:49:30.629000853 +0100 ++++ snmp++-3.5.0/src/msgqueue.cpp 2023-03-20 10:51:36.880664304 +0100 +@@ -260,18 +260,20 @@ + m_target->set_retry(m_target->get_retry() - 1); + SetSendTime(); + int status; +- if (m_target->get_version() == version3) { + #ifdef _SNMPv3 ++ if (m_target->get_version() == version3) { + // delete entry in cache + if (m_snmp->get_mpv3()) + m_snmp->get_mpv3()->delete_from_cache(m_pdu.get_request_id()); +-#endif + status = m_snmp->snmp_engine(m_pdu, m_pdu.get_error_status(), m_pdu.get_error_index(), + *m_target, m_callBack, m_callData, m_socket, 0, this); + } + else { ++#endif + status = send_snmp_request(m_socket, m_rawPdu, m_rawPduLen, *m_address); ++#ifdef _SNMPv3 + } ++#endif + if (status != 0) + return SNMP_CLASS_TL_FAILED; + From a2ac1a951fc7581b980c5517594d511aa792a3e3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 6 Feb 2023 05:03:59 -0700 Subject: [PATCH 0168/2890] package/python-pyproject-hooks: new package There's a runtime dependency on tomli, but only for Python < 3.11. Therefore this is not applicable for us. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + .../python-pyproject-hooks.hash | 5 +++++ .../python-pyproject-hooks.mk | 14 ++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 package/python-pyproject-hooks/python-pyproject-hooks.hash create mode 100644 package/python-pyproject-hooks/python-pyproject-hooks.mk diff --git a/DEVELOPERS b/DEVELOPERS index 67c6004ddf2e..7c5880c8eefe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1415,6 +1415,7 @@ F: package/python-pycares/ F: package/python-pydyf/ F: package/python-pypa-build/ F: package/python-pyphen/ +F: package/python-pyproject-hooks/ F: package/python-rtoml/ F: package/python-selenium/ F: package/python-snappy/ diff --git a/package/python-pyproject-hooks/python-pyproject-hooks.hash b/package/python-pyproject-hooks/python-pyproject-hooks.hash new file mode 100644 index 000000000000..9fdcd3359684 --- /dev/null +++ b/package/python-pyproject-hooks/python-pyproject-hooks.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pyproject_hooks/json +md5 69b0b6de189bc04c3f9e304281765741 pyproject_hooks-1.0.0.tar.gz +sha256 f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5 pyproject_hooks-1.0.0.tar.gz +# Locally computed sha256 checksums +sha256 1b22b049b5267d6dfc23a67bf4a84d8ec04b9fdfb1a51d360e42b4342c8b4154 LICENSE diff --git a/package/python-pyproject-hooks/python-pyproject-hooks.mk b/package/python-pyproject-hooks/python-pyproject-hooks.mk new file mode 100644 index 000000000000..a42dbb0ab103 --- /dev/null +++ b/package/python-pyproject-hooks/python-pyproject-hooks.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyproject-hooks +# +################################################################################ + +PYTHON_PYPROJECT_HOOKS_VERSION = 1.0.0 +PYTHON_PYPROJECT_HOOKS_SOURCE = pyproject_hooks-$(PYTHON_PYPROJECT_HOOKS_VERSION).tar.gz +PYTHON_PYPROJECT_HOOKS_SITE = https://files.pythonhosted.org/packages/25/c1/374304b8407d3818f7025457b7366c8e07768377ce12edfe2aa58aa0f64c +PYTHON_PYPROJECT_HOOKS_SETUP_TYPE = flit-bootstrap +PYTHON_PYPROJECT_HOOKS_LICENSE = MIT +PYTHON_PYPROJECT_HOOKS_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) From 63463ee43f58637b4a70cb98743423a9d6906eac Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 6 Feb 2023 05:04:00 -0700 Subject: [PATCH 0169/2890] package/python-pypa-build: bump to version 0.10.0 Migrate to flit-bootstrap build backend. Remove no longer needed host-python-pep517 dependency. Add new host-python-pyproject-hooks dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pypa-build/python-pypa-build.hash | 4 ++-- package/python-pypa-build/python-pypa-build.mk | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pypa-build/python-pypa-build.hash b/package/python-pypa-build/python-pypa-build.hash index 4c02ee1dce21..9da56f9f685f 100644 --- a/package/python-pypa-build/python-pypa-build.hash +++ b/package/python-pypa-build/python-pypa-build.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/build/json -md5 f2dc1823b0eff7037e19be18e354b2f1 build-0.9.0.tar.gz -sha256 1a07724e891cbd898923145eb7752ee7653674c511378eb9c7691aab1612bc3c build-0.9.0.tar.gz +md5 742e7cd0a67455c1df90061b42088bd2 build-0.10.0.tar.gz +sha256 d5b71264afdb5951d6704482aac78de887c80691c52b88a9ad195983ca2c9269 build-0.10.0.tar.gz # Locally computed sha256 checksums sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk index adc124b07477..d7c03323b786 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -4,14 +4,14 @@ # ################################################################################ -PYTHON_PYPA_BUILD_VERSION = 0.9.0 +PYTHON_PYPA_BUILD_VERSION = 0.10.0 PYTHON_PYPA_BUILD_SOURCE = build-$(PYTHON_PYPA_BUILD_VERSION).tar.gz -PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/0f/61/aaf43fbb36cc4308be8ac8088f52db9622b0dbf1f0880c1016ae6aa03f46 +PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/de/1c/fb62f81952f0e74c3fbf411261d1adbdd2d615c89a24b42d0fe44eb4bcf3 PYTHON_PYPA_BUILD_LICENSE = MIT PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE -PYTHON_PYPA_BUILD_SETUP_TYPE = setuptools +PYTHON_PYPA_BUILD_SETUP_TYPE = flit-bootstrap HOST_PYTHON_PYPA_BUILD_DEPENDENCIES = \ host-python-packaging \ - host-python-pep517 + host-python-pyproject-hooks $(eval $(host-python-package)) From 52976c54f76758aeab53f4b7777299cd5c8a3150 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 29 Mar 2023 11:17:22 -0700 Subject: [PATCH 0170/2890] package/runc: security bump to version v1.1.5 This is the fifth patch release in the 1.1.z series of runc, which fixes three CVEs found in runc. CVE-2023-25809 is a vulnerability involving rootless containers where (under specific configurations), the container would have write access to the /sys/fs/cgroup/user.slice/... cgroup hierarchy. No other hierarchies on the host were affected. This vulnerability was discovered by Akihiro Suda. GHSA-m8cg-xc2p-r3fc CVE-2023-27561 was a regression which effectively re-introduced CVE-2019-19921. This bug was present from v1.0.0-rc95 to v1.1.4. This regression was discovered by Beuc. GHSA-vpvm-3wq2-2wvm CVE-2023-28642 is a variant of CVE-2023-27561 and was fixed by the same patch. This variant of the above vulnerability was reported by Lei Wang. GHSA-g2j6-57v7-gm8c In addition, the following other fixes are included in this release: - Fix the inability to use /dev/null when inside a container - Fix changing the ownership of host's /dev/null caused by fd redirection - Fix rare runc exec/enter unshare error on older kernels, including CentOS < 7.7 - nsexec: Check for errors in write_log() https://github.com/opencontainers/runc/releases/tag/v1.1.5 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 6c8fddd39787..eee2e34cbf7c 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4f02077432642eebd768fc857318ae7929290b3a3511eb1be338005e360cfa34 runc-1.1.4.tar.gz +sha256 76cbf30637cbb828794d72d32fb3fd6ff3139cd9743b8b44790fd110f43d96b2 runc-1.1.5.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index b60f1da2e713..9c6b5f9b37de 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.1.4 +RUNC_VERSION = 1.1.5 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE From cebd1389f4f22956516952eafb1183d1326907d3 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 29 Mar 2023 15:06:21 +0200 Subject: [PATCH 0171/2890] package/docker-engine: security bump version to v23.0.2 Fixes the following security issue: - CVE-2023-26054: (Buildkit): Credentials inlined to Git URLs could end up in provenance attestation https://github.com/moby/buildkit/security/advisories/GHSA-gc89-7gcr-jxqc In addition, a number of issues have been fixed. For the full list, see: https://github.com/moby/moby/releases/tag/v23.0.2 Signed-off-by: Stefan Agner [Peter: Mark as security bump] Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 99ab5e40035e..4b7c026eefd6 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c8e6c0ac5f0c772023e3430f80190e0f86644b6d94cac63118b03561385f7b56 docker-engine-23.0.1.tar.gz +sha256 4caca59c774445a5aad6114d89c97c88d9705f048704fecdd3f5712cb369dc39 docker-engine-23.0.2.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index c61aa491c201..a27625a38e30 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 23.0.1 +DOCKER_ENGINE_VERSION = 23.0.2 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 413a28940b46db5d84bc7430bc49df076cee01f9 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 29 Mar 2023 15:06:22 +0200 Subject: [PATCH 0172/2890] package/docker-cli: bump version to v23.0.2 This release contains some fixes and small improvements. For the full list see: https://github.com/moby/moby/releases/tag/v23.0.2 Signed-off-by: Stefan Agner Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 9b231f03b179..a8ee6c7a3422 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 37bc1c71a782fc10d35aa6708c1b3c90a71f3947c33665cb0de68df25dc14d94 docker-cli-23.0.1.tar.gz +sha256 bef4fc68b9f81ab2ae8bb2605e16a0965a3c4a82f0c0cf9d9f5d2cee8e95415d docker-cli-23.0.2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 38d903150c38..5473edf1efbe 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 23.0.1 +DOCKER_CLI_VERSION = 23.0.2 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From f12bf2e6a78f1b5ff203fc234be68e224ec49b0e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 5 Apr 2023 07:46:15 +0200 Subject: [PATCH 0173/2890] package/uclibc: security update to 1.0.43 Security fix for CVE-2022-29503 Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/uclibc/uclibc.hash | 4 ++-- package/uclibc/uclibc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 0122d08789e9..cdca75b113a9 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.42/uClibc-ng-1.0.42.tar.xz.sha256 -sha256 ec6dae44ce86558885e56bc3bef6bd4d082397114e6e1fc15795f71e804d7016 uClibc-ng-1.0.42.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.43/uClibc-ng-1.0.43.tar.xz.sha256 +sha256 8c1f550f14728a9c06ff1fb3e85069f7f10f4d684b03e163f4d9d41727124047 uClibc-ng-1.0.43.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 4c05d36ab342..80c9caf07f70 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.42 +UCLIBC_VERSION = 1.0.43 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ From 8bf66c5640c0fafd63dbacadeeb6ac3a9f4f26a9 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 5 Apr 2023 09:47:01 +0200 Subject: [PATCH 0174/2890] package/containerd: security bump to version 1.6.20 Various bugfixes and improvements. Noteable security fixes: - CVE-2023-25153: Fix OCI image importer memory exhaustion https://github.com/containerd/containerd/security/advisories/GHSA-259w-8hf6-59c2 - CVE-2023-25173: Fix supplementary groups not being set up properly https://github.com/containerd/containerd/security/advisories/GHSA-hmfx-3pcx-653p https://github.com/containerd/containerd/releases/tag/v1.6.20 Signed-off-by: Stefan Agner [Peter: add CVE references] Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 16474089d177..65a87f25fab2 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a containerd-1.6.16.tar.gz +sha256 819086ccdca44cfc5f108e226c7a9294d8fad3eb32031a621623da80dedbfb11 containerd-1.6.20.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 4a0d6ec38b49..bc1dd58611f4 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.16 +CONTAINERD_VERSION = 1.6.20 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From 238d49468751ad761b61e691a18aaf097c020c4a Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 5 Apr 2023 09:47:02 +0200 Subject: [PATCH 0175/2890] package/docker-engine: security bump version to v23.0.3 Fixed a number of issues that can cause Swarm encrypted overlay networks to fail to uphold their guarantees, addressing CVE-2023-28841, CVE-2023-28840, and CVE-2023-28842. https://github.com/moby/moby/releases/tag/v23.0.3 Signed-off-by: Stefan Agner Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 4b7c026eefd6..0dc974ce85f3 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4caca59c774445a5aad6114d89c97c88d9705f048704fecdd3f5712cb369dc39 docker-engine-23.0.2.tar.gz +sha256 2f74aef0eadf5bfe652b1822f1349fa0baf7412f83b856a9cfb9a8fbfd686880 docker-engine-23.0.3.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index a27625a38e30..c0f2c73b69bc 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 23.0.2 +DOCKER_ENGINE_VERSION = 23.0.3 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 0d8d348826aa59b8fb922d3e970fb769aeb0cdb7 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 5 Apr 2023 09:47:03 +0200 Subject: [PATCH 0176/2890] package/docker-cli: bump version to v23.0.3 This release contains some fixes and small improvements. For the full list see: https://github.com/moby/moby/releases/tag/v23.0.3 Signed-off-by: Stefan Agner Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index a8ee6c7a3422..891ccf4b4e75 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bef4fc68b9f81ab2ae8bb2605e16a0965a3c4a82f0c0cf9d9f5d2cee8e95415d docker-cli-23.0.2.tar.gz +sha256 7d67500372b560110e8200815f7111962ccec7d0eb3b743f80e262c38e2f7b82 docker-cli-23.0.3.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 5473edf1efbe..69c4f76ee69c 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 23.0.2 +DOCKER_CLI_VERSION = 23.0.3 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From 64fa94f72fc9e57642c85ae1bad399e7dfd213e1 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 2 Apr 2023 23:44:04 +0200 Subject: [PATCH 0177/2890] package/kexec: introduce BR2_PACKAGE_KEXEC_ARCH_SUPPORTS This makes it easier for other packages to add the arch dependency. Signed-off-by: Arnout Vandecappelle --- package/kexec/Config.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/kexec/Config.in b/package/kexec/Config.in index 90a7bc2672bd..54026284da5d 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -1,9 +1,14 @@ -config BR2_PACKAGE_KEXEC - bool "kexec" +config BR2_PACKAGE_KEXEC_ARCH_SUPPORTS + bool + default y depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x + +config BR2_PACKAGE_KEXEC + bool "kexec" + depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS help Kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with From 3d7557d80f5c9a2f1bf9889ef03566fa84b23f85 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Wed, 1 Feb 2023 21:48:46 +0100 Subject: [PATCH 0178/2890] package/kexec: add m68k support kexec supports m68k since commit 027413d822fd57dd39d2d2afab1484bc6b6b84f9 in v2.0.5 Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth [Arnout: - Split off in a separate commit. ] Signed-off-by: Arnout Vandecappelle --- package/kexec/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kexec/Config.in b/package/kexec/Config.in index 54026284da5d..836d740788bc 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_KEXEC_ARCH_SUPPORTS depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x + BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x || BR2_m68k config BR2_PACKAGE_KEXEC bool "kexec" From a2f554c1bda5b1af6a54cff90af774fa16965fb6 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Wed, 1 Feb 2023 21:48:46 +0100 Subject: [PATCH 0179/2890] package/petitboot: new package Although this is a "boot loader", it really is a tool that should be part of an image that acts as the bootloader. Thus, it is not in the bootloader menu. A UI is required and can be provided by ncurses, X11 or fbdev. Only ncurses is supported for now. The other two use libtwin which isn't part of Buildroot for now. Adapted from https://github.com/glevand/petitboot--buildroot Updated to work with m68k architecture rather than just PlayStation3 (focused on qemu-system-m68k virt machine) Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth [Arnout: - Add missing arch and toolchain dependencies. - Remove nonexistent BR2_PACKAGE_NCURSES_TARGET_* selects. - Swap kexec/kexec-lite priority. - Add hash for license file. - Use version without v for VERSION. - Remove unnecessary --localstatedir=/var. - Add --disable-busybox. - Remove --enable-debug. - Remove --with-ncursesw and explicit libraries. - Add explicit arguments for all configure options. - Always select busybox tftp. - Add optional dependency on dtc. - Move dtc-specific options under a single condition. - Minor cleanups (whitespace, comments, ...). ] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/petitboot/Config.in | 31 +++++++++++++++++ package/petitboot/petitboot.hash | 3 ++ package/petitboot/petitboot.mk | 60 ++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 package/petitboot/Config.in create mode 100644 package/petitboot/petitboot.hash create mode 100644 package/petitboot/petitboot.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7c5880c8eefe..c226259aec74 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1817,6 +1817,9 @@ F: package/aircrack-ng/ N: Laurent Charpentier F: package/open-lldp/ +N: Laurent Vivier +F: package/petitboot/ + N: Lee Jones F: boot/afboot-stm32/ diff --git a/package/Config.in b/package/Config.in index 0f8dab3e71eb..760dda6ac1d1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2684,6 +2684,7 @@ menu "System tools" source "package/openrc/Config.in" source "package/openvmtools/Config.in" source "package/pamtester/Config.in" + source "package/petitboot/Config.in" source "package/polkit/Config.in" source "package/powerpc-utils/Config.in" source "package/procps-ng/Config.in" diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in new file mode 100644 index 000000000000..0b4dc762bbd8 --- /dev/null +++ b/package/petitboot/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_PETITBOOT + bool "petitboot" + # kexec-lite arch depends is a subset of kexec arch depends + depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS + depends on BR2_USE_MMU # lvm2 + depends on BR2_USE_WCHAR # elfutils + depends on !BR2_STATIC_LIBS # elfutils, lvm2 + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, lvm2 + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_LVM2 # devmapper + select BR2_PACKAGE_NCURSES + # run-time dependency only + select BR2_PACKAGE_KEXEC if !BR2_PACKAGE_KEXEC_LITE + # run-time dependency only + select BR2_PACKAGE_POWERPC_UTILS if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + # run-time dependency only + select BR2_PACKAGE_NVME if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + help + Petitboot is a small kexec-based bootloader + + http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html + +comment "petitboot needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, udev /dev management" + depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ + BR2_TOOLCHAIN_HAS_THREADS || \ + !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) || \ + !BR2_PACKAGE_HAS_UDEV diff --git a/package/petitboot/petitboot.hash b/package/petitboot/petitboot.hash new file mode 100644 index 000000000000..bf7bf56a6751 --- /dev/null +++ b/package/petitboot/petitboot.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 b42ae4fb2a81e9cf68f727c3f54c6312788c654bd97628ec9ba61b19a68990e6 petitboot-v1.13.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk new file mode 100644 index 000000000000..a798e7ca614f --- /dev/null +++ b/package/petitboot/petitboot.mk @@ -0,0 +1,60 @@ +################################################################################ +# +# petitboot +# +################################################################################ + +PETITBOOT_VERSION = 1.13 +PETITBOOT_SOURCE = petitboot-v$(PETITBOOT_VERSION).tar.gz +PETITBOOT_SITE = https://github.com/open-power/petitboot/releases/download/v$(PETITBOOT_VERSION) +PETITBOOT_DEPENDENCIES = elfutils ncurses udev host-bison host-flex lvm2 +PETITBOOT_LICENSE = GPL-2.0 +PETITBOOT_LICENSE_FILES = COPYING + +PETITBOOT_CONF_OPTS = \ + --enable-crypt \ + --enable-platform-auto \ + --disable-mtd \ + --with-ncurses \ + --without-signed-boot \ + --without-twin-fbdev \ + --without-twin-x11 \ + $(if $(BR2_PACKAGE_BUSYBOX),--enable-busybox,--disable-busybox) \ + HOST_PROG_KEXEC=/usr/sbin/kexec \ + HOST_PROG_SHUTDOWN=/usr/sbin/kexec-restart + +# HPA and Busybox tftp are supported. HPA tftp is part of Buildroot's tftpd +# package. +ifeq ($(BR2_PACKAGE_TFTPD),y) +PETITBOOT_CONF_OPTS += --with-tftp=hpa +else ifeq ($(BR2_PACKAGE_BUSYBOX),y) +PETITBOOT_CONF_OPTS += --with-tftp=busybox +else +# This actually means "autodetect", there's no way to really disable. +PETITBOOT_CONF_OPTS += --without-tftp +endif + +ifeq ($(BR2_PACKAGE_DTC),y) +PETITBOOT_DEPENDENCIES += dtc +PETITBOOT_CONF_OPTS += --with-fdt +define PETITBOOT_POST_INSTALL_DTB + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/30-dtb-updates \ + $(TARGET_DIR)/etc/petitboot/boot.d/30-dtb-updates +endef +PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL_DTB +else +PETITBOOT_CONF_OPTS += --without-fdt +endif + +define PETITBOOT_POST_INSTALL + $(INSTALL) -D -m 0755 $(@D)/utils/bb-kexec-reboot \ + $(TARGET_DIR)/usr/libexec/petitboot/bb-kexec-reboot + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/01-create-default-dtb \ + $(TARGET_DIR)/etc/petitboot/boot.d/01-create-default-dtb + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ + $(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb +endef + +PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL + +$(eval $(autotools-package)) From 5b5b68df6011e654393d8750d860170422426f93 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 5 Apr 2023 12:21:12 +0200 Subject: [PATCH 0180/2890] configs/beaglebone: bump U-Boot version to 2023.04 Bump U-Boot to version 2023.04. Tested on beaglebone black. Signed-off-by: Dario Binacchi Signed-off-by: Peter Korsgaard --- configs/beaglebone_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index d0aa5ad8603f..c2d444c3ce6d 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -34,7 +34,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set From 13812ee16e5050fe13d86fea38f6142dcd585b53 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 5 Apr 2023 09:23:37 +0300 Subject: [PATCH 0181/2890] package/daemon: bump to version 0.8.2 Drop upstream patches. Update license to include mode licenses. Add license file hashes and update hashes of existing files for added licenses, as well as formatting and copyright date updates. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...aemon-fix-build-with-musl-libc-again.patch | 46 ------------------- .../0002-Fix-build-with-NDEBUG-defined.patch | 46 ------------------- package/daemon/daemon.hash | 8 ++-- package/daemon/daemon.mk | 6 +-- 4 files changed, 8 insertions(+), 98 deletions(-) delete mode 100644 package/daemon/0001-daemon-fix-build-with-musl-libc-again.patch delete mode 100644 package/daemon/0002-Fix-build-with-NDEBUG-defined.patch diff --git a/package/daemon/0001-daemon-fix-build-with-musl-libc-again.patch b/package/daemon/0001-daemon-fix-build-with-musl-libc-again.patch deleted file mode 100644 index 48d95f122fe7..000000000000 --- a/package/daemon/0001-daemon-fix-build-with-musl-libc-again.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b879e6886498fdd147287bffdf5867378c7f3299 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 24 Jun 2021 14:28:10 +0300 -Subject: [PATCH] daemon: fix build with musl libc (again) - -Commit 6b28c54dd95b3 added HAVE_SYS_TTYDEFAULTS_H to guard -sys/ttydefaults.h include. This breaks musl libc build because -HAVE_SYS_TTYDEFAULTS_H is not defined until config.h is included. - -Move sys/ttydefaults.h include below config.h - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/raforg/daemon/pull/4 - - daemon.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/daemon.c b/daemon.c -index 5c5ef2cb86df..f88a0d49bf84 100644 ---- a/daemon.c -+++ b/daemon.c -@@ -1011,9 +1011,6 @@ I - #ifdef _RESTORE_POSIX_SOURCE - #define _POSIX_SOURCE - #endif --#ifdef HAVE_SYS_TTYDEFAULTS_H /* For CEOF in musl libc (Linux only) */ --#include --#endif - #include - #include - #include -@@ -1037,6 +1034,10 @@ I - #include - #endif - -+#ifdef HAVE_SYS_TTYDEFAULTS_H /* For CEOF in musl libc (Linux only) */ -+#include -+#endif -+ - /* Configuration file entries */ - - typedef struct Config Config; --- -2.30.2 - diff --git a/package/daemon/0002-Fix-build-with-NDEBUG-defined.patch b/package/daemon/0002-Fix-build-with-NDEBUG-defined.patch deleted file mode 100644 index e99e9d8ed73d..000000000000 --- a/package/daemon/0002-Fix-build-with-NDEBUG-defined.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fc84d8d572ffcecb533fd6d6d025abea12ce027e Mon Sep 17 00:00:00 2001 -Message-Id: -From: Baruch Siach -Date: Thu, 3 Jun 2021 15:01:10 +0300 -Subject: [PATCH] Fix build with NDEBUG defined - -Build with NDEBUG fails because the debug() macro becomes empty. This -creates invalid syntax with the debug() call is the only statement in -the body of a 'for' loop. - -This fixes build failures like: - -daemon.c: In function 'show': -daemon.c:3607:2: error: expected expression before '}' token - } - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/raforg/daemon/pull/3 - - libslack/err.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libslack/err.h b/libslack/err.h -index 106bdb01e074..7acfbe46d60a 100644 ---- a/libslack/err.h -+++ b/libslack/err.h -@@ -40,10 +40,10 @@ - #undef check - - #ifdef NDEBUG --#define debug(args) --#define vdebug(args) --#define debugsys(args) --#define vdebugsys(args) -+#define debug(args) do {} while (0); -+#define vdebug(args) do {} while (0); -+#define debugsys(args) do {} while (0); -+#define vdebugsys(args) do {} while (0); - #define check(cond, mesg) (void_cast(0)) - #else - #define debug(args) debugf args; --- -2.30.2 - diff --git a/package/daemon/daemon.hash b/package/daemon/daemon.hash index c490f715487f..5ad7bf6ce2b5 100644 --- a/package/daemon/daemon.hash +++ b/package/daemon/daemon.hash @@ -1,5 +1,7 @@ # From http://www.libslack.org/daemon/ -sha256 74f12e6d4b3c85632489bd08431d3d997bc17264bf57b7202384f2e809cff596 daemon-0.8.tar.gz +sha256 b34b37543bba43bd086e59f4b754c8102380ae5c1728b987c890d5da4b4cf3ca daemon-0.8.2.tar.gz # Locally calculated -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE -sha256 91329bb9be4ae0b7800081fa054e9bb760c60005b26958c1fb8461bc66bcd998 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 35e31504fc0aec878e86900dde1d90a04404833c182f50d5678d873910bb11eb COPYING +sha256 5a93d5831e1297ab10fe643e1a631e83be392896da14ee2951285a79012df69d LICENSES/BSD-3-Clause.txt +sha256 aaf135472f81c5b4a0dca9367e5bb5e9750032b5bebe5442b36e4c0a47430df3 LICENSES/GPL-2.0-or-later.txt diff --git a/package/daemon/daemon.mk b/package/daemon/daemon.mk index 96a163e597e6..5e7e497ff133 100644 --- a/package/daemon/daemon.mk +++ b/package/daemon/daemon.mk @@ -4,10 +4,10 @@ # ################################################################################ -DAEMON_VERSION = 0.8 +DAEMON_VERSION = 0.8.2 DAEMON_SITE = http://libslack.org/daemon/download -DAEMON_LICENSE = GPL-2.0+ -DAEMON_LICENSE_FILES = LICENSE COPYING +DAEMON_LICENSE = GPL-2.0+, LGPL-2.0+, BSD-3-Clause +DAEMON_LICENSE_FILES = LICENSE COPYING LICENSES/BSD-3-Clause.txt LICENSES/GPL-2.0-or-later.txt define DAEMON_CONFIGURE_CMDS (cd $(@D); ./configure) From 8d9308a5a67d9a173888d790bec28115369e1a84 Mon Sep 17 00:00:00 2001 From: Peter Thompson Date: Tue, 4 Apr 2023 17:00:28 -0600 Subject: [PATCH 0182/2890] package/sdl2_ttf: bump version to 2.20.2 Signed-off-by: Peter Thompson Signed-off-by: Peter Korsgaard --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 3313b341f9e6..f43ec790fdde 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 78cdad51f3cc3ada6932b1bb6e914b33798ab970a1e817763f22ddbfd97d0c57 SDL2_ttf-2.20.1.tar.gz -sha256 28aabfed22b3cb0b7e23ef40385e4f66297c960082f029c96d073cc1d4e008d5 LICENSE.txt +sha256 9dc71ed93487521b107a2c4a9ca6bf43fb62f6bddd5c26b055e6b91418a22053 SDL2_ttf-2.20.2.tar.gz +sha256 1852c8549e3d154687197d46abababd3e8faae035f19991b2ca850fa3a43ad57 LICENSE.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index f859d097fff7..c2c4b660f82f 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.20.1 +SDL2_TTF_VERSION = 2.20.2 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib From 7e763381b7d7c9c7971775087adbae9b9b156223 Mon Sep 17 00:00:00 2001 From: Peter Thompson Date: Tue, 4 Apr 2023 17:00:29 -0600 Subject: [PATCH 0183/2890] package/sdl2_image: bump version to 2.6.3 Signed-off-by: Peter Thompson Signed-off-by: Peter Korsgaard --- package/sdl2_image/sdl2_image.hash | 6 +++--- package/sdl2_image/sdl2_image.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2_image/sdl2_image.hash b/package/sdl2_image/sdl2_image.hash index e1efa4debe6b..55b2661fc08e 100644 --- a/package/sdl2_image/sdl2_image.hash +++ b/package/sdl2_image/sdl2_image.hash @@ -1,3 +1,3 @@ -# Locally calculated after checking https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.6.2.tar.gz.sig -sha256 48355fb4d8d00bac639cd1c4f4a7661c4afef2c212af60b340e06b7059814777 SDL2_image-2.6.2.tar.gz -sha256 28aabfed22b3cb0b7e23ef40385e4f66297c960082f029c96d073cc1d4e008d5 LICENSE.txt +# Locally calculated +sha256 931c9be5bf1d7c8fae9b7dc157828b7eee874e23c7f24b44ba7eff6b4836312c SDL2_image-2.6.3.tar.gz +sha256 1852c8549e3d154687197d46abababd3e8faae035f19991b2ca850fa3a43ad57 LICENSE.txt diff --git a/package/sdl2_image/sdl2_image.mk b/package/sdl2_image/sdl2_image.mk index 953742de28ab..aaf379788cc4 100644 --- a/package/sdl2_image/sdl2_image.mk +++ b/package/sdl2_image/sdl2_image.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_IMAGE_VERSION = 2.6.2 +SDL2_IMAGE_VERSION = 2.6.3 SDL2_IMAGE_SOURCE = SDL2_image-$(SDL2_IMAGE_VERSION).tar.gz SDL2_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release SDL2_IMAGE_INSTALL_STAGING = YES From b7eaa9af7ba87f2eac1ec9d2f7116b4ecf4f78be Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 4 Apr 2023 12:08:07 -0700 Subject: [PATCH 0184/2890] package/go: security bump to version 1.19.8 go1.19.8 (released 2023-04-04) includes security fixes to the go/parser, html/template, mime/multipart, net/http, and net/textproto packages, as well as bug fixes to the compiler, the linker, the runtime, and the time package. Fixes security vulnerabilities: go/parser: infinite loop in parsing (CVE-2023-24537) html/template: backticks not treated as string delimiters (CVE-2023-24538) net/http, net/textproto: denial of service from excessive memory allocation (CVE-2023-24534) net/http, net/textproto, mime/multipart: denial of service from excessive resource consumption (CVE-2023-24536) https://go.dev/doc/devel/release#go1.19.8 https://github.com/golang/go/issues?q=milestone%3AGo1.19.8+label%3ACherryPickApproved Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 89e2fd952f01..5488ed9710e1 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 775bdf285ceaba940da8a2fe20122500efd7a0b65dbcee85247854a8d7402633 go1.19.7.src.tar.gz +sha256 1d7a67929dccafeaf8a29e55985bc2b789e0499cb1a17100039f084e3238da2f go1.19.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index a94603f26886..37554ddf864a 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.7 +GO_VERSION = 1.19.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From f89f3787a05d123a33f1a000c802fe42c96a487f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 2 Apr 2023 14:48:06 +0200 Subject: [PATCH 0185/2890] package/avrdude: bump to version 7.1 Switch to cmake-package (autotools removed) https://github.com/avrdudes/avrdude/blob/v7.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/avrdude/avrdude.hash | 2 +- package/avrdude/avrdude.mk | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index d53d4dd60ded..5910a568dbb2 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-6.4.tar.gz +sha256 016a5c95746fadc169cfb3009f6aa306ccdea2ff279fdb6fddcbe7526d84e5eb avrdude-7.1.tar.gz sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index accd92c1d5db..8ebe33b3726c 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,22 +4,19 @@ # ################################################################################ -AVRDUDE_VERSION = 6.4 +AVRDUDE_VERSION = 7.1 AVRDUDE_SITE = $(call github,avrdudes,avrdude,v$(AVRDUDE_VERSION)) AVRDUDE_LICENSE = GPL-2.0+ AVRDUDE_LICENSE_FILES = COPYING -# Sources coming from git, without generated configure and Makefile.in -# files. -AVRDUDE_AUTORECONF = YES -AVRDUDE_CONF_OPTS = --enable-linuxgpio +AVRDUDE_CONF_OPTS = -DHAVE_LINUXGPIO=ON AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ host-flex host-bison ifeq ($(BR2_PACKAGE_AVRDUDE_SPI),y) -AVRDUDE_CONF_OPTS += --enable-linuxspi +AVRDUDE_CONF_OPTS += -DHAVE_LINUXSPI=ON else -AVRDUDE_CONF_OPTS += --disable-linuxspi +AVRDUDE_CONF_OPTS += -DHAVE_LINUXSPI=OFF endif ifeq ($(BR2_PACKAGE_LIBFTDI1),y) @@ -40,4 +37,4 @@ endef AVRDUDE_POST_INSTALL_TARGET_HOOKS += AVRDUDE_REMOVE_BACKUP_FILE -$(eval $(autotools-package)) +$(eval $(cmake-package)) From 69ee42a26bb3d6965449ed7cd2b0854bbed095d7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 2 Apr 2023 14:37:35 +0200 Subject: [PATCH 0186/2890] package/ccid: bump to version 1.5.2 https://github.com/LudovicRousseau/CCID/releases/tag/1.5.1 https://github.com/LudovicRousseau/CCID/releases/tag/1.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ccid/ccid.hash | 2 +- package/ccid/ccid.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ccid/ccid.hash b/package/ccid/ccid.hash index d42d0778f17a..fcd8d10ed9eb 100644 --- a/package/ccid/ccid.hash +++ b/package/ccid/ccid.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 81549b3422469d503996d03a3aed2ef1375b359167f10d66be9e3844e729322e ccid-1.5.0.tar.bz2 +sha256 13934487e6f8b48f699a16d367cc7a1af7a3ca874de721ac6e9633beb86e7219 ccid-1.5.2.tar.bz2 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk index c05e28a5d274..0510b4c9ad27 100644 --- a/package/ccid/ccid.mk +++ b/package/ccid/ccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCID_VERSION = 1.5.0 +CCID_VERSION = 1.5.2 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2 CCID_SITE = https://ccid.apdu.fr/files CCID_LICENSE = LGPL-2.1+ From 835d7780310fa94a036c93e85ae26923356ad586 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 2 Apr 2023 14:33:48 +0200 Subject: [PATCH 0187/2890] package/irrlicht: bump to version 1.8.5 Drop second patch (not needed since https://sourceforge.net/p/irrlicht/code/5349/) https://irrlicht.sourceforge.io/forum/viewtopic.php?f=2&t=52775 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-LDFLAGS-and-remove-obsolete-X11R6-.patch} | 0 .../irrlicht/0002-remove-sys-sysctl.h.patch | 38 ------------------- package/irrlicht/irrlicht.hash | 8 ++-- package/irrlicht/irrlicht.mk | 2 +- 4 files changed, 5 insertions(+), 43 deletions(-) rename package/irrlicht/{0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch => 0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch} (100%) delete mode 100644 package/irrlicht/0002-remove-sys-sysctl.h.patch diff --git a/package/irrlicht/0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch b/package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch similarity index 100% rename from package/irrlicht/0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch rename to package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch diff --git a/package/irrlicht/0002-remove-sys-sysctl.h.patch b/package/irrlicht/0002-remove-sys-sysctl.h.patch deleted file mode 100644 index d9142a9a22e8..000000000000 --- a/package/irrlicht/0002-remove-sys-sysctl.h.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5382142d37730f6758753b758c91e257ffd5892c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 9 Apr 2017 22:20:19 +0200 -Subject: [PATCH] remove sys/sysctl.h - -With musl irrlicht doesn't build due to missing sys/sysctl.h - -fatal error: sys/sysctl.h: No such file or directory - -From [1] -"sysctl does not work, and NEVER worked. using it is bogus. -it was a bogus experimental syscall that was deprecated before -it was ever used (basically, a broken binary version of -/proc/sys, without any stability between kernel versions for -what the binary constants meant)." - -[1] https://devsonacid.wordpress.com/tag/musl/ - -Signed-off-by: Romain Naour ---- - source/Irrlicht/COSOperator.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp -index 0899d1d..ccf5ef5 100644 ---- a/source/Irrlicht/COSOperator.cpp -+++ b/source/Irrlicht/COSOperator.cpp -@@ -13,7 +13,6 @@ - #include - #ifndef _IRR_SOLARIS_PLATFORM_ - #include --#include - #endif - #endif - --- -2.9.3 - diff --git a/package/irrlicht/irrlicht.hash b/package/irrlicht/irrlicht.hash index e7cd3ec9184f..7f9bceb0c105 100644 --- a/package/irrlicht/irrlicht.hash +++ b/package/irrlicht/irrlicht.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/irrlicht/files/Irrlicht%20SDK/1.8/1.8.4 -md5 9401cfff801395010b0912211f3cbb4f irrlicht-1.8.4.zip -sha1 38bf0223fe868d243d6a39d0dc191c8df6e03b3b irrlicht-1.8.4.zip +# From https://sourceforge.net/projects/irrlicht/files/Irrlicht%20SDK/1.8/1.8.5 +md5 1fcf67c2906eb84b531af512de8481b1 irrlicht-1.8.5.zip +sha1 96908ebc379e0172261c240dc018416ce6a3e4e3 irrlicht-1.8.5.zip # Locally calculated -sha256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 irrlicht-1.8.4.zip +sha256 effb7beed3985099ce2315a959c639b4973aac8210f61e354475a84105944f3d irrlicht-1.8.5.zip sha256 cc86e0b830f9d48933feb198f2741a7d9bb7c34fe8a35302d8ce36b8e2ecb27b doc/aesGladman.txt sha256 e8a6b63336018eec09ac3a7cdfe5a80bda635641bc0397a77b8baa25bed03800 doc/bzip2-license.txt sha256 ca38f1ba4ab901111f6eee50009bd46dbd866e6beb98d592d843f7c162d73409 doc/irrlicht-license.txt diff --git a/package/irrlicht/irrlicht.mk b/package/irrlicht/irrlicht.mk index bd82815cdeac..c1da50a53c99 100644 --- a/package/irrlicht/irrlicht.mk +++ b/package/irrlicht/irrlicht.mk @@ -5,7 +5,7 @@ ################################################################################ IRRLICHT_VERSION_MAJOR = 1.8 -IRRLICHT_VERSION = $(IRRLICHT_VERSION_MAJOR).4 +IRRLICHT_VERSION = $(IRRLICHT_VERSION_MAJOR).5 IRRLICHT_SOURCE = irrlicht-$(IRRLICHT_VERSION).zip IRRLICHT_SITE = https://downloads.sourceforge.net/project/irrlicht/Irrlicht%20SDK/$(IRRLICHT_VERSION_MAJOR)/$(IRRLICHT_VERSION) IRRLICHT_INSTALL_STAGING = YES From 402e06a02f8a4c97c621eac827a56118423337f7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 2 Apr 2023 13:38:46 +0200 Subject: [PATCH 0188/2890] package/openpowerlink: bump to version 2.7.2 https://github.com/OpenAutomationTechnologies/openPOWERLINK_V2/blob/V2.7.2/revision.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openpowerlink/openpowerlink.hash | 8 ++++---- package/openpowerlink/openpowerlink.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openpowerlink/openpowerlink.hash b/package/openpowerlink/openpowerlink.hash index 2d8683f09c42..b6ae8edcd8e3 100644 --- a/package/openpowerlink/openpowerlink.hash +++ b/package/openpowerlink/openpowerlink.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.7.1/ -md5 04524d1b1f9946176dce0ccb0eecf537 openPOWERLINK_V2.7.1.tar.gz -sha1 4ee9c6e26bbc729fdbbb272155b093ffa0d9cefd openPOWERLINK_V2.7.1.tar.gz +# From https://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.7.2/ +md5 80a64b0a2c2dec1e7aff22a06000b3d6 openPOWERLINK_V2.7.2.tar.gz +sha1 09dcb5bd7cb9d59cb9e60230ae09c558996be25b openPOWERLINK_V2.7.2.tar.gz # sha256 locally computed -sha256 d0d65f4fb8f2ad209cf9575714f88f33168a1cf71e8f1801e1e1ac4df6a37ffd openPOWERLINK_V2.7.1.tar.gz +sha256 2cc660e0f8a939bd65c9f46176d18882dbe1017cbb2567b414a8a7c9af41a356 openPOWERLINK_V2.7.2.tar.gz sha256 348e31e9e5094104463d58d33abd31049fdf209afbc12ea7abb7fd4b4a147429 license.md diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk index 46dc3d10cdef..c8dbb66d052d 100644 --- a/package/openpowerlink/openpowerlink.mk +++ b/package/openpowerlink/openpowerlink.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENPOWERLINK_VERSION = 2.7.1 +OPENPOWERLINK_VERSION = 2.7.2 OPENPOWERLINK_SITE = https://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/V$(OPENPOWERLINK_VERSION) OPENPOWERLINK_SOURCE = openPOWERLINK_V$(OPENPOWERLINK_VERSION).tar.gz OPENPOWERLINK_LICENSE = BSD-2-Clause, GPL-2.0 From 6d80b5ddbf13eb2e2cd71bc3db72e15b562b0e0c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 2 Apr 2023 13:17:22 +0200 Subject: [PATCH 0189/2890] package/domoticz: bump to version 2023.1 Drop patch (already in version) https://github.com/domoticz/domoticz/blob/2023.1/History.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...e-EnOceanRawValue.h-include-stdarg.h.patch | 33 ------------------- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch diff --git a/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch b/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch deleted file mode 100644 index bc3e60023d5e..000000000000 --- a/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6296d7112089a0f3bfb3056f6d9637e13ce4ce83 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 18 Dec 2022 12:27:38 +0100 -Subject: [PATCH] hardware/EnOceanRawValue.h: include stdarg.h - -Include stdarg.h to avoid the following build failure on uclibc: - -In file included from /home/fabrice/buildroot/output/build/domoticz-2022.2/hardware/EnOceanRawValue.cpp:2: -/home/fabrice/buildroot/output/build/domoticz-2022.2/hardware/EnOceanRawValue.h:109:83: error: 'va_list' has not been declared - 109 | uint32_t SetRawValuesNb(uint8_t * data, T_DATAFIELD * OffsetDes, int NbParameter, va_list value); - | ^~~~~~~ - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/domoticz/domoticz/pull/5472] ---- - hardware/EnOceanRawValue.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hardware/EnOceanRawValue.h b/hardware/EnOceanRawValue.h -index 84f38d17a..df858f27d 100644 ---- a/hardware/EnOceanRawValue.h -+++ b/hardware/EnOceanRawValue.h -@@ -1,6 +1,7 @@ - #ifndef _SetGetRawValue - #define _SetGetRawValue - -+#include - #include - #include - #include --- -2.35.1 - diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index c43923880015..fccb4ea42015 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8f84098bb64bec12ff7aac5f1fb6b6230a88c5781c2b75bc89861caea73cbccf domoticz-2022.2.tar.gz +sha256 3144372d0847cb4d22a8c4b1362cd31885b37671adc682c3a8e9435762cde338 domoticz-2023.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 451021150b13..ed82131dd30d 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2022.2 +DOMOTICZ_VERSION = 2023.1 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt From c0e1ef258b56f4e2dfddc6744dff24a7a5840b64 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 27 Mar 2023 22:13:03 +0200 Subject: [PATCH 0190/2890] package/sqlite: bump to version 3.41.2 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 36f6907fbc42..a7b56cf25db8 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2c5dea207fa508d765af1ef620b637dcb06572afa6f01f0815bd5bbf864b33d9 sqlite-autoconf-3400100.tar.gz +sha256 e98c100dd1da4e30fa460761dab7c0b91a50b785e167f8c57acc46514fae9499 sqlite-autoconf-3410200.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 789eddfa0aa2..6c014266582c 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,10 +4,10 @@ # ################################################################################ -SQLITE_VERSION = 3.40.1 -SQLITE_TAR_VERSION = 3400100 +SQLITE_VERSION = 3.41.2 +SQLITE_TAR_VERSION = 3410200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz -SQLITE_SITE = https://www.sqlite.org/2022 +SQLITE_SITE = https://www.sqlite.org/2023 SQLITE_LICENSE = Public domain SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite From cbf89eb4e44fa3bd6bfdfe5284cbc8f2b39f34b7 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 27 Mar 2023 21:26:28 +0200 Subject: [PATCH 0191/2890] package/libfuse3: bump to version 3.14.1 Add local patch pending upstream[0] to fix build failure with uclibc. [0]: https://github.com/libfuse/libfuse/pull/753 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...ix-MS_LAZYTIME-not-defined-on-uclibc.patch | 48 +++++++++++++++++++ package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch diff --git a/package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch b/package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch new file mode 100644 index 000000000000..58f9747d77dd --- /dev/null +++ b/package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch @@ -0,0 +1,48 @@ +From 56038446952516da5d4cf09e1192824031082943 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 27 Mar 2023 21:08:57 +0200 +Subject: [PATCH] Fix MS_LAZYTIME not defined on uclibc + +[Upstream status: https://github.com/libfuse/libfuse/pull/753] +Signed-off-by: Giulio Benetti +--- + lib/mount.c | 5 +++++ + util/fusermount.c | 6 ++++++ + 2 files changed, 11 insertions(+) + +diff --git a/lib/mount.c b/lib/mount.c +index 1f1ee86..84e5c73 100644 +--- a/lib/mount.c ++++ b/lib/mount.c +@@ -27,6 +27,11 @@ + #include + #include + ++/* uclibc doesn't define MS_LAZYTIME */ ++#ifndef MS_LAZYTIME ++#define MS_LAZYTIME (1<<25) ++#endif ++ + #ifdef __NetBSD__ + #include + +diff --git a/util/fusermount.c b/util/fusermount.c +index 6e72f0d..82cc420 100644 +--- a/util/fusermount.c ++++ b/util/fusermount.c +@@ -25,6 +25,12 @@ + #include + #include + #include ++ ++/* uclibc doesn't define MS_LAZYTIME */ ++#ifndef MS_LAZYTIME ++#define MS_LAZYTIME (1<<25) ++#endif ++ + #include + #include + #include +-- +2.34.1 + diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index 2d78153c811d..df4df524d09d 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 b14f7d97abc11a5a70a37955021a7a1d8eb1d3dd5b6abec66af093eae3168c62 libfuse3-3.14.0.tar.gz +sha256 99688d68a753ee97eed51d536b216b8ae5d7fe0236c1a45d439357903bfd4d88 libfuse3-3.14.1.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index 8c306ba1875b..61523820ad95 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.14.0 +LIBFUSE3_VERSION = 3.14.1 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE From 00709af66ec7056ff76a6238f22985cfa0bcc3a6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 27 Mar 2023 22:13:11 +0200 Subject: [PATCH 0192/2890] package/squashfs: bump to version 4.6.1 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/squashfs/squashfs.hash | 2 +- package/squashfs/squashfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/squashfs/squashfs.hash b/package/squashfs/squashfs.hash index 13d5aed71f90..bc45b4ab5e65 100644 --- a/package/squashfs/squashfs.hash +++ b/package/squashfs/squashfs.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 277b6e7f75a4a57f72191295ae62766a10d627a4f5e5f19eadfbc861378deea7 squashfs-4.5.1.tar.gz +sha256 94201754b36121a9f022a190c75f718441df15402df32c2b520ca331a107511c squashfs-4.6.1.tar.gz # License files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 323908d94e67..082104b6d46f 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUASHFS_VERSION = 4.5.1 +SQUASHFS_VERSION = 4.6.1 SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION)) SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING From 97f8cc355b164ce023cd6a098051ce63c7a25f9a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 8 Apr 2023 20:45:59 +0200 Subject: [PATCH 0193/2890] package/matio: fix build failure due to gcc bug 99410 The matio package exhibits gcc bug 99410 when built for the Nios2 architecture with optimization enabled, which causes a build failure. As done for other packages in Buildroot work around this gcc bug by setting optimization to -O0 if BR2_TOOLCHAIN_HAS_GCC_BUG_99410=y. Fixes: http://autobuild.buildroot.net/results/971/9714160b80a0d1a01983d29af38a95049c07b4d3/ Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/matio/matio.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 5e09f4e6ceeb..2ba9c8f5689b 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -15,6 +15,14 @@ MATIO_INSTALL_STAGING = YES # va_copy() MATIO_CONF_ENV = ac_cv_va_copy=yes +MATIO_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99410),y) +MATIO_CFLAGS += -O0 +endif + +MATIO_CONF_ENV += CFLAGS="$(MATIO_CFLAGS)" + # mat73 require hdf5 (not available), extented-sparse take 2KB MATIO_CONF_OPTS = --disable-mat73 --enable-extended-sparse From 95b8e7245d018b1f12bec43a22071a0a9f81df68 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 28 Mar 2023 14:27:11 -0700 Subject: [PATCH 0194/2890] package/bluez5_utils: Fix builds with musl-libc Backport upstream commit ca6546fe521360fcf905bc115b893f322e706cb2 ("shared: define MAX_INPUT for musl") to fix builds with musl-libc. Fixes: - http://autobuild.buildroot.net/results/3fd24a604a29eff70e20f82690e3f058f04903f9/ - http://autobuild.buildroot.net/results/bd57f1813be699cd5ce2ae94f5f511a71fe10428/ - http://autobuild.buildroot.net/results/90d528cc18a367af2f68e1c0673d962fe399e1ac/ - http://autobuild.buildroot.net/results/552b700ee129e1c7f651de13f6766eae5325dcbc/ Signed-off-by: Florian Fainelli Signed-off-by: Arnout Vandecappelle --- .../bluez5_utils/0001-musl-max-input.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/bluez5_utils/0001-musl-max-input.patch diff --git a/package/bluez5_utils/0001-musl-max-input.patch b/package/bluez5_utils/0001-musl-max-input.patch new file mode 100644 index 000000000000..8612bac07fe7 --- /dev/null +++ b/package/bluez5_utils/0001-musl-max-input.patch @@ -0,0 +1,37 @@ +From ca6546fe521360fcf905bc115b893f322e706cb2 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 31 Jan 2023 05:52:58 +0000 +Subject: shared: define MAX_INPUT for musl + +musl systems don't have MAX_INPUT. Just define it to _POSIX_MAX_INPUT +which musl does have if it's not already defined. + +Note that on glibc, the values match anyway (as of glibc-2.36), and +indeed POSIX_MAX_INPUT has the same value on musl too. + +Bug: https://bugs.gentoo.org/888467 +Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=ca6546fe521360fcf905bc115b893f322e706cb2 +Signed-off-by: Florian Fainelli +--- + src/shared/util.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 2f0ae0e86..b466fb001 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -28,6 +28,11 @@ + #include + #endif + ++/* define MAX_INPUT for musl */ ++#ifndef MAX_INPUT ++#define MAX_INPUT _POSIX_MAX_INPUT ++#endif ++ + #include "src/shared/util.h" + + void *util_malloc(size_t size) +-- +cgit + From 924b163b1e4e1f82ea758a7e69a73f9e6b888e62 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 8 Apr 2023 15:47:13 +0200 Subject: [PATCH 0195/2890] configs/stm32f469_disco_sd_defconfig: explicitly set U-Boot version The version of U-Boot must be explicitly set because if you keep the default setting, the bootloader is continuously updated in buildroot with the risk of building a non-working image. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- configs/stm32f469_disco_sd_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index ea1361efc02c..dc00a47e1da2 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -18,6 +18,9 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f469-discovery" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From 40db6955dfdfc14629bb01d140f24f9ae608b2dd Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 8 Apr 2023 15:55:35 +0200 Subject: [PATCH 0196/2890] configs/beaglebone_defconfig: bump Linux version to 5.10.162-ti-r59 Tested on beaglebone black. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- configs/beaglebone_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index c2d444c3ce6d..3e7ad8d4027d 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.162-ti-r56)/linux-5.10.162-ti-r56.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.162-ti-r59)/linux-5.10.162-ti-r59.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" From be44dcf6957210b88fb2591817bd76eba14ee7b0 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 8 Apr 2023 07:24:34 +0200 Subject: [PATCH 0197/2890] package/libite: bump version to v2.5.3 Fixes, from https://github.com/troglobit/libite/releases/tag/v2.5.3 - rsync() does not copy single files correctly - copyfile() does not handle empty source files correctly (error) - copyfile() does not properly create destination dir Signed-off-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle --- package/libite/libite.hash | 2 +- package/libite/libite.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libite/libite.hash b/package/libite/libite.hash index 8b622d87a9a0..7dac198ab871 100644 --- a/package/libite/libite.hash +++ b/package/libite/libite.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 baa9bf9931427ef5e9ddfc5b72139981047a8d0d3c03a534d9716de38cf18bb5 libite-2.5.2.tar.xz +sha256 ca086adc7ebf0c2ebf2ed7a6787f9567fb802db8583576228dd5dd5ddfb7bb97 libite-2.5.3.tar.xz # Locally calculated sha256 20db0601195f708d68ff7907907b3cd3b25808efa8332e064b11f00c839a5d2f LICENSE diff --git a/package/libite/libite.mk b/package/libite/libite.mk index 66a8253c6293..1cef992e5332 100644 --- a/package/libite/libite.mk +++ b/package/libite/libite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBITE_VERSION = 2.5.2 +LIBITE_VERSION = 2.5.3 LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION) LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause From 0385719706433fa9aa560c775d46179b42c9080c Mon Sep 17 00:00:00 2001 From: Simon Rowe Date: Thu, 6 Apr 2023 10:54:12 +0000 Subject: [PATCH 0198/2890] package/mdadm: install udev rules mdadm contains various udev rules to manage RAID assembly and create symlinks, install them if udev (or equivalent) is enabled. Signed-off-by: Simon Rowe [Arnout: use MDADM_INSTALL_TARGET_OPTS for install-bin as well] Signed-off-by: Arnout Vandecappelle --- package/mdadm/mdadm.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 0a2eb4e5bd3e..c61937306af2 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -21,12 +21,15 @@ MDADM_BUILD_OPTS = \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 +MDADM_INSTALL_TARGET_OPTS = install-bin + ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) MDADM_BUILD_OPTS += USE_PTHREADS= endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) MDADM_DEPENDENCIES += udev +MDADM_INSTALL_TARGET_OPTS += install-udev else MDADM_CXFLAGS += -DNO_LIBUDEV endif @@ -36,7 +39,7 @@ define MDADM_BUILD_CMDS endef define MDADM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-bin + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) $(MDADM_INSTALL_TARGET_OPTS) endef $(eval $(generic-package)) From 298173e2be16c5f6f7f9392df9359b1524c4147e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 5 Apr 2023 16:26:53 -0600 Subject: [PATCH 0199/2890] package/{rust, rust-bin}: bump to version 1.68.2 Link to Rust 1.68.2 announcement: https://blog.rust-lang.org/2023/03/28/Rust-1.68.2.html Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 1b7d1538332a..4cb1f0c1cda0 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.68.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 79cb5c840e44d0e3623335e59c2849dd73e0048fc6f97f2d351e88b0bd85040a rust-1.68.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 650b7cd7a13e4739de39e7e89c534600cfb33afdc6d7774b87ed64e5b7cd17a3 rust-1.68.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 7d0aab2e137295af67b77146c2a95f90fe98ee7bd4966ad0c22d2e02681bdf99 rust-1.68.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 aa56fd4432f100a9af4b4376adc112555d2b29d4673602374ae04d961ba778be rust-1.68.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 ca4f14022c67caef7813e9a02875c49ab431d2b6657f83966011c6f6577a34e2 rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 6730365b822d588f7132d6416a94edd61767f49d31c8777448a734f03bff9375 rust-1.68.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 46e28305a69af20b7b6e8888a2b98656428d28e0906e71b4be1d0089f0f9032b rust-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f66202760b26b66169f8b923dbc72bdc7eb78dabe687d78397ce73de44165edd rust-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 bdf82d1046f16188b11afc19088057f2ad096101d995ac7edbbbd632af199b84 rust-1.68.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 183d53f7488095550788fe38eff80542d68e6bd92ee48442d2ce0bd60a7eceaf rust-1.68.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 caf2385d507d6ce3f3550bd41e5c2be95053564b76851fc5920b9770a1e6046f rust-std-1.68.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 90e19eb15fd5b1f206f33e6f50a00ab5785aa5600ae7ccf5787ca64aec63f85f rust-std-1.68.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 40714404769bfa989c2da9f24e28cdfb8395ec8993bbec1544e2bba6030d0d3f rust-std-1.68.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 f455a4c19db7a548571405a591c76b3087995f58f529010b2e6c3e4bcd6ce49b rust-std-1.68.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 9eab35245a3193b8242b5ed08b896c8deeb3197c013134783d7062fa992213d0 rust-std-1.68.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 c0e2c4f1ff860f6073870901cde9aee61eb39932cc59d7a320760874505da4f0 rust-std-1.68.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 d7f562e6f3071972fc54ab1c8e35bf9c464376c43b1039d6bcfc602a3a997302 rust-std-1.68.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 41a6db7397757390dd53e2806c244159d3b8755957fb5c464df31fa83e982e66 rust-std-1.68.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 07a41cdf9bf8e0a42018f550c0c535afd0b0bbe967f5de13adab965170903aca rust-std-1.68.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 a6baaf8a3409b2601134d0a7035b5f764472954b29a978543aba97e5413920c1 rust-std-1.68.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 f18851de6f979076b94d399a4e2d5553a9251444a7cb3d4dad59d568f177e084 rust-std-1.68.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 50897d7bcfbd3f30d4552fd87bed46e3886beab9963bbae90aca8cc7ef9fe2d4 rust-std-1.68.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 6cf446799b6cb659da932dd7c2ffcbd028b86f28db89771d7f4485e939ec9bc2 rust-std-1.68.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-i586-unknown-linux-musl.tar.xz.asc -sha256 7458325c76d82cffcde5cbecdacafe0d8f62d650ba711c0153bcca0d0d83bd0e rust-std-1.68.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 a6ea604be18d30e5c41e53bb41486d3bddc0c7289056895127d93ad6fb30691c rust-std-1.68.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-i686-unknown-linux-musl.tar.xz.asc -sha256 ceb9f340ec4b57e3d12885f7a35a9bbf510d3aa70311d5a656db1893650e2187 rust-std-1.68.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 1fdf0323e24442c990c8f59142225c3b0e1ab8c666d7aac34158dc26c6905004 rust-std-1.68.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips-unknown-linux-musl.tar.xz.asc -sha256 03b1cb375241aab01b36261193f47737ffc05038a5dfb34de879c8300c9c722b rust-std-1.68.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 1e3e1382aad0582e57bef856d35c79a69a0c9141dfa26a2642f053add57aaf0b rust-std-1.68.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 d69d196cc73ed629bc9bf7b76556463f3aca8318729b380fd4a23f1dbea2a0f5 rust-std-1.68.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 14aa5d7813239667fc111fb378243a888b3a2b0a1960a40ab7901476bb5a7abe rust-std-1.68.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 95bf115ca743f1379b1fbf052202c1dfc8ea1eb6dbf82e0ee8eafe77a9f60cca rust-std-1.68.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 c31ce8298655750e493c7065512e858cdd60457c3db855e154dc9f9d3140fe48 rust-std-1.68.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 3e0bd2a95b94848c887930d27821e9de4c1963b5d4d0b2fea28e06e80cdc422e rust-std-1.68.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 1047a97e42079562ec685e19af6fd817e860eaf847cd4b3f1486a949af810a7a rust-std-1.68.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 a446a6445fdb536e1ca1bfe4233b7bf0f808cee00c043cc1ae6e06f3e59d3f2a rust-std-1.68.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 d9561344d71ea49491f6e9ea9913c93824fbac6b51319d1559ab2a432ca01ba3 rust-std-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 aaf5f145be482ad21ab3af0552a5ad3e2968430e08dbf62011228532bc45237d rust-std-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 89398529b7cbeed722fcb263c45b94a46a37ce9a446036f5e5af6101acb520cf rust-std-1.68.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 244f488ffbac717768cc800b25d6142409160e2ec9e899748b696d9f1845bc2d rust-std-1.68.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 566f4e83e96e8e141d3444a09a014a3a69c786b3eef122389747eaaf4c1525b5 rust-std-1.68.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 5109c26489ad6f316b8f5b953805b83c21f21f3a72b443704029f11ebe539b8e rust-std-1.68.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.2-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.2-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 1731add9b04d0fcbd096b610a67e1b1ae5740ce1171dd904d944ff504a84bcc7 rust-1.68.2-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.2-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.2-i686-unknown-linux-gnu.tar.xz.asc +sha256 cade060a15c5064763cd67ebba418989cdbdfb1dc4b6fe8dd4310f187540f66a rust-1.68.2-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.2-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.2-mips-unknown-linux-gnu.tar.xz.asc +sha256 a453eca326c676d6b6deda8c444dfc30288d2ccf66bcbad3fafbbad2d4dc9506 rust-1.68.2-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.2-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.2-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 80694caccab8903456de2b09fce15458e2aaa6dac97e706051a7aaa2df069dd0 rust-1.68.2-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.2-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.2-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 1cda60a097c983a5da0564aac365b6edb59452ac8474dbb48575c34ddaa1f8d4 rust-1.68.2-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.2-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.2-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 8a0062a66a6deedddb47778e3092dddc32a934c3127999a1abde6ff2a39ae7f1 rust-1.68.2-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 5e305ddc26861daa1516e1eba53ac3372506351950dbf5ada492a7f2fc65cfe5 rust-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 198054527500cb57cc8cad5b24c56e8ab1df6b48ae85b7c41a6ddbf2e008eb00 rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.2-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.2-s390x-unknown-linux-gnu.tar.xz.asc +sha256 5039fde5d70691cecd21449b543967db6590ddfd2d4b3c2064924bb154866e72 rust-1.68.2-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 7f0f19d50f32a353ca78bc5d6d7c483efeced684e2c37ff847e4fd9699c7e063 rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 cbe60945af743804be6822704f986c812dd1fe1d167602aec5350a8f519f9861 rust-std-1.68.2-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-aarch64-unknown-linux-musl.tar.xz.asc +sha256 718c073d24f3627750049bb74420f90d1ac29843ca16933e11aa301a806a0b10 rust-std-1.68.2-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 59da96890b0a2881799b21a3f49e51f730d67b8dc09b87602dd599e8f980e247 rust-std-1.68.2-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 565730a2ba02357251f9805b5efe0423adf5411892e0d01cf441456234f81e70 rust-std-1.68.2-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 4ea9588934eec3d83bee2789f3a15b48aaea05fc8ec1bc175951ec1d0eb6ed22 rust-std-1.68.2-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-musleabi.tar.xz.asc +sha256 fd065db4269b5131c2f52638b8f30d0159109850c74c87bdf4c623dc0b32d5c2 rust-std-1.68.2-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 a7e19b68c44efe52df159f89f8b37790ca613adaa3f77937eb460747552d1e59 rust-std-1.68.2-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 74188e1a1f4f7418d946636b4280c03dc80933f6eedda75ece82b7034f32c6db rust-std-1.68.2-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 2b9b98eaf7d18049e4c8625a4cf3c2d610d905c9478a377c6cc3d48f8b31db32 rust-std-1.68.2-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 39009be69f01e30714c657a5f55475ce9f9c6a591cae85b5d7386944a8e87a80 rust-std-1.68.2-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 05bef3f9e66537d9f1271dd6b6bf2261ba1db52672223712a8eb9178d036ae53 rust-std-1.68.2-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 b9992ee3b16c7b3b2fcf15339ade26084936d6088f578f8b2fab9b0c5c5b085c rust-std-1.68.2-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-i586-unknown-linux-gnu.tar.xz.asc +sha256 07fc71adf63691ae5e103c57c295e665b6dfc096fe4bedfeb5e1d33c133bb9f4 rust-std-1.68.2-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-i586-unknown-linux-musl.tar.xz.asc +sha256 884c3b6cbe8d38bb15943917df8bc87470566014ec50200ed70094c12abbb6bd rust-std-1.68.2-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-i686-unknown-linux-gnu.tar.xz.asc +sha256 695d4469c131b9993c939db0ce73a3866ab8e69dd657ec3137f3d594857f7812 rust-std-1.68.2-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-i686-unknown-linux-musl.tar.xz.asc +sha256 216a647fb15ffce5271b82c2c016f01b3d69095ab4635d6a895f9b76b6c1c528 rust-std-1.68.2-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips-unknown-linux-gnu.tar.xz.asc +sha256 4ab007f223cf723f8f7adf26a6014f4f5aa444f88c19daccc5ac81ea30275c66 rust-std-1.68.2-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips-unknown-linux-musl.tar.xz.asc +sha256 0c77f06f410091371b7f6f4952d759fcc0365025213f925afe80e04ab4b53540 rust-std-1.68.2-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 b1b44819454c920980e66473112003212920136e4904113258566d130686de09 rust-std-1.68.2-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 af586b37cac123774addc78d8c4568f22d94cec622ca9de80631f33da2700a6e rust-std-1.68.2-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 24028147dd7733637cbfe58b7f7acc8e8131ebbb39969a6c3c61ce56203b4af3 rust-std-1.68.2-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 a6ae7b9b1710100f52d96dab59c6e7c46a4b057b8ea3d25b8ea2f792aee2f006 rust-std-1.68.2-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 c299d65b3594c309d092f6a0fe15c205ab489ffa50910fb8126e944a2727cbe5 rust-std-1.68.2-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mipsel-unknown-linux-musl.tar.xz.asc +sha256 a6bbd8949dc8514161de4e367c5255e8b83a3cf78c8426ffacbb6e8077d0e5e0 rust-std-1.68.2-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 e75bdc8a6e3f00285a37606240862cdad69a986c3e3d47d6af1376613281233a rust-std-1.68.2-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 354322352cd8b661b84f5e97729d5d7adb7df9cb9bfd43cac378271c40214d7f rust-std-1.68.2-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 e69c8c1b7b0df839b271a2c12985b1c56565a34f9b357631ed99fa9263f3d326 rust-std-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 8388ac7a5f924d5d6aa441ae97c33c1abf11fd9516f2b9853f7edc0c5d6c453b rust-std-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-s390x-unknown-linux-gnu.tar.xz.asc +sha256 7f909658496692a05dd241c15f79a02f80658d353013dace127fdc69dc5026b4 rust-std-1.68.2-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 787f5cbbcec4e75b9beba3804ea05e36b7cb9b164c291cf7ce8f775d05634d61 rust-std-1.68.2-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 c8a3eaf26b83f1926d86b4db99ca16cbbff8e746e4c63f25f4d75a02a34a3b16 rust-std-1.68.2-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.68.2-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-x86_64-unknown-linux-musl.tar.xz.asc +sha256 6c2a91e60f4be6538fdb0e4ff0344038f282c23808ca018f526ec586f4ba43ab rust-std-1.68.2-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index 9efca1dcbdc3..c5fdd9a862b1 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.68.0 +RUST_BIN_VERSION = 1.68.2 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index d717ccbfeffc..40ab7dedc636 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.68.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.68.0-src.tar.xz.asc -sha256 8651245e8708f11d0f65ba9fdb394c4b9300d603d318045664b371729da9eac4 rustc-1.68.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.68.2-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.68.2-src.tar.xz.asc +sha256 ce1a115f6aafa912b4622906a92b626354973afa9288e2c7750df4dcf3390fc0 rustc-1.68.2-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 51574c357401..27eb11f095d9 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.68.0 +RUST_VERSION = 1.68.2 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From 15a649fd2dc0f950f0237802223ddb3ebd752da9 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 5 Apr 2023 22:22:20 +0200 Subject: [PATCH 0200/2890] package/fluidsynth: bump to version 2.3.2 For change log since v2.3.1, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.2 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 3de41b168257..0f8f04d67680 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d734e4cf488be763cf123e5976f3154f0094815093eecdf71e0e9ae148431883 fluidsynth-2.3.1.tar.gz +sha256 cd610810f30566e28fb98c36501f00446a06fa6bae3dc562c8cd3868fe1c0fc7 fluidsynth-2.3.2.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index ad1ed7df1149..854ed000321f 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.1 +FLUIDSYNTH_VERSION = 2.3.2 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From c3c3fe141f028d06b32945f07cec7d2ecd60438c Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 5 Apr 2023 22:21:49 +0200 Subject: [PATCH 0201/2890] package/ima-evm-utils: bump version to 1.5 Project primary git repository moved to github. Signed-off-by: Petr Vorel Signed-off-by: Arnout Vandecappelle --- package/ima-evm-utils/ima-evm-utils.hash | 5 ++--- package/ima-evm-utils/ima-evm-utils.mk | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/ima-evm-utils/ima-evm-utils.hash b/package/ima-evm-utils/ima-evm-utils.hash index 56d830e54c7d..9777c7f2130d 100644 --- a/package/ima-evm-utils/ima-evm-utils.hash +++ b/package/ima-evm-utils/ima-evm-utils.hash @@ -1,4 +1,3 @@ -# sha1 from sourceforge, sha256 locally computed -sha1 f23d8a406759a469b0223b0bfb302ada4407a1d1 ima-evm-utils-1.4.tar.gz -sha256 fcf85b31d6292051b3679e5f17ffa7f89b6898957aad0f59aa4e9878884b27d1 ima-evm-utils-1.4.tar.gz +# https://github.com/mimizohar/ima-evm-utils/releases/download/v1.5/ima-evm-utils-1.5.tar.gz.sha256 +sha256 45f1caa3ad59ec59a1d6a74ea5df38c413488cd952ab62d98cf893c15e6f246d ima-evm-utils-1.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ima-evm-utils/ima-evm-utils.mk b/package/ima-evm-utils/ima-evm-utils.mk index 01984402ced9..b969b4709e4d 100644 --- a/package/ima-evm-utils/ima-evm-utils.mk +++ b/package/ima-evm-utils/ima-evm-utils.mk @@ -4,8 +4,8 @@ # ################################################################################ -IMA_EVM_UTILS_VERSION = 1.4 -IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils +IMA_EVM_UTILS_VERSION = 1.5 +IMA_EVM_UTILS_SITE = https://github.com/mimizohar/ima-evm-utils/releases/download/v$(IMA_EVM_UTILS_VERSION) IMA_EVM_UTILS_LICENSE = GPL-2.0 IMA_EVM_UTILS_LICENSE_FILES = COPYING IMA_EVM_UTILS_INSTALL_STAGING = YES From 853c1d053c96525ab401a51e140a479537bba3af Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Wed, 5 Apr 2023 22:04:44 +0200 Subject: [PATCH 0202/2890] package/libmodbus: bump to version 3.1.10 https://github.com/stephane/libmodbus/releases/tag/v3.1.10 Also update URL in Config.in to use https instead of http. Also remove --without-documentation configure option, which already didn't exist in 3.1.8. Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- package/libmodbus/Config.in | 2 +- package/libmodbus/libmodbus.hash | 2 +- package/libmodbus/libmodbus.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libmodbus/Config.in b/package/libmodbus/Config.in index 642b57cd8c36..2e93fa4beeda 100644 --- a/package/libmodbus/Config.in +++ b/package/libmodbus/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBMODBUS according to the Modbus protocol. This library is written in C and supports RTU (serial) and TCP (Ethernet) communications. - http://libmodbus.org + https://libmodbus.org diff --git a/package/libmodbus/libmodbus.hash b/package/libmodbus/libmodbus.hash index 83b0c3a012dc..a7b7e583a879 100644 --- a/package/libmodbus/libmodbus.hash +++ b/package/libmodbus/libmodbus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b122f2bc29f749702a22c0a760a7ca2182d541f5fa26bf25e3431f907b606f3c libmodbus-3.1.8.tar.gz +sha256 899be4e25ab7fe5799d43f9567510d6f063d2e8f56136dd726b6fd976f9b2253 libmodbus-3.1.10.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk index 2f8c1735da2a..2fffa1e0e9af 100644 --- a/package/libmodbus/libmodbus.mk +++ b/package/libmodbus/libmodbus.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBMODBUS_VERSION = 3.1.8 +LIBMODBUS_VERSION = 3.1.10 LIBMODBUS_SITE = https://github.com/stephane/libmodbus/releases/download/v$(LIBMODBUS_VERSION) LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER LIBMODBUS_CPE_ID_VENDOR = libmodbus LIBMODBUS_INSTALL_STAGING = YES -LIBMODBUS_CONF_OPTS = --without-documentation --disable-tests +LIBMODBUS_CONF_OPTS = --disable-tests $(eval $(autotools-package)) From 9e9d807a4730f5efe8cfe5e97a7e39cc7ee5f21b Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Wed, 5 Apr 2023 20:36:12 +0200 Subject: [PATCH 0203/2890] package/pangomm: bump to version 2.50.1 https://gitlab.gnome.org/GNOME/pangomm/-/blob/2.50.1/NEWS Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- package/pangomm/pangomm.hash | 4 ++-- package/pangomm/pangomm.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pangomm/pangomm.hash b/package/pangomm/pangomm.hash index 0fb40e6568f3..dc606c5de960 100644 --- a/package/pangomm/pangomm.hash +++ b/package/pangomm/pangomm.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/pangomm/2.48/pangomm-2.48.2.sha256sum -sha256 e1d75522c53f462799875cd247f9b49c91ced4b1abe68387ac35b271392d4ea5 pangomm-2.48.2.tar.xz +# From https://download.gnome.org/sources/pangomm/2.50/pangomm-2.50.1.sha256sum +sha256 ccc9923413e408c2bff637df663248327d72822f11e394b423e1c5652b7d9214 pangomm-2.50.1.tar.xz # Locally computed sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/pangomm/pangomm.mk b/package/pangomm/pangomm.mk index e5b237197bb0..64ac625b7ffa 100644 --- a/package/pangomm/pangomm.mk +++ b/package/pangomm/pangomm.mk @@ -4,8 +4,8 @@ # ################################################################################ -PANGOMM_VERSION_MAJOR = 2.48 -PANGOMM_VERSION = $(PANGOMM_VERSION_MAJOR).2 +PANGOMM_VERSION_MAJOR = 2.50 +PANGOMM_VERSION = $(PANGOMM_VERSION_MAJOR).1 PANGOMM_SOURCE = pangomm-$(PANGOMM_VERSION).tar.xz PANGOMM_SITE = https://download.gnome.org/sources/pangomm/$(PANGOMM_VERSION_MAJOR) PANGOMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) From 2df4bf8373fb826a49cce1bb9194459529f9f886 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 5 Apr 2023 11:33:16 +0200 Subject: [PATCH 0204/2890] configs/imx8mn_bsh_smm_s2_defconfig: bump U-Boot version to 2023.04 Bump U-Boot to version 2023.04 and remove the patch that has already been upstreamed. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- ...Remove-rootwait-1-to-all-the-affecte.patch | 160 ------------------ configs/imx8mn_bsh_smm_s2_defconfig | 3 +- 2 files changed, 1 insertion(+), 162 deletions(-) delete mode 100644 board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch diff --git a/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch b/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch deleted file mode 100644 index 59db559b9301..000000000000 --- a/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 3878b941c6bde84e29b2725e4261d85bea828752 Mon Sep 17 00:00:00 2001 -From: Michael Trimarchi -Date: Sun, 22 May 2022 15:22:08 +0200 -Subject: [PATCH] include/configs: Remove rootwait=1 to all the affected boards - -rootwait=1 is not a valid kernel boot parameters. According -to the documenation is only rootwait - -rootwait [KNL] Wait (indefinitely) for root device to show up. - Useful for devices that are detected asynchronously - (e.g. USB and MMC devices). - -Fix: -Unknown kernel command line parameters "rootwait=1", will be passed to user space. - -Signed-off-by: Michael Trimarchi -Reviewed-by: Heiko Schocher -Link: https://patchwork.ozlabs.org/project/uboot/patch/20220520110013.32811-1-michael@amarulasolutions.com/ -Signed-off-by: Dario Binacchi ---- - include/configs/am335x_evm.h | 2 +- - include/configs/am43xx_evm.h | 2 +- - include/configs/baltos.h | 2 +- - include/configs/chiliboard.h | 2 +- - include/configs/etamin.h | 2 +- - include/configs/imx8mn_bsh_smm_s2.h | 2 +- - include/configs/siemens-am33x-common.h | 4 ++-- - include/configs/ti_armv7_keystone2.h | 2 +- - include/environment/ti/nand.h | 2 +- - 9 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index fd5b209a52db..f301a6dc835b 100644 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -34,7 +34,7 @@ - "root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ - "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \ -- "nandrootfstype=ubifs rootwait=1\0" \ -+ "nandrootfstype=ubifs rootwait\0" \ - "nandboot=echo Booting from nand ...; " \ - "run nandargs; " \ - "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ -diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h -index 5057441f7506..1f5c3cd04e88 100644 ---- a/include/configs/am43xx_evm.h -+++ b/include/configs/am43xx_evm.h -@@ -166,7 +166,7 @@ - "root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ - "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,4096\0" \ -- "nandrootfstype=ubifs rootwait=1\0" \ -+ "nandrootfstype=ubifs rootwait\0" \ - "nandboot=echo Booting from nand ...; " \ - "run nandargs; " \ - "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ -diff --git a/include/configs/baltos.h b/include/configs/baltos.h -index b881d8c03fd7..7b43741fde7c 100644 ---- a/include/configs/baltos.h -+++ b/include/configs/baltos.h -@@ -37,7 +37,7 @@ - "root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ - "nandroot=ubi0:rootfs rw ubi.mtd=5\0" \ -- "nandrootfstype=ubifs rootwait=1\0" \ -+ "nandrootfstype=ubifs rootwait\0" \ - "nandboot=echo Booting from nand ...; " \ - "run nandargs; " \ - "setenv loadaddr 0x84000000; " \ -diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h -index 82acda595f09..8bad0f9ac4b6 100644 ---- a/include/configs/chiliboard.h -+++ b/include/configs/chiliboard.h -@@ -20,7 +20,7 @@ - "root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ - "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system\0" \ -- "nandrootfstype=ubifs rootwait=1\0" \ -+ "nandrootfstype=ubifs rootwait\0" \ - "nandboot=echo Booting from nand ...; " \ - "run nandargs; " \ - "nand read ${fdt_addr} NAND.u-boot-spl-os; " \ -diff --git a/include/configs/etamin.h b/include/configs/etamin.h -index 9cf93924df93..1c0a86d1ed10 100644 ---- a/include/configs/etamin.h -+++ b/include/configs/etamin.h -@@ -113,7 +113,7 @@ - "nand_active_ubi_vol=rootfs_a\0" \ - "rootfs_name=rootfs\0" \ - "kernel_name=uImage\0"\ -- "nand_root_fs_type=ubifs rootwait=1\0" \ -+ "nand_root_fs_type=ubifs rootwait\0" \ - "nand_args=run bootargs_defaults;" \ - "mtdparts default;" \ - "setenv ${partitionset_active} true;" \ -diff --git a/include/configs/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h -index d09c2ab01610..0dc514f00684 100644 ---- a/include/configs/imx8mn_bsh_smm_s2.h -+++ b/include/configs/imx8mn_bsh_smm_s2.h -@@ -22,7 +22,7 @@ - "root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ - "nandroot=ubi0:root rw ubi.mtd=nandrootfs\0" \ -- "nandrootfstype=ubifs rootwait=1\0" \ -+ "nandrootfstype=ubifs rootwait\0" \ - "nandboot=echo Booting from nand ...; " \ - "run nandargs; " \ - "nand read ${fdt_addr_r} nanddtb; " \ -diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h -index 08c4d52d658f..9f1a6cd51b40 100644 ---- a/include/configs/siemens-am33x-common.h -+++ b/include/configs/siemens-am33x-common.h -@@ -237,7 +237,7 @@ - "nand_active_ubi_vol=rootfs_a\0" \ - "nand_active_ubi_vol_A=rootfs_a\0" \ - "nand_active_ubi_vol_B=rootfs_b\0" \ -- "nand_root_fs_type=ubifs rootwait=1\0" \ -+ "nand_root_fs_type=ubifs rootwait\0" \ - "nand_src_addr=0x280000\0" \ - "nand_src_addr_A=0x280000\0" \ - "nand_src_addr_B=0x780000\0" \ -@@ -314,7 +314,7 @@ - "nand_active_ubi_vol=rootfs_a\0" \ - "rootfs_name=rootfs\0" \ - "kernel_name=uImage\0"\ -- "nand_root_fs_type=ubifs rootwait=1\0" \ -+ "nand_root_fs_type=ubifs rootwait\0" \ - "nand_args=run bootargs_defaults;" \ - "mtdparts default;" \ - "setenv ${partitionset_active} true;" \ -diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h -index 57f013cbf846..133daecf7164 100644 ---- a/include/configs/ti_armv7_keystone2.h -+++ b/include/configs/ti_armv7_keystone2.h -@@ -180,7 +180,7 @@ - "sf write ${loadaddr} 0 ${filesize}\0" \ - "burn_uboot_nand=nand erase 0 0x100000; " \ - "nand write ${loadaddr} 0 ${filesize}\0" \ -- "args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1 " \ -+ "args_all=setenv bootargs console=ttyS0,115200n8 rootwait " \ - KERNEL_MTD_PARTS \ - "args_net=setenv bootargs ${bootargs} rootfstype=nfs " \ - "root=/dev/nfs rw nfsroot=${serverip}:${nfs_root}," \ -diff --git a/include/environment/ti/nand.h b/include/environment/ti/nand.h -index 11dcefcc41ca..7d00afa2b10f 100644 ---- a/include/environment/ti/nand.h -+++ b/include/environment/ti/nand.h -@@ -14,7 +14,7 @@ - "root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ - "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \ -- "nandrootfstype=ubifs rootwait=1\0" \ -+ "nandrootfstype=ubifs rootwait\0" \ - "nandboot=echo Booting from nand ...; " \ - "run nandargs; " \ - "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ --- -2.32.0 - diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig index 9b8ac8bfe2da..8b2b74395efc 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -1,6 +1,5 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y -BR2_GLOBAL_PATCH_DIR="board/bsh/imx8mn-bsh-smm-s2/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2/post-build.sh" BR2_LINUX_KERNEL=y @@ -28,7 +27,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From 39b5d5eb13013ec013bfdde6f22afb8181356ffa Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 5 Apr 2023 11:33:17 +0200 Subject: [PATCH 0205/2890] configs/imx8mn_bsh_smm_s2_pro_defconfig: bump U-Boot version to 2023.04 Bump U-Boot to version 2023.04. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- configs/imx8mn_bsh_smm_s2_pro_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/imx8mn_bsh_smm_s2_pro_defconfig b/configs/imx8mn_bsh_smm_s2_pro_defconfig index ebef4e5932c1..e9ff244a3555 100644 --- a/configs/imx8mn_bsh_smm_s2_pro_defconfig +++ b/configs/imx8mn_bsh_smm_s2_pro_defconfig @@ -28,7 +28,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60 BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From d775b2ac05d473db490d2dc6babd2743b28cfbf5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 24 Jul 2022 15:47:43 -0600 Subject: [PATCH 0206/2890] package/pkg-cargo: set RUSTFLAGS for host in HOST_PKG_CARGO_ENV Move RUSTFLAGS for host builds to HOST_PKG_CARGO_ENV so that they are set for host cargo builds which don't use the cargo infrastructure, e.g. python packages that include rust code. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/pkg-cargo.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 666c5ac9718d..5600c8e97eb3 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -57,7 +57,8 @@ ifeq ($(NORMALIZED_ARCH),arm) endif HOST_PKG_CARGO_ENV = \ - $(PKG_COMMON_CARGO_ENV) + $(PKG_COMMON_CARGO_ENV) \ + RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" ################################################################################ # inner-cargo-package -- defines how the configuration, compilation and @@ -130,7 +131,6 @@ else # ifeq ($(4),target) define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ - RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ @@ -171,7 +171,6 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ - RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ From 29d6f319a0aed8ebad6bb3aef18b13479886aa54 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 31 Jul 2022 16:35:16 -0300 Subject: [PATCH 0207/2890] utils/check-package: check files in board/ When a SysV init script is inside package/ it doesn't need to be executable. However, when an init script is inside a fs_overlay, it *does* need to be executable. Therefore, skip the NotExecutable test for init scripts. We detect them based on the directory /etc/init.d Signed-off-by: Ricardo Martincoski [Arnout: update .checkpackageignore] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 91 +++++++++++++++++++++++++++++++ utils/check-package | 1 + utils/checkpackagelib/lib_sysv.py | 3 + utils/checkpackagelib/tool.py | 5 ++ 4 files changed, 100 insertions(+) diff --git a/.checkpackageignore b/.checkpackageignore index 4faa3a8b8f88..ae4356f500d2 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1,3 +1,94 @@ +board/aarch64-efi/post-image.sh Shellcheck +board/amarula/vyasa/post-build.sh Shellcheck +board/andes/ae350/post-build.sh Shellcheck +board/arcturus/aarch64-ucls1012a/post-build.sh Shellcheck +board/arcturus/aarch64-ucls1012a/post-image.sh Shellcheck +board/aspeed/common/post-image.sh Shellcheck +board/asus/tinker/post-build.sh Shellcheck +board/atmel/flasher.sh Shellcheck +board/beaglebone/post-build.sh Shellcheck +board/beagleboneai/post-build.sh Shellcheck +board/beaglev/post-build.sh Shellcheck +board/beelink/gs1/post-build.sh Shellcheck +board/boundarydevices/common/post-build.sh Shellcheck +board/boundarydevices/common/post-image.sh Shellcheck +board/broadcom/northstar/post-image.sh Shellcheck +board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh EmptyLastLine Shellcheck +board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh Shellcheck +board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh Shellcheck +board/bsh/imx8mn-bsh-smm-s2/flash.sh EmptyLastLine Shellcheck +board/bsh/imx8mn-bsh-smm-s2/post-build.sh Shellcheck +board/canaan/k210-soc/post-build.sh Shellcheck +board/canaan/k210-soc/rootfs_overlay/sbin/init Shellcheck +board/chromebook/elm/sign.sh Shellcheck +board/chromebook/mksd.sh Shellcheck +board/chromebook/snow/linux-4.15-dts-tpm.patch ApplyOrder +board/chromebook/snow/sign.sh Shellcheck +board/cubietech/cubieboard2/post-image.sh Shellcheck +board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck +board/freescale/common/imx/post-image.sh Shellcheck +board/freescale/common/mxs/post-image.sh Shellcheck +board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck +board/hardkernel/odroidc2/post-image.sh Shellcheck +board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables +board/hardkernel/odroidxu4/post-image.sh EmptyLastLine Shellcheck +board/intel/galileo/post-build.sh Shellcheck +board/intel/galileo/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables +board/kontron/bl-imx8mm/post-build.sh Shellcheck +board/kontron/pitx-imx8m/patches/uboot/2022.04/0001-tools-mkeficapsule-use-pkg-config-to-get-luuid-and-l.patch NumberedSubject +board/kontron/pitx-imx8m/post-build.sh Shellcheck +board/kontron/smarc-sal28/post-build.sh Shellcheck +board/lego/ev3/post-image.sh Shellcheck +board/lemaker/bananapro/post-build.sh Shellcheck +board/lemaker/bananapro/post-image.sh Shellcheck +board/mender/x86_64/post-image-efi.sh ConsecutiveEmptyLines +board/minnowboard/post-build.sh Shellcheck +board/nexbox/a95x/post-build.sh Shellcheck +board/nexbox/a95x/post-image.sh Shellcheck +board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch NumberedSubject +board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch NumberedSubject +board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch NumberedSubject +board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch NumberedSubject +board/olimex/a13_olinuxino/post-build.sh Shellcheck +board/olimex/a20_olinuxino/post-build.sh Shellcheck +board/olimex/a33_olinuxino/post-build.sh Shellcheck +board/olpc/post-build.sh Shellcheck +board/orangepi/common/post-build.sh Shellcheck +board/orangepi/orangepi-lite2/post-build.sh Shellcheck +board/orangepi/orangepi-one-plus/post-build.sh Shellcheck +board/pine64/rock64/post-build.sh Shellcheck +board/pine64/rockpro64/post-build.sh Shellcheck +board/qemu/aarch64-sbsa/assemble-flash-images Shellcheck +board/qemu/post-image.sh Shellcheck +board/qemu/x86/post-build.sh Shellcheck +board/qemu/x86_64/post-build.sh Shellcheck +board/radxa/rockpi-n8/post-build.sh Shellcheck +board/raspberrypi/post-build.sh Shellcheck +board/raspberrypi/post-image.sh Shellcheck +board/roseapplepi/post-build.sh Shellcheck +board/sifive/hifive-unleashed/post-build.sh Shellcheck +board/solidrun/clearfog/post-build.sh Shellcheck +board/solidrun/macchiatobin/post-build-mainline.sh Shellcheck +board/solidrun/macchiatobin/post-build.sh Shellcheck +board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh Shellcheck +board/stmicroelectronics/common/stm32mp157/post-image.sh Shellcheck +board/stmicroelectronics/stm32f429-disco/flash.sh Shellcheck +board/stmicroelectronics/stm32f469-disco/flash_sd.sh Shellcheck +board/stmicroelectronics/stm32f469-disco/flash_xip.sh Shellcheck +board/stmicroelectronics/stm32f469-disco/post-build.sh Shellcheck +board/synopsys/axs10x/post-build.sh Shellcheck +board/technologic/ts4900/post-image.sh Shellcheck +board/terasic/de10nano_cyclone5/barebox-env/boot/mmc Shellcheck +board/toradex/apalis-imx6/post-image.sh Shellcheck +board/udoo/common/post-build.sh Shellcheck +board/versal/post-build.sh Shellcheck +board/versal/post-image.sh Shellcheck TrailingSpace +board/zynq/post-build.sh Shellcheck +board/zynq/post-image.sh Shellcheck +board/zynqmp/kria/kv260/kv260.sh Shellcheck TrailingSpace +board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch ApplyOrder +board/zynqmp/post-build.sh Shellcheck +board/zynqmp/post-image.sh Shellcheck package/alsamixergui/0001-misc-fixes.patch Sob package/am33x-cm3/S93-am335x-pm-firmware-load Variables package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch Sob diff --git a/utils/check-package b/utils/check-package index 98a25bd0b2de..e3b7d8515f6c 100755 --- a/utils/check-package +++ b/utils/check-package @@ -107,6 +107,7 @@ CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") DO_CHECK_INTREE = re.compile(r"|".join([ r"Config.in", r"arch/", + r"board/", r"boot/", r"fs/", r"linux/", diff --git a/utils/checkpackagelib/lib_sysv.py b/utils/checkpackagelib/lib_sysv.py index 386d085afc5c..dc4afd71b805 100644 --- a/utils/checkpackagelib/lib_sysv.py +++ b/utils/checkpackagelib/lib_sysv.py @@ -21,6 +21,9 @@ def check_line(self, lineno, text): class NotExecutable(checkpackagelib.tool.NotExecutable): + def ignore(self): + return 'etc/init.d/' in self.filename + def hint(self): return ", just make sure you use '$(INSTALL) -D -m 0755' in the .mk file" diff --git a/utils/checkpackagelib/tool.py b/utils/checkpackagelib/tool.py index e719fdd4079c..632aaa9f9e1d 100644 --- a/utils/checkpackagelib/tool.py +++ b/utils/checkpackagelib/tool.py @@ -4,7 +4,12 @@ class NotExecutable(_Tool): + def ignore(self): + return False + def run(self): + if self.ignore(): + return if os.access(self.filename, os.X_OK): return ["{}:0: This file does not need to be executable{}".format(self.filename, self.hint())] From 60fdaf56fed83614ecdeab5e49de8087b78219cd Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 31 Jul 2022 16:35:17 -0300 Subject: [PATCH 0208/2890] utils/check-package: check files in support/ The .mk files inside both support/dependencies and support/misc are not package recipes, similar to package/pkg-*.mk. The check-package don't apply to them. Therefore ignore such files. In the test infra, some br2-externals are used as fixtures to provide (sometimes) failure cases, so ignore files in these directories. Files inside support/kconfig are files copied from linux upstream, so do not generate warnings for them. support/gnuconfig contains auto-generated config.{guess,sub} files, so do not generate shellcheck warnings for them. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 42 ++++++++++++++++++++++++++++++++++++++++++ utils/check-package | 6 ++++++ 2 files changed, 48 insertions(+) diff --git a/.checkpackageignore b/.checkpackageignore index ae4356f500d2..81ca4d8de9a3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -288,3 +288,45 @@ package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables package/xl2tp/xl2tpd TrailingSpace +support/dependencies/check-host-asciidoc.sh Shellcheck +support/dependencies/check-host-cmake.sh Shellcheck +support/dependencies/check-host-gzip.sh Shellcheck +support/dependencies/check-host-lzip.sh Shellcheck +support/dependencies/check-host-make.sh Shellcheck +support/dependencies/check-host-python3.sh Shellcheck +support/dependencies/check-host-tar.sh Shellcheck +support/dependencies/check-host-xzcat.sh Shellcheck +support/dependencies/dependencies.sh Shellcheck +support/download/bzr ConsecutiveEmptyLines Shellcheck +support/download/cargo-post-process Shellcheck +support/download/check-hash Shellcheck +support/download/cvs Shellcheck +support/download/dl-wrapper Shellcheck +support/download/file Shellcheck +support/download/git Shellcheck +support/download/go-post-process Shellcheck +support/download/hg Shellcheck +support/download/scp Shellcheck +support/download/sftp Shellcheck +support/download/svn Shellcheck +support/download/wget Shellcheck +support/gnuconfig/update Shellcheck +support/libtool/buildroot-libtool-v1.5.patch ApplyOrder Sob +support/libtool/buildroot-libtool-v2.2.patch ApplyOrder Sob +support/libtool/buildroot-libtool-v2.4.4.patch ApplyOrder +support/libtool/buildroot-libtool-v2.4.patch ApplyOrder Sob +support/misc/relocate-sdk.sh Shellcheck +support/scripts/apply-patches.sh Shellcheck +support/scripts/br2-external Shellcheck +support/scripts/check-bin-arch Shellcheck +support/scripts/check-host-rpath Shellcheck +support/scripts/expunge-gconv-modules Shellcheck +support/scripts/fix-configure-powerpc64.sh EmptyLastLine +support/scripts/fix-rpath Shellcheck +support/scripts/generate-gitlab-ci-yml Shellcheck +support/scripts/mkmakefile ConsecutiveEmptyLines Shellcheck +support/scripts/mkusers Shellcheck +support/scripts/setlocalversion Shellcheck +support/testing/tests/core/post-build.sh Shellcheck +support/testing/tests/package/test_opkg/post-build.sh Shellcheck +support/testing/tests/utils/test_get_developers/0001-package-binutils-change-.mk.patch NumberedSubject diff --git a/utils/check-package b/utils/check-package index e3b7d8515f6c..27070571c993 100755 --- a/utils/check-package +++ b/utils/check-package @@ -112,6 +112,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ r"fs/", r"linux/", r"package/", + r"support/", r"system/", r"toolchain/", r"utils/", @@ -121,6 +122,11 @@ DO_NOT_CHECK_INTREE = re.compile(r"|".join([ r"fs/common\.mk$", r"package/doc-asciidoc\.mk$", r"package/pkg-\S*\.mk$", + r"support/dependencies/[^/]+\.mk$", + r"support/gnuconfig/config\.", + r"support/kconfig/", + r"support/misc/[^/]+\.mk$", + r"support/testing/tests/.*br2-external/", r"toolchain/helpers\.mk$", r"toolchain/toolchain-external/pkg-toolchain-external\.mk$", ])) From 9df6503ed047acb37dae66fab2a1208f2b5ecb5e Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 31 Jul 2022 16:35:18 -0300 Subject: [PATCH 0209/2890] Makefile: merge check-flake8 into check-package Teach check-package to detect python files by type and check them using flake8. Do not use subprocess to call 'python3 -m flake8' in order to avoid too many spawned shells, which in its turn would slow down the check for multiple files. (make check-package takes twice the time using a shell for each flake8 call, when compared of importing the main application) Expand the runtime test and the unit tests for check-package. Remove check-flake8 from the makefile and also from the GitLab CI because the exact same checks become part of check-package. Suggested-by: Arnout Vandecappelle Signed-off-by: Ricardo Martincoski [Arnout: add a comment to x-python to explain its purpose] Signed-off-by: Arnout Vandecappelle --- Makefile | 9 +----- support/misc/gitlab-ci.yml.in | 4 --- support/scripts/generate-gitlab-ci-yml | 2 +- .../tests/utils/br2-external/utils/x-python | 3 ++ .../testing/tests/utils/test_check_package.py | 17 +++++++++++ utils/check-package | 3 ++ utils/checkpackagelib/lib_python.py | 1 + utils/checkpackagelib/test_tool.py | 28 +++++++++++++++++++ utils/checkpackagelib/tool.py | 15 ++++++++++ 9 files changed, 69 insertions(+), 13 deletions(-) create mode 100644 support/testing/tests/utils/br2-external/utils/x-python create mode 100644 utils/checkpackagelib/lib_python.py diff --git a/Makefile b/Makefile index 3498f7226b52..95959daab229 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ endif noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \ defconfig %_defconfig allyesconfig allnoconfig alldefconfig syncconfig release \ randpackageconfig allyespackageconfig allnopackageconfig \ - print-version olddefconfig distclean manual manual-% check-package check-flake8 + print-version olddefconfig distclean manual manual-% check-package # Some global targets do not trigger a build, but are used to collect # metadata, or do various checks. When such targets are triggered, @@ -1249,13 +1249,6 @@ release: print-version: @echo $(BR2_VERSION_FULL) -check-flake8: - $(Q)git ls-tree -r --name-only HEAD \ - | xargs file \ - | grep 'Python script' \ - | cut -d':' -f1 \ - | xargs -- python3 -m flake8 --statistics - check-package: $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` \ --ignore-list=$(TOPDIR)/.checkpackageignore diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 38aca31fb5de..cbb6e555ce3f 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -13,10 +13,6 @@ before_script: script: - utils/get-developers -v -.check-flake8_base: - script: - - make check-flake8 - .check-package_base: script: - make check-package diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index e2fb2228b33e..ea4340f47ca2 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -26,7 +26,7 @@ gen_tests() { local do_basics do_defconfigs do_runtime do_testpkg local defconfigs_ext cfg tst - basics=( check-package check-symbol DEVELOPERS flake8 package symbol ) + basics=( check-package check-symbol DEVELOPERS package symbol ) defconfigs=( $(cd configs; LC_ALL=C ls -1 *_defconfig) ) diff --git a/support/testing/tests/utils/br2-external/utils/x-python b/support/testing/tests/utils/br2-external/utils/x-python new file mode 100644 index 000000000000..da7c36c7e0ac --- /dev/null +++ b/support/testing/tests/utils/br2-external/utils/x-python @@ -0,0 +1,3 @@ +#!/usr/bin/env python3 +# Trigger flake8 warning "W391 blank line at end of file" + diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index d2c155684586..87382e07b0b5 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -250,3 +250,20 @@ def test_run(self): self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(abs_file), w) + + # python scripts are tested using flake8 + rel_file = "utils/x-python" + abs_path = infra.filepath("tests/utils/br2-external") + abs_file = os.path.join(abs_path, rel_file) + + w, m = call_script(["check-package", "-vvv", "-b", rel_file], + self.WITH_UTILS_IN_PATH, abs_path) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'flake8' and fix the warnings".format(rel_file), w) + + w, m = call_script(["check-package", "-b", abs_file], + self.WITH_UTILS_IN_PATH, infra.basepath()) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'flake8' and fix the warnings".format(abs_file), w) diff --git a/utils/check-package b/utils/check-package index 27070571c993..758d51ba8be4 100755 --- a/utils/check-package +++ b/utils/check-package @@ -14,6 +14,7 @@ import checkpackagelib.lib_config import checkpackagelib.lib_hash import checkpackagelib.lib_mk import checkpackagelib.lib_patch +import checkpackagelib.lib_python import checkpackagelib.lib_shellscript import checkpackagelib.lib_sysv @@ -100,6 +101,8 @@ def get_lib_from_filetype(fname): filetype = get_filetype(fname) if filetype == "text/x-shellscript": return checkpackagelib.lib_shellscript + if filetype in ["text/x-python", "text/x-script.python"]: + return checkpackagelib.lib_python return None diff --git a/utils/checkpackagelib/lib_python.py b/utils/checkpackagelib/lib_python.py new file mode 100644 index 000000000000..f8c17ddc1097 --- /dev/null +++ b/utils/checkpackagelib/lib_python.py @@ -0,0 +1 @@ +from checkpackagelib.tool import Flake8 # noqa: F401 diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py index a0bf88001dec..cfa826f57c45 100644 --- a/utils/checkpackagelib/test_tool.py +++ b/utils/checkpackagelib/test_tool.py @@ -66,6 +66,34 @@ def hint(self): assert warnings == expected +Flake8 = [ + ('empty', + 'empty.py', + '', + []), + ('W391', + 'blank-line.py', + '\n', + ["dir/blank-line.py:0: run 'flake8' and fix the warnings", + "dir/blank-line.py:1:1: W391 blank line at end of file"]), + ('more than one warning', + 'file', + 'import os\n' + 'import re\n' + '\n', + ["dir/file:0: run 'flake8' and fix the warnings", + "dir/file:1:1: F401 'os' imported but unused\n" + "dir/file:2:1: F401 're' imported but unused\n" + 'dir/file:3:1: W391 blank line at end of file']), + ] + + +@pytest.mark.parametrize('testname,filename,string,expected', Flake8) +def test_Flake8(testname, filename, string, expected): + warnings = check_file(m.Flake8, filename, string) + assert warnings == expected + + Shellcheck = [ ('missing shebang', 'empty.sh', diff --git a/utils/checkpackagelib/tool.py b/utils/checkpackagelib/tool.py index 632aaa9f9e1d..907ada704fe4 100644 --- a/utils/checkpackagelib/tool.py +++ b/utils/checkpackagelib/tool.py @@ -1,5 +1,7 @@ +import flake8.main.application import os import subprocess +import tempfile from checkpackagelib.base import _Tool @@ -14,6 +16,19 @@ def run(self): return ["{}:0: This file does not need to be executable{}".format(self.filename, self.hint())] +class Flake8(_Tool): + def run(self): + with tempfile.NamedTemporaryFile() as output: + app = flake8.main.application.Application() + app.run(['--output-file={}'.format(output.name), self.filename]) + stdout = output.readlines() + processed_output = [str(line.decode().rstrip()) for line in stdout if line] + if len(stdout) == 0: + return + return ["{}:0: run 'flake8' and fix the warnings".format(self.filename), + '\n'.join(processed_output)] + + class Shellcheck(_Tool): def run(self): cmd = ['shellcheck', self.filename] From 47910ccc361934ab4b3fbcfe05530f38de07844f Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 9 Apr 2023 22:55:09 +0200 Subject: [PATCH 0210/2890] package/efivar: don't install in $(HOST_DIR)/usr For years already, $(HOST_DIR)/usr is deprecated. Install directly in $(HOST_DIR). This will trigger a check-package error in the following commit. Signed-off-by: Arnout Vandecappelle --- package/efivar/efivar.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index 8b1d338bece3..ee6d7302df4e 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -39,7 +39,7 @@ define EFIVAR_BUILD_CMDS endef define HOST_EFIVAR_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/makeguids $(HOST_DIR)/usr/bin/makeguids + $(INSTALL) -D -m 0755 $(@D)/src/makeguids $(HOST_DIR)/bin/makeguids endef define EFIVAR_INSTALL_STAGING_CMDS From 29a0dd4a3006c06d4b8d82821bd74b8b9f26715a Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 31 Jul 2022 16:35:20 -0300 Subject: [PATCH 0211/2890] utils/checkpackagelib: warn about $(HOST_DIR)/usr It's been ages (5 years at the next release) that we've not installed host packages in $(HOST_DIR)/usr, but we still have a few packages that reference it or install things in there. See [1] Add a new check_function that warns when a file is added installing to or referencing $(HOST_DIR)/usr . [1] "d9ff62c4cd pacakge: drop remnants of $(HOST_DIR)/usr" Cc: Yann E. MORIN Signed-off-by: Ricardo Martincoski [Arnout: exclude skeleton.mk with disable comment instead of explicit code] Signed-off-by: Arnout Vandecappelle --- package/skeleton/skeleton.mk | 1 + utils/checkpackagelib/lib_mk.py | 10 ++++++++++ utils/checkpackagelib/test_lib_mk.py | 23 +++++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index 9d97f02f08bf..634c76e437c7 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -14,6 +14,7 @@ SKELETON_ADD_SKELETON_DEPENDENCY = NO # We create a compatibility symlink in case a post-build script still # uses $(HOST_DIR)/usr define HOST_SKELETON_INSTALL_CMDS +# check-package DoNotInstallToHostdirUsr $(Q)ln -snf . $(HOST_DIR)/usr $(Q)mkdir -p $(HOST_DIR)/lib $(Q)mkdir -p $(HOST_DIR)/include diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 8adf844e9a1c..d340882971f1 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -21,6 +21,16 @@ end_conditional = ["endif"] +class DoNotInstallToHostdirUsr(_CheckFunction): + INSTALL_TO_HOSTDIR_USR = re.compile(r"^[^#].*\$\(HOST_DIR\)/usr") + + def check_line(self, lineno, text): + if self.INSTALL_TO_HOSTDIR_USR.match(text.rstrip()): + return ["{}:{}: install files to $(HOST_DIR)/ instead of $(HOST_DIR)/usr/" + .format(self.filename, lineno), + text] + + class Ifdef(_CheckFunction): IFDEF = re.compile(r"^\s*(else\s+|)(ifdef|ifndef)\s") diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 80a1736b4e66..2086237ebb1b 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -3,6 +3,29 @@ import checkpackagelib.lib_mk as m +DoNotInstallToHostdirUsr = [ + ('real case', + 'libapparmor.mk', + 'LIBAPPARMOR_CONF_OPTS += \\\n' + '\t--with-python \\\n' + '\tPYTHON=$(HOST_DIR)/usr/bin/python3 \\\n' + '\tPYTHON_CONFIG=$(STAGING_DIR)/usr/bin/python3-config \\\n' + '\tSWIG=$(SWIG)\n', + [['libapparmor.mk:3: install files to $(HOST_DIR)/ instead of $(HOST_DIR)/usr/', + '\tPYTHON=$(HOST_DIR)/usr/bin/python3 \\\n']]), + ('ignore comment', + 'any', + '# following code do not install to $(HOST_DIR)/usr/\n', + []), + ] + + +@pytest.mark.parametrize('testname,filename,string,expected', DoNotInstallToHostdirUsr) +def test_DoNotInstallToHostdirUsr(testname, filename, string, expected): + warnings = util.check_file(m.DoNotInstallToHostdirUsr, filename, string) + assert warnings == expected + + Ifdef = [ ('ignore commented line', 'any', From 19c4b1b069e08e8195cccfae2d3b558fbc98eaf2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 3 Apr 2023 16:00:14 -0600 Subject: [PATCH 0212/2890] package/python-pep517: drop package This package is no longer used as python-pypa-build now uses python-pyproject-hooks instead. In fact, pyproject-hooks is simply the new name of pep517 [1]. [1] https://github.com/pypa/pyproject-hooks/issues/136 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 - package/python-pep517/python-pep517.hash | 5 ----- package/python-pep517/python-pep517.mk | 14 -------------- 3 files changed, 20 deletions(-) delete mode 100644 package/python-pep517/python-pep517.hash delete mode 100644 package/python-pep517/python-pep517.mk diff --git a/DEVELOPERS b/DEVELOPERS index c226259aec74..5cd882b5791c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1410,7 +1410,6 @@ F: package/python-multidict/ F: package/python-mypy-extensions/ F: package/python-outcome/ F: package/python-pathspec/ -F: package/python-pep517/ F: package/python-pycares/ F: package/python-pydyf/ F: package/python-pypa-build/ diff --git a/package/python-pep517/python-pep517.hash b/package/python-pep517/python-pep517.hash deleted file mode 100644 index 6535e516567e..000000000000 --- a/package/python-pep517/python-pep517.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/pep517/json -md5 7fd08b11215256601a8a4940c1ba3d34 pep517-0.13.0.tar.gz -sha256 ae69927c5c172be1add9203726d4b84cf3ebad1edcd5f71fcdc746e66e829f59 pep517-0.13.0.tar.gz -# Locally computed sha256 checksums -sha256 1b22b049b5267d6dfc23a67bf4a84d8ec04b9fdfb1a51d360e42b4342c8b4154 LICENSE diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk deleted file mode 100644 index c43b09faaa8a..000000000000 --- a/package/python-pep517/python-pep517.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pep517 -# -################################################################################ - -PYTHON_PEP517_VERSION = 0.13.0 -PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz -PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/4d/19/e11fcc88288f68ae48e3aa9cf5a6fd092a88e629cb723465666c44d487a0 -PYTHON_PEP517_LICENSE = MIT -PYTHON_PEP517_LICENSE_FILES = LICENSE -PYTHON_PEP517_SETUP_TYPE = flit-bootstrap - -$(eval $(host-python-package)) From abff5246a78e0adaf6c75b722a85fed891c3f8b1 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Mon, 10 Apr 2023 15:34:00 +0200 Subject: [PATCH 0213/2890] .checkpackageignore: update properly When we updated .checkpackageignore in commit 29d6f319a, this was done using a different version of shellcheck, that apparently detects some additional issues. Thus, board/terasic/de10nano_cyclone5/barebox-env/boot/mmc was detected as containing shellcheck errors. However this doesn't happen with the version in CI, leading to "Shellcheck was expected to fail" errors. Re-generate .checkpackageignore under docker-run, like it should have been done to begin with. Fixes: 29d6f319a0aed8ebad6bb3aef18b13479886aa54 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4084485150 Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index 81ca4d8de9a3..37214d64241b 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -78,7 +78,6 @@ board/stmicroelectronics/stm32f469-disco/flash_xip.sh Shellcheck board/stmicroelectronics/stm32f469-disco/post-build.sh Shellcheck board/synopsys/axs10x/post-build.sh Shellcheck board/technologic/ts4900/post-image.sh Shellcheck -board/terasic/de10nano_cyclone5/barebox-env/boot/mmc Shellcheck board/toradex/apalis-imx6/post-image.sh Shellcheck board/udoo/common/post-build.sh Shellcheck board/versal/post-build.sh Shellcheck From 2e330dff6a7ce7965ceb0dccdc9dcbcb329167bb Mon Sep 17 00:00:00 2001 From: Maksim Kiselev Date: Mon, 10 Apr 2023 11:40:18 +0300 Subject: [PATCH 0214/2890] sunxi-tools: bump to version 1.4.2-168-ged3039c This patch bumps version of the sunxi-tools to latest commit on master branch. There are no new tags\releases since 2016 so let's use commit hash as version. New version brings support for the following SOCs: A63, V5, R528/T113s, V853, F1C100s, R329, H616, H6 Signed-off-by: Maksim Kiselev [Arnout: use full hash in VERSION] Signed-off-by: Arnout Vandecappelle --- ...nfo-Access-to-io-memory-via-pointers.patch | 59 ------------------- package/sunxi-tools/Config.in | 1 + package/sunxi-tools/sunxi-tools.hash | 2 +- package/sunxi-tools/sunxi-tools.mk | 4 +- 4 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch diff --git a/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch b/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch deleted file mode 100644 index 997c413f232d..000000000000 --- a/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 5c0a443ba336f10a8db6a99c769aa84ad37ed4d2 Mon Sep 17 00:00:00 2001 -From: Vadim Kochan -Date: Wed, 20 Feb 2019 02:48:43 +0200 -Subject: [PATCH] meminfo: Access to io memory via pointers - -The main reason for this is to be able compile with musl library, -because there is no support of inx/outx functions for ARM platform. - -Signed-off-by: Vadim Kochan ---- - meminfo.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/meminfo.c b/meminfo.c -index 0b0ff23..7d9f10f 100644 ---- a/meminfo.c -+++ b/meminfo.c -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - #include - - #include "common.h" -@@ -74,24 +73,26 @@ static enum sunxi_soc_version soc_version; - unsigned int - sunxi_io_read(void *base, int offset) - { -- return inl((unsigned long) (base + offset)); -+ unsigned long port = (unsigned long) (base + offset); -+ return *((volatile unsigned long *) port); - } - - void - sunxi_io_write(void *base, int offset, unsigned int value) - { -- outl(value, (unsigned long) (base + offset)); -+ unsigned long port = (unsigned long) (base + offset); -+ *((volatile unsigned long *) port) = value; - } - - void - sunxi_io_mask(void *base, int offset, unsigned int value, unsigned int mask) - { -- unsigned int tmp = inl((unsigned long) (base + offset)); -+ unsigned int tmp = sunxi_io_read(base, offset); - - tmp &= ~mask; - tmp |= value & mask; - -- outl(tmp, (unsigned long) (base + offset)); -+ sunxi_io_write(base, offset, tmp); - } - - --- -2.14.1 - diff --git a/package/sunxi-tools/Config.in b/package/sunxi-tools/Config.in index 5f72667284e0..e748637c7202 100644 --- a/package/sunxi-tools/Config.in +++ b/package/sunxi-tools/Config.in @@ -25,6 +25,7 @@ config BR2_PACKAGE_SUNXI_TOOLS_FEL bool "sunxi-fel" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb + select BR2_PACKAGE_DTC select BR2_PACKAGE_LIBUSB help The sunxi-fel command can interact with a sunxi device in diff --git a/package/sunxi-tools/sunxi-tools.hash b/package/sunxi-tools/sunxi-tools.hash index 84acc2c76c81..42d81144a336 100644 --- a/package/sunxi-tools/sunxi-tools.hash +++ b/package/sunxi-tools/sunxi-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 81f48014a520cb83cac4e17f5ae627a637c4d6a422b60c693c5a705c92e43822 sunxi-tools-1.4.2.tar.gz +sha256 6589f32e9c2a5991cc49928e83aceea675f0165ce6f13cdd2dd784139a8d4efd sunxi-tools-1.4.2-168-ged3039cdbeeb28fc0011c3585d8f7dfb91038292.tar.gz sha256 2b0d4dda4bf8034e1506507a67f80f982131137afe62bf144d248f9faea31da4 LICENSE.md diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk index 59d1f3b5a015..a9569f291096 100644 --- a/package/sunxi-tools/sunxi-tools.mk +++ b/package/sunxi-tools/sunxi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_TOOLS_VERSION = 1.4.2 +SUNXI_TOOLS_VERSION = 1.4.2-168-ged3039cdbeeb28fc0011c3585d8f7dfb91038292 SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,v$(SUNXI_TOOLS_VERSION)) SUNXI_TOOLS_LICENSE = GPL-2.0+ SUNXI_TOOLS_LICENSE_FILES = LICENSE.md @@ -26,7 +26,7 @@ SUNXI_TOOLS_FEXC_LINKS += fex2bin bin2fex endif ifeq ($(BR2_PACKAGE_SUNXI_TOOLS_FEL),y) -SUNXI_TOOLS_DEPENDENCIES += libusb host-pkgconf +SUNXI_TOOLS_DEPENDENCIES += dtc libusb host-pkgconf endif define HOST_SUNXI_TOOLS_BUILD_CMDS From e09a43abd1170abdeeda9ac6e89040a7f653722b Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 10 Apr 2023 11:00:26 +0200 Subject: [PATCH 0215/2890] package/mg: bump to v3.6 Excerpt of https://github.com/troglobit/mg/releases/tag/v3.6: - Sync with mg upstream, OpenBSD 7.2, as of April 10 2023 - Drop trailing whitespace on RET (c-mode) - Add zap-to-char and zap-up-to-char, binding the former to M-z - Fix dobeep_msgs() usage, does not support format strings, this may have caused unexpected crashes for some operations, e.g. goto line that does not exist - Fix memleaks and possible crashes in ctags support - Fall back to /bin/sh if $SHELL is undefined - Fix typos and duplicate undo in *quick* help buffer - Add support for exuberant/universal Ctags tags file format - Add support for M-, to pop-tag-mark, like GNU Emacs Signed-off-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle --- package/mg/mg.hash | 4 ++-- package/mg/mg.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mg/mg.hash b/package/mg/mg.hash index 19cf1e29d58e..e8eedb892161 100644 --- a/package/mg/mg.hash +++ b/package/mg/mg.hash @@ -1,4 +1,4 @@ -# From https://github.com/troglobit/mg/releases/tag/v3.5 -sha256 a906eab9370c0f24a5fa25923561ad933b74ad339d0b2851d2067badf0d7e4ce mg-3.5.tar.gz +# From https://github.com/troglobit/mg/releases/tag/v3.6 +sha256 0e30f99b7606ddd92535aec0ba0118557afa4adca0961267314a4bf7791865fb mg-3.6.tar.gz # Locally computed: sha256 7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c UNLICENSE diff --git a/package/mg/mg.mk b/package/mg/mg.mk index bb3f59a14daf..88f8f6025791 100644 --- a/package/mg/mg.mk +++ b/package/mg/mg.mk @@ -4,7 +4,7 @@ # ################################################################################ -MG_VERSION = 3.5 +MG_VERSION = 3.6 MG_SITE = https://github.com/troglobit/mg/releases/download/v$(MG_VERSION) MG_LICENSE = Public Domain MG_LICENSE_FILES = UNLICENSE From 36bdfd29d87d48c3519876d93738b2aae9d7cb97 Mon Sep 17 00:00:00 2001 From: Oleg Lyovin Date: Fri, 7 Apr 2023 17:19:29 +0300 Subject: [PATCH 0216/2890] package/linux-headers: use BR2_MAKE Since kernel version 6.2, the minimum GNU Make version is 3.82 [1]. We have an optional host-make 4.0 minimum dependency, so we can use it as is. It's a bit unfortunate that we have to apply this even to older kernel versions, but make itself builds fairly fast compared to the toolchain (which is the only reason to build linux-headers). Use BR2_MAKE for linux-headers, and depend on BR2_MAKE_HOST_DEPENDENCY. Signed-off-by: Oleg Lyovin Signed-off-by: Arnout Vandecappelle --- package/linux-headers/linux-headers.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk index e2a0b7a7c961..b4b5a5b47d48 100644 --- a/package/linux-headers/linux-headers.mk +++ b/package/linux-headers/linux-headers.mk @@ -125,6 +125,8 @@ LINUX_HEADERS_INSTALL_STAGING = YES # linux-headers is part of the toolchain so disable the toolchain dependency LINUX_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO +LINUX_HEADERS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) + # For some architectures (eg. Arc, Cris, Hexagon, ia64, parisc, # score and xtensa), the Linux buildsystem tries to call the # cross-compiler, although it is not needed at all. @@ -137,7 +139,7 @@ LINUX_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO # of "its" headers define LINUX_HEADERS_CONFIGURE_CMDS (cd $(@D); \ - $(TARGET_MAKE_ENV) $(MAKE) \ + $(TARGET_MAKE_ENV) $(BR2_MAKE) \ ARCH=$(KERNEL_ARCH) \ HOSTCC="$(HOSTCC)" \ HOSTCFLAGS="$(HOSTCFLAGS)" \ @@ -148,7 +150,7 @@ endef define LINUX_HEADERS_INSTALL_STAGING_CMDS (cd $(@D); \ - $(TARGET_MAKE_ENV) $(MAKE) \ + $(TARGET_MAKE_ENV) $(BR2_MAKE) \ ARCH=$(KERNEL_ARCH) \ HOSTCC="$(HOSTCC)" \ HOSTCFLAGS="$(HOSTCFLAGS)" \ From 0b9efc991f8a2c1b6388e4e575641228262eadd1 Mon Sep 17 00:00:00 2001 From: Oleg Lyovin Date: Fri, 7 Apr 2023 17:19:30 +0300 Subject: [PATCH 0217/2890] linux: use BR2_MAKE Since kernel version 6.2, the minimum GNU Make version is 3.82 [1]. We have an optional host-make 4.0 minimum dependency, so we can use it as is. It's a bit unfortunate that we have to apply this even to older kernel versions, but make itself builds fairly fast compared to the kernel. Use BR2_MAKE and BR2_MAKE1 for linux, and depend on BR2_MAKE_HOST_DEPENDENCY. In addition, we need to set LINUX_MAKE to BR2_MAKE for use in the kconfig infrastructure. Signed-off-by: Oleg Lyovin Signed-off-by: Arnout Vandecappelle --- linux/linux.mk | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 03d89cd204a2..37797fc4f0e1 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -70,7 +70,10 @@ LINUX_MAKE_ENV = \ BR_BINARIES_DIR=$(BINARIES_DIR) LINUX_INSTALL_IMAGES = YES -LINUX_DEPENDENCIES = host-kmod +LINUX_DEPENDENCIES = \ + host-kmod \ + $(BR2_MAKE_HOST_DEPENDENCY) +LINUX_MAKE = $(BR2_MAKE) # The kernel CONFIG_EXTRA_FIRMWARE feature requires firmware files at build # time. Make sure they are available before the kernel builds. @@ -183,7 +186,7 @@ endif # Get the real Linux version, which tells us where kernel modules are # going to be installed in the target filesystem. # Filter out 'w' from MAKEFLAGS, to workaround a bug in make 4.1 (#13141) -LINUX_VERSION_PROBED = `MAKEFLAGS='$(filter-out w,$(MAKEFLAGS))' $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` +LINUX_VERSION_PROBED = `MAKEFLAGS='$(filter-out w,$(MAKEFLAGS))' $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) @@ -433,7 +436,7 @@ LINUX_DEPENDENCIES += host-bison host-flex ifeq ($(BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT),) define LINUX_BUILD_DTB - $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_DTBS) + $(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_DTBS) endef ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),) define LINUX_INSTALL_DTB @@ -481,7 +484,7 @@ endif # Compilation. We make sure the kernel gets rebuilt when the # configuration has changed. We call the 'all' and # '$(LINUX_TARGET_NAME)' targets separately because calling them in -# the same $(MAKE) invocation has shown to cause parallel build +# the same $(BR2_MAKE) invocation has shown to cause parallel build # issues. # The call to disable gcc-plugins is a stop-gap measure: # http://lists.busybox.net/pipermail/buildroot/2020-May/282727.html @@ -490,8 +493,8 @@ define LINUX_BUILD_CMDS $(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \ cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/ ) - $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) all - $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) + $(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) all + $(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) $(LINUX_BUILD_DTB) $(LINUX_APPEND_DTB) endef @@ -540,7 +543,7 @@ define LINUX_INSTALL_TARGET_CMDS # Install modules and remove symbolic links pointing to build # directories, not relevant on the target @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ - $(LINUX_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install; \ + $(LINUX_MAKE_ENV) $(BR2_MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install; \ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \ fi @@ -639,7 +642,7 @@ linux-rebuild-with-initramfs: rootfs-cpio linux-rebuild-with-initramfs: @$(call MESSAGE,"Rebuilding kernel with initramfs") # Build the kernel. - $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) $(LINUX_TARGET_NAME) + $(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) $(LINUX_TARGET_NAME) $(LINUX_APPEND_DTB) # Copy the kernel image(s) to its(their) final destination $(call LINUX_INSTALL_IMAGE,$(BINARIES_DIR)) From 917718671193e2e7ea2d8463046ce2e53dd6ab73 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 5 Apr 2023 10:18:41 +0200 Subject: [PATCH 0218/2890] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- configs/olimex_a20_olinuxino_lime2_defconfig | 4 ++-- configs/olimex_a20_olinuxino_lime_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 50a0986ab215..a8260a7ea364 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.22" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -44,7 +44,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 25ecf31146f5..65a78f5352cd 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.22" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -44,7 +44,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 370af35425e754808dd8691536bda5b0dbce7986 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 5 Apr 2023 10:18:42 +0200 Subject: [PATCH 0219/2890] configs/olimex_a20_olinuxino_lime*: configure eth0 with DHCP Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- configs/olimex_a20_olinuxino_lime2_defconfig | 1 + configs/olimex_a20_olinuxino_lime_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index a8260a7ea364..a38f3a1c5ee7 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -15,6 +15,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 65a78f5352cd..74b6a764cd3d 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -15,6 +15,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" From b7d4ae98faac020e2f620fda47c2777ad1deddfa Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Sun, 2 Apr 2023 20:35:30 -0500 Subject: [PATCH 0220/2890] utils/check-package: drop six usage The shebang in check-package now defines python3. There is no longer a need to maintain support with python 2.x. See-also: 02b165dc71 (check-package: fix Python3 support) Signed-off-by: Vincent Fazio Tested-by: James Knight Signed-off-by: Yann E. MORIN --- utils/check-package | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/utils/check-package b/utils/check-package index 758d51ba8be4..9a345522b43a 100755 --- a/utils/check-package +++ b/utils/check-package @@ -6,7 +6,6 @@ import inspect import magic import os import re -import six import sys import checkpackagelib.base @@ -228,12 +227,9 @@ def check_file_using_lib(fname): if fail > 0: failed.add(name) nwarnings += warn - if six.PY3: - f = open(fname, "r", errors="surrogateescape") - else: - f = open(fname, "r") + lastline = "" - for lineno, text in enumerate(f.readlines()): + for lineno, text in enumerate(open(fname, "r", errors="surrogateescape").readlines()): nlines += 1 for name, cf in objects: if cf.disable.search(lastline): @@ -243,7 +239,7 @@ def check_file_using_lib(fname): failed.add(name) nwarnings += warn lastline = text - f.close() + for name, cf in objects: warn, fail = print_warnings(cf.after(), name in xfail) if fail > 0: From a379499f7334c2a68d375b1cf9dc35cd59884181 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 29 Mar 2023 21:30:27 +0200 Subject: [PATCH 0221/2890] package/glibc: bump to version 2.37 See: https://sourceware.org/glibc/wiki/Release/2.37 https://lists.gnu.org/archive/html/info-gnu/2023-02/msg00000.html Security related changes: CVE-2022-39046: When the syslog function is passed a crafted input string larger than 1024 bytes, it reads uninitialized memory from the heap and prints it to the target log file, potentially revealing a portion of the contents of the heap Remove patch 0001-Revert-Linux-Implement-a-useful-version-of-_startup_.patch fixed in 2.37 release by [1]. [1] https://sourceware.org/bugzilla/show_bug.cgi?id=29249 Signed-off-by: Romain Naour Signed-off-by: Sebastian Weyer Tested-by: Bagas Sanjaya Signed-off-by: Yann E. MORIN --- ...lement-a-useful-version-of-_startup_.patch | 132 ------------------ package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- package/localedef/localedef.mk | 2 +- 4 files changed, 3 insertions(+), 135 deletions(-) delete mode 100644 package/glibc/0001-Revert-Linux-Implement-a-useful-version-of-_startup_.patch diff --git a/package/glibc/0001-Revert-Linux-Implement-a-useful-version-of-_startup_.patch b/package/glibc/0001-Revert-Linux-Implement-a-useful-version-of-_startup_.patch deleted file mode 100644 index 549650aca144..000000000000 --- a/package/glibc/0001-Revert-Linux-Implement-a-useful-version-of-_startup_.patch +++ /dev/null @@ -1,132 +0,0 @@ -From dfda505870f94a7ac8063eb47f622ddc65665ff1 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Jun 2022 19:42:43 -0600 -Subject: [PATCH] Revert "Linux: Implement a useful version of _startup_fatal" - -Fixes: -csu/libc-tls.c:202: undefined reference to `_startup_fatal_not_constant' - -This reverts commit 2d05ba7f8ef979947e910a37ae8115a816eb4d08. - -Signed-off-by: James Hilliard ---- - sysdeps/unix/sysv/linux/i386/startup.h | 23 ++++++++++++--- - sysdeps/unix/sysv/linux/ia64/startup.h | 22 --------------- - sysdeps/unix/sysv/linux/startup.h | 39 -------------------------- - 3 files changed, 19 insertions(+), 65 deletions(-) - delete mode 100644 sysdeps/unix/sysv/linux/ia64/startup.h - delete mode 100644 sysdeps/unix/sysv/linux/startup.h - -diff --git a/sysdeps/unix/sysv/linux/i386/startup.h b/sysdeps/unix/sysv/linux/i386/startup.h -index 213805d7d2..67c9310f3a 100644 ---- a/sysdeps/unix/sysv/linux/i386/startup.h -+++ b/sysdeps/unix/sysv/linux/i386/startup.h -@@ -1,5 +1,5 @@ - /* Linux/i386 definitions of functions used by static libc main startup. -- Copyright (C) 2022 Free Software Foundation, Inc. -+ Copyright (C) 2017-2022 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -16,7 +16,22 @@ - License along with the GNU C Library; if not, see - . */ - --/* Can't use "call *%gs:SYSINFO_OFFSET" during startup. */ --#define I386_USE_SYSENTER 0 -+#if BUILD_PIE_DEFAULT -+/* Can't use "call *%gs:SYSINFO_OFFSET" during statup in static PIE. */ -+# define I386_USE_SYSENTER 0 - --#include_next -+# include -+# include -+ -+__attribute__ ((__noreturn__)) -+static inline void -+_startup_fatal (const char *message __attribute__ ((unused))) -+{ -+ /* This is only called very early during startup in static PIE. -+ FIXME: How can it be improved? */ -+ ABORT_INSTRUCTION; -+ __builtin_unreachable (); -+} -+#else -+# include_next -+#endif -diff --git a/sysdeps/unix/sysv/linux/ia64/startup.h b/sysdeps/unix/sysv/linux/ia64/startup.h -deleted file mode 100644 -index 77f29f15a2..0000000000 ---- a/sysdeps/unix/sysv/linux/ia64/startup.h -+++ /dev/null -@@ -1,22 +0,0 @@ --/* Linux/ia64 definitions of functions used by static libc main startup. -- Copyright (C) 2022 Free Software Foundation, Inc. -- This file is part of the GNU C Library. -- -- The GNU C Library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -- -- The GNU C Library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -- -- You should have received a copy of the GNU Lesser General Public -- License along with the GNU C Library; if not, see -- . */ -- --/* This code is used before the TCB is set up. */ --#define IA64_USE_NEW_STUB 0 -- --#include_next -diff --git a/sysdeps/unix/sysv/linux/startup.h b/sysdeps/unix/sysv/linux/startup.h -deleted file mode 100644 -index 39859b404a..0000000000 ---- a/sysdeps/unix/sysv/linux/startup.h -+++ /dev/null -@@ -1,39 +0,0 @@ --/* Linux definitions of functions used by static libc main startup. -- Copyright (C) 2017-2022 Free Software Foundation, Inc. -- This file is part of the GNU C Library. -- -- The GNU C Library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -- -- The GNU C Library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -- -- You should have received a copy of the GNU Lesser General Public -- License along with the GNU C Library; if not, see -- . */ -- --#ifdef SHARED --# include_next --#else --# include -- --/* Avoid a run-time invocation of strlen. */ --#define _startup_fatal(message) \ -- do \ -- { \ -- size_t __message_length = __builtin_strlen (message); \ -- if (! __builtin_constant_p (__message_length)) \ -- { \ -- extern void _startup_fatal_not_constant (void); \ -- _startup_fatal_not_constant (); \ -- } \ -- INTERNAL_SYSCALL_CALL (write, STDERR_FILENO, (message), \ -- __message_length); \ -- INTERNAL_SYSCALL_CALL (exit_group, 127); \ -- } \ -- while (0) --#endif /* !SHARED */ --- -2.25.1 - diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 4ce4c6f6d1fb..453aadae1159 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 666482e657c319f7e139121121a0d97d303c65207b9f9730f42a3ee83c79f686 glibc-2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c.tar.gz +sha256 0f8bfad0b853a0c6e1dd1c3254a30b58d4c7050870fe2b0da90ad40f4d450ce2 glibc-2.37-2-g9f8513dc64119a424b312db97cef5d87d376defa.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 354f035d3355..79e6c76cb4d8 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c +GLIBC_VERSION = 2.37-2-g9f8513dc64119a424b312db97cef5d87d376defa # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 66998408542f..6f8b17051699 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c +LOCALEDEF_VERSION = 2.37-2-g9f8513dc64119a424b312db97cef5d87d376defa LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From 38b798da73ba69c9e1d8279805b621f80b98bc64 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 9 Apr 2023 23:08:14 +0200 Subject: [PATCH 0222/2890] package/skeleton: drop $(HOST_DIR)/usr compatibility symlink It has been years that we removed $(HOST_DIR)/usr. Because of this symlink, however, there are still packages that install things in $(HOST_DIR)/usr. Remove the symlink so those packages will start to fail. Note that there's now a check-package check to detect such incorrectly instaled things, so this should only affect external packages. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/skeleton/skeleton.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index 634c76e437c7..186cb60189df 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -11,11 +11,7 @@ SKELETON_ADD_TOOLCHAIN_DEPENDENCY = NO SKELETON_ADD_SKELETON_DEPENDENCY = NO -# We create a compatibility symlink in case a post-build script still -# uses $(HOST_DIR)/usr define HOST_SKELETON_INSTALL_CMDS -# check-package DoNotInstallToHostdirUsr - $(Q)ln -snf . $(HOST_DIR)/usr $(Q)mkdir -p $(HOST_DIR)/lib $(Q)mkdir -p $(HOST_DIR)/include $(Q)case $(HOSTARCH) in \ From 5d03d2346a993f55762e14d6a697be2e98a59eea Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 30 Mar 2023 14:35:08 +0200 Subject: [PATCH 0223/2890] package/libv4l: bump version to 1.24.1 - disable new v4l2-tracer option (fails to compile with rpi4_64 configuration) For details see [1]. [1] https://git.linuxtv.org/v4l-utils.git/tree/ChangeLog?h=stable-1.24 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libv4l/libv4l.hash | 2 +- package/libv4l/libv4l.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libv4l/libv4l.hash b/package/libv4l/libv4l.hash index d99d5e099254..4f694de34bc9 100644 --- a/package/libv4l/libv4l.hash +++ b/package/libv4l/libv4l.hash @@ -1,7 +1,7 @@ # Locally calculated after checking signature # https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2.asc # with key 05D0169C26E41593418129DF199A64FADFB500FF -sha256 65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31 v4l-utils-1.22.1.tar.bz2 +sha256 cbb7fe8a6307f5ce533a05cded70bb93c3ba06395ab9b6d007eb53b75d805f5b v4l-utils-1.24.1.tar.bz2 # Locally calculated sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index fd69b7ac7a1e..1142a7442f18 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBV4L_VERSION = 1.22.1 +LIBV4L_VERSION = 1.24.1 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES LIBV4L_DEPENDENCIES = host-pkgconf -LIBV4L_CONF_OPTS = --disable-doxygen-doc --disable-qvidcap +LIBV4L_CONF_OPTS = --disable-doxygen-doc --disable-qvidcap --disable-v4l2-tracer # needed to get utils/qv4l link flags right LIBV4L_AUTORECONF = YES # add host-gettext for AM_ICONV macro From 09d954fc4e342357db85636cf50c2094764d5b42 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 18 Jan 2023 08:14:10 +0100 Subject: [PATCH 0224/2890] package/doc-asciidoc: specify TOC depth for all formats Commit 17feaf00160d (manual: set toc depth to 4 for html outputs) did not explain why it set the depth of the table of content (TOC) only for the html and split-html formats. From memory, but it is a bit fuzzy after all those years, the TOC for HTML documentation was by default deeper than for the other formats, so it was really useless to expand it more than one-level deep, while for other formats, the default was acceptable. However, it does not make much sense to limit/enforce the depth of the TOC only for specific formats, and keep the default for the others; indeed, there is nothing that prevents the default to change with various versions of asciidoc and the rendering backends. Render all the formats with the same, explicit level of TOC. We move the assignment of _A2X_OPTS above the comment, because the comment does not apply to the TOC setting. Also note that the previous assignment to an empty value was completely superfluous... Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- package/doc-asciidoc.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index 2bd761edfbcd..931c5136d471 100644 --- a/package/doc-asciidoc.mk +++ b/package/doc-asciidoc.mk @@ -86,11 +86,13 @@ ifneq ($$(wildcard $$($(2)_$(3)_ASCIIDOC_CONF)),) $(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_$(3)_ASCIIDOC_CONF) endif +$(2)_$(3)_A2X_OPTS = \ + --xsltproc-opts "--stringparam toc.section.depth 1" + # Handle a2x warning about --destination-dir option only applicable to HTML # based outputs. So: # - use the --destination-dir option if possible (html and split-html), # - otherwise copy the generated document to the output directory -$(2)_$(3)_A2X_OPTS = ifneq ($$(filter $(4),html split-html),) $(2)_$(3)_A2X_OPTS += --destination-dir="$$(@D)" else @@ -161,11 +163,9 @@ $(1)-prepare-sources: $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced $(2)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc.conf -$(call ASCIIDOC_INNER,$(1),$(2),xhtml,html,html,HTML,\ - --xsltproc-opts "--stringparam toc.section.depth 1") +$(call ASCIIDOC_INNER,$(1),$(2),xhtml,html,html,HTML) -$(call ASCIIDOC_INNER,$(1),$(2),chunked,split-html,chunked,split HTML,\ - --xsltproc-opts "--stringparam toc.section.depth 1") +$(call ASCIIDOC_INNER,$(1),$(2),chunked,split-html,chunked,split HTML) # dblatex needs to pass the '--maxvars ...' option to xsltproc to prevent it # from reaching the template recursion limit when processing the (long) target From 6a6a11f64b305e272d34e84d1e9e9b61ada24218 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 18 Jan 2023 08:14:11 +0100 Subject: [PATCH 0225/2890] package/doc-asciidoc: allow docs to request a specific TOC depth For some documents, we may want a terse or deeper TOC depth. For example, short documents may want just the level-0 in the TOC, while longer documents may want depth 1 or 2, or even deeper; also, some documents may not use the document-title levels [0], only section levels [1], and so may want to increase the TOC depth. Additionally, allow per-format depth. For example, split-html has a single page dedicated to the TOC, so there we may want a deeper TOC, while on the html output, where the TOC is on the same page as the whole document, a shorter TOC is preferred. [0] https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference/#document-header [1] https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference/#section-titles Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- docs/manual/adding-packages-asciidoc.txt | 54 ++++++++++++++---------- package/doc-asciidoc.mk | 3 +- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt index 0bfe99d22e86..d68978b1cbd8 100644 --- a/docs/manual/adding-packages-asciidoc.txt +++ b/docs/manual/adding-packages-asciidoc.txt @@ -66,6 +66,12 @@ information is (assuming the document name is +foo+) : * +FOO_DEPENDENCIES+, optional, the list of packages (most probably, host-packages) that must be built before building this document. +* +FOO_TOC_DEPTH+, +FOO_TOC_DEPTH_+, optionals, the depth of the + table of content for this document, which can be overridden for the + specified format ++ (see the list of rendered formats, above, + but in uppercase, and with dash replaced by underscore; see example, + below). By default: +1+. + There are also additional hooks (see xref:hooks[] for general information on hooks), that a document may set to define extra actions to be done at various steps: @@ -108,26 +114,30 @@ Here is a complete example that uses all variables and all hooks: 07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) 08: FOO_RESOURCES = $(sort $(wildcard $(FOO_DOCDIR)/ressources)) 09: -10: define FOO_GEN_EXTRA_DOC -11: /path/to/generate-script --outdir=$(@D) -12: endef -13: FOO_POST_RSYNC_HOOKS += FOO_GEN_EXTRA_DOC -14: -15: define FOO_CHECK_MY_PROG -16: if ! which my-prog >/dev/null 2>&1; then \ -17: echo "You need my-prog to generate the foo document"; \ -18: exit 1; \ -19: fi -20: endef -21: FOO_CHECK_DEPENDENCIES_HOOKS += FOO_CHECK_MY_PROG -22: -23: define FOO_CHECK_MY_OTHER_PROG -24: if ! which my-other-prog >/dev/null 2>&1; then \ -25: echo "You need my-other-prog to generate the foo document as PDF"; \ -26: exit 1; \ -27: fi -28: endef -29: FOO_CHECK_DEPENDENCIES_PDF_HOOKS += FOO_CHECK_MY_OTHER_PROG -30: -31: $(eval $(call asciidoc-document)) +10: FOO_TOC_DEPTH = 2 +11: FOO_TOC_DEPTH_HTML = 1 +12: FOO_TOC_DEPTH_SPLIT_HTML = 3 +13: +14: define FOO_GEN_EXTRA_DOC +15: /path/to/generate-script --outdir=$(@D) +16: endef +17: FOO_POST_RSYNC_HOOKS += FOO_GEN_EXTRA_DOC +18: +19: define FOO_CHECK_MY_PROG +20: if ! which my-prog >/dev/null 2>&1; then \ +21: echo "You need my-prog to generate the foo document"; \ +22: exit 1; \ +23: fi +24: endef +25: FOO_CHECK_DEPENDENCIES_HOOKS += FOO_CHECK_MY_PROG +26: +27: define FOO_CHECK_MY_OTHER_PROG +28: if ! which my-other-prog >/dev/null 2>&1; then \ +29: echo "You need my-other-prog to generate the foo document as PDF"; \ +30: exit 1; \ +31: fi +32: endef +33: FOO_CHECK_DEPENDENCIES_PDF_HOOKS += FOO_CHECK_MY_OTHER_PROG +34: +35: $(eval $(call asciidoc-document)) ---- diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index 931c5136d471..6b8eaa81b314 100644 --- a/package/doc-asciidoc.mk +++ b/package/doc-asciidoc.mk @@ -87,7 +87,7 @@ $(2)_$(3)_ASCIIDOC_OPTS += -f $$($(2)_$(3)_ASCIIDOC_CONF) endif $(2)_$(3)_A2X_OPTS = \ - --xsltproc-opts "--stringparam toc.section.depth 1" + --xsltproc-opts "--stringparam toc.section.depth $$(or $$($(2)_TOC_DEPTH_$$(call UPPERCASE,$(4))),$$($(2)_TOC_DEPTH))" # Handle a2x warning about --destination-dir option only applicable to HTML # based outputs. So: @@ -161,6 +161,7 @@ $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced: .PHONY: $(1)-prepare-sources $(1)-prepare-sources: $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced +$(2)_TOC_DEPTH ?= 1 $(2)_ASCIIDOC_CONF = $$($(2)_DOCDIR)/asciidoc.conf $(call ASCIIDOC_INNER,$(1),$(2),xhtml,html,html,HTML) From d9b244d8a3c83b39f67444f36b21a88cbaf4547b Mon Sep 17 00:00:00 2001 From: James Knight Date: Fri, 7 Apr 2023 01:21:06 -0400 Subject: [PATCH 0226/2890] board/qemu: define start qemu script outside of post-image script The following moves the definition of the QEMU board's `start-qemu.sh` helper script from being inlined in the post-image script into its own file. This should, in theory, make it easier to maintain the script in the future. Signed-off-by: James Knight [yann.morin.1998@free.fr: - don't sub-shell in the script - merge all 3 sed calls into one - create dest file with the sed, don't cp first - also substitute HOST_DIR - fix shellcheck ] Signed-off-by: Yann E. MORIN --- board/qemu/post-image.sh | 23 ++++++----------------- board/qemu/start-qemu.sh.in | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 board/qemu/start-qemu.sh.in diff --git a/board/qemu/post-image.sh b/board/qemu/post-image.sh index 88f04134961e..57306dd54634 100755 --- a/board/qemu/post-image.sh +++ b/board/qemu/post-image.sh @@ -41,21 +41,10 @@ case ${DEFCONFIG_NAME} in ;; esac -cat <<-_EOF_ > "${START_QEMU_SCRIPT}" - #!/bin/sh - ( - BINARIES_DIR="\${0%/*}/" - cd \${BINARIES_DIR} - - if [ "\${1}" = "serial-only" ]; then - EXTRA_ARGS='${SERIAL_ARGS}' - else - EXTRA_ARGS='${DEFAULT_ARGS}' - fi - - export PATH="${HOST_DIR}/bin:\${PATH}" - exec ${QEMU_CMD_LINE} \${EXTRA_ARGS} - ) -_EOF_ - +sed "s|@SERIAL_ARGS@|${SERIAL_ARGS}|g" \ + "s|@DEFAULT_ARGS@|${DEFAULT_ARGS}|g" \ + "s|@QEMU_CMD_LINE@|${QEMU_CMD_LINE}|g" \ + "s|@HOST_DIR@|${HOST_DIR}|g" \ + <"${QEMU_BOARD_DIR}/start-qemu.sh.in" \ + >"${START_QEMU_SCRIPT}" chmod +x "${START_QEMU_SCRIPT}" diff --git a/board/qemu/start-qemu.sh.in b/board/qemu/start-qemu.sh.in new file mode 100644 index 000000000000..4dc9bfbb0ddf --- /dev/null +++ b/board/qemu/start-qemu.sh.in @@ -0,0 +1,14 @@ +#!/bin/sh + +BINARIES_DIR="${0%/*}/" +# shellcheck disable=SC2164 +cd "${BINARIES_DIR}" + +if [ "${1}" = "serial-only" ]; then + EXTRA_ARGS='@SERIAL_ARGS@' +else + EXTRA_ARGS='@DEFAULT_ARGS@' +fi + +export PATH="@HOST_DIR@/bin:${PATH}" +exec @QEMU_CMD_LINE@ ${EXTRA_ARGS} From b32d7c99c64d6dcb7a68036a7abfa86b8b558627 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 10 Apr 2023 22:37:23 +0200 Subject: [PATCH 0227/2890] board/qemu: fix shellcheck in post-image script Commit 270759aff3cf (board/qemu: define start qemu script outside of post-image script) touches board/qemu/post-image.sh, so that exposed existing shellcheck issues. Fix those now. Signed-off-by: Yann E. MORIN Cc: James Knight --- board/qemu/post-image.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/post-image.sh b/board/qemu/post-image.sh index 57306dd54634..ccd0fb78c900 100755 --- a/board/qemu/post-image.sh +++ b/board/qemu/post-image.sh @@ -1,8 +1,8 @@ #!/bin/bash -QEMU_BOARD_DIR="$(dirname $0)" -DEFCONFIG_NAME="$(basename $2)" -README_FILES="${QEMU_BOARD_DIR}/*/readme.txt" +QEMU_BOARD_DIR="$(dirname "$0")" +DEFCONFIG_NAME="$(basename "$2")" +README_FILE="${QEMU_BOARD_DIR}/*/readme.txt" START_QEMU_SCRIPT="${BINARIES_DIR}/start-qemu.sh" if [[ "${DEFCONFIG_NAME}" =~ ^"qemu_*" ]]; then @@ -12,7 +12,7 @@ fi # Search for "# qemu_*_defconfig" tag in all readme.txt files. # Qemu command line on multilines using back slash are accepted. -QEMU_CMD_LINE=$(sed -r ':a; /\\$/N; s/\\\n//; s/\t/ /; ta; /# '${DEFCONFIG_NAME}'$/!d; s/#.*//' ${README_FILES}) +QEMU_CMD_LINE="$(sed -r ':a; /\\$/N; s/\\\n//; s/\t/ /; ta; /# '"${DEFCONFIG_NAME}"'$/!d; s/#.*//' \ "${README_FILE}")" if [ -z "${QEMU_CMD_LINE}" ]; then # No Qemu cmd line found, can't test. From 16c497e0a66d4ab02d0bb6eb689340ba5d5b566f Mon Sep 17 00:00:00 2001 From: James Knight Date: Fri, 7 Apr 2023 01:21:07 -0400 Subject: [PATCH 0228/2890] board/qemu/start-qemu.sh.in: rework argument handling Provides the ability to forward command line options directly to QEMU. When invoking `start-qemu.sh`, users can forward arguments by adding a double dash (`--`) into the argument set, and any trailing arguments will be forwarded into QEMU. For example, `start-qemu.sh -- --help`. The original implementation supported a "serial-only" command line argument to help run in a non-graphical mode for some use cases. These changes try to promote a newly added `--serial-only` argument to drive this mode; that being said, a `serial-only` argument will still be accepted for backwards compatibility. Signed-off-by: James Knight [yann.morin.1998@free.fr: - drop the warning: unknown options cause 'exit 1' already, and any leftover is explicitly for qemu. - use false/true instead of 0/1 ] Signed-off-by: Yann E. MORIN --- board/qemu/start-qemu.sh.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/board/qemu/start-qemu.sh.in b/board/qemu/start-qemu.sh.in index 4dc9bfbb0ddf..cbc33a76d17a 100644 --- a/board/qemu/start-qemu.sh.in +++ b/board/qemu/start-qemu.sh.in @@ -4,11 +4,20 @@ BINARIES_DIR="${0%/*}/" # shellcheck disable=SC2164 cd "${BINARIES_DIR}" -if [ "${1}" = "serial-only" ]; then +mode_serial=false +while [ "$1" ]; do + case "$1" in + --serial-only|serial-only) mode_serial=true; shift;; + --) shift; break;; + *) echo "unknown option: $1" >&2; exit 1;; + esac +done + +if ${mode_serial}; then EXTRA_ARGS='@SERIAL_ARGS@' else EXTRA_ARGS='@DEFAULT_ARGS@' fi export PATH="@HOST_DIR@/bin:${PATH}" -exec @QEMU_CMD_LINE@ ${EXTRA_ARGS} +exec @QEMU_CMD_LINE@ ${EXTRA_ARGS} "$@" From 5de78f181acc53959b0a446a3fb116ecdec13577 Mon Sep 17 00:00:00 2001 From: James Knight Date: Fri, 7 Apr 2023 01:21:08 -0400 Subject: [PATCH 0229/2890] board/qemu/start-qemu.sh.in: support launching with host system's qemu Provides the ability to use a host system's QEMU. While a Buildroot generated QEMU should work for most cases, a developer may wish to use the system's QEMU for options which may not have been configured in the Buildroot's QEMU build (e.g. configuring a different display mode). Signed-off-by: James Knight [yann.morin.1998@free.fr: - use false/true instead of 0/1 ] Signed-off-by: Yann E. MORIN --- board/qemu/start-qemu.sh.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/board/qemu/start-qemu.sh.in b/board/qemu/start-qemu.sh.in index cbc33a76d17a..38024b449e78 100644 --- a/board/qemu/start-qemu.sh.in +++ b/board/qemu/start-qemu.sh.in @@ -5,9 +5,11 @@ BINARIES_DIR="${0%/*}/" cd "${BINARIES_DIR}" mode_serial=false +mode_sys_qemu=false while [ "$1" ]; do case "$1" in --serial-only|serial-only) mode_serial=true; shift;; + --use-system-qemu) mode_sys_qemu=true; shift;; --) shift; break;; *) echo "unknown option: $1" >&2; exit 1;; esac @@ -19,5 +21,8 @@ else EXTRA_ARGS='@DEFAULT_ARGS@' fi -export PATH="@HOST_DIR@/bin:${PATH}" +if ! ${mode_sys_qemu}; then + export PATH="@HOST_DIR@/bin:${PATH}" +fi + exec @QEMU_CMD_LINE@ ${EXTRA_ARGS} "$@" From 3aa2b0b81a0ee950c47efb2997c3127bf9475456 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Tue, 11 Apr 2023 08:58:27 +0200 Subject: [PATCH 0230/2890] .checkpackageignore: remove fixed board/qemu/post-image.sh Commit b32d7c99 fixed the shellcheck errors in board/qemu/post-image.sh, but forgot to remove it from .checkpackageignore, leading to "Shellcheck was expected to fail" errors. Re-generate .checkpackageignore. Fixes: b32d7c99c64d6dcb7a68036a7abfa86b8b558627 Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index 37214d64241b..cf58e59198cb 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -59,7 +59,6 @@ board/orangepi/orangepi-one-plus/post-build.sh Shellcheck board/pine64/rock64/post-build.sh Shellcheck board/pine64/rockpro64/post-build.sh Shellcheck board/qemu/aarch64-sbsa/assemble-flash-images Shellcheck -board/qemu/post-image.sh Shellcheck board/qemu/x86/post-build.sh Shellcheck board/qemu/x86_64/post-build.sh Shellcheck board/radxa/rockpi-n8/post-build.sh Shellcheck From b40a2cc3912a039d29231241daca477790e366cd Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 10 Apr 2023 02:32:52 -0600 Subject: [PATCH 0231/2890] package/pkg-cargo: ensure host/target rustflags are properly split In Cargo, it is quite typical for "build scripts" to be written in Rust and therefore they need to be compiled as part of the overall build. In cross-compilation, that means a mixed host and target build. Unfortunately, by default Cargo makes no distinction between the RUSTFLAGS used for the host and the target. There is, however, an unstable feature to make this distinction [1][2]. We already have CARGO_TARGET_APPLIES_TO_HOST="false". This makes sure that any configuration that we make for the target doesn't automatically apply to the host as well. However, this only applies for per-target configuration, for example the setting of "cc" in the config.toml generated by package/rust/rust.mk. Flags that are passed with RUSTFLAGS still apply to both host and target. Therefore, we need to use the CARGO_TARGET__RUSTFLAGS environment variable instead of plain RUSTFLAGS. This, however, doesn't allow us to specify flags that apply only to the host. We could use CARGO_TARGET__RUSTFLAGS for that, but that doesn't work in case the host and target tuple are the same. For this, we need another unstable feature, enabled with CARGO_UNSTABLE_HOST_CONFIG="true". With this enabled, we can specify flags that apply only for the host build using CARGO_HOST_RUSTFLAGS. Currently, we don't have any such flags, but we really should: we should pass the proper link flags to point to $(HOST_DIR)/lib. Therefore, add CARGO_HOST_RUSTFLAGS doing exactly that. [1] https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#host-config [2] https://github.com/rust-lang/cargo/pull/10395 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/pkg-cargo.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 5600c8e97eb3..264bf5a1aeb7 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -34,7 +34,10 @@ PKG_COMMON_CARGO_ENV = \ # using nighly features on stable releases, i.e features that are not # yet considered stable. # -# CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" "enables the nightly +# CARGO_UNSTABLE_HOST_CONFIG="true" enables the host specific +# configuration feature +# +# CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" enables the nightly # configuration option target-applies-to-host value to be set # # CARGO_TARGET_APPLIES_TO_HOST="false" is actually setting the value @@ -43,9 +46,11 @@ PKG_COMMON_CARGO_ENV = \ PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_UNSTABLE_HOST_CONFIG="true" \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ + CARGO_HOST_RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \ CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc # @@ -53,7 +58,8 @@ PKG_CARGO_ENV = \ # and should be removed when fixed upstream # ifeq ($(NORMALIZED_ARCH),arm) - PKG_CARGO_ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" + PKG_CARGO_ENV += \ + CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" endif HOST_PKG_CARGO_ENV = \ From 131cb09c79ffe155c51444b5b86145d9e184c304 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 11 Apr 2023 21:06:37 +0200 Subject: [PATCH 0232/2890] board/qemu: fix post-image Last-minute changes to d9b244d8a3c8 (board/qemu: define start qemu script outside of post-image script) were not tested before being pushed, so they introduced a bug. As Arnout put it: [...] multiple expressions need a -e to interpret them as expressions (now they're interpreted as file names). Fixes: d9b244d8a3c83b39f67444f36b21a88cbaf4547b Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN Cc: James Knight --- board/qemu/post-image.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/post-image.sh b/board/qemu/post-image.sh index ccd0fb78c900..763287ca391e 100755 --- a/board/qemu/post-image.sh +++ b/board/qemu/post-image.sh @@ -41,10 +41,10 @@ case ${DEFCONFIG_NAME} in ;; esac -sed "s|@SERIAL_ARGS@|${SERIAL_ARGS}|g" \ - "s|@DEFAULT_ARGS@|${DEFAULT_ARGS}|g" \ - "s|@QEMU_CMD_LINE@|${QEMU_CMD_LINE}|g" \ - "s|@HOST_DIR@|${HOST_DIR}|g" \ +sed -e "s|@SERIAL_ARGS@|${SERIAL_ARGS}|g" \ + -e "s|@DEFAULT_ARGS@|${DEFAULT_ARGS}|g" \ + -e "s|@QEMU_CMD_LINE@|${QEMU_CMD_LINE}|g" \ + -e "s|@HOST_DIR@|${HOST_DIR}|g" \ <"${QEMU_BOARD_DIR}/start-qemu.sh.in" \ >"${START_QEMU_SCRIPT}" chmod +x "${START_QEMU_SCRIPT}" From 65849bd96d0de501c109c32fab01a5eb1fd3a629 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 11 Apr 2023 22:31:13 +0200 Subject: [PATCH 0233/2890] package/localedef: fix fallout after bump to glibc 2.37 Commit a379499f7334 (package/glibc: bump to version 2.37) forgot to update the pach for localedef. There is no version check for 'as' now, so drop the related hunk. Fixes: a379499f7334c2a68d375b1cf9dc35cd59884181 Signed-off-by: Yann E. MORIN Cc: Romain Naour Cc: Sebastian Weyer Cc: Bagas Sanjaya Tested-by: Sebastian Weyer --- ...dency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch index 297c96cc5ee0..94fccfa8561b 100644 --- a/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch +++ b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch @@ -24,6 +24,8 @@ GCC 6.2+ https://sourceware.org/git/?p=glibc.git;a=commit;h=4dcbbc3b28aaeafe23e1a30db84055aa6f6fa987 Signed-off-by: Matthew Weber +[yann.morin.1998@free.fr: update for 2.37] +Signed-off-by: Yann E. MORIN --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) @@ -32,16 +34,7 @@ diff --git a/configure b/configure index 9619c10991..0c481d2339 100755 --- a/configure +++ b/configure -@@ -4651,7 +4651,7 @@ $as_echo_n "checking version of $AS... " >&6; } - ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 2.1[0-9][0-9]*|2.2[5-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) -+ 2.1[0-9][0-9]*|2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -@@ -4781,7 +4781,7 @@ $as_echo_n "checking version of $LD... " >&6; } +@@ -4178,7 +4178,7 @@ $as_echo_n "checking version of $LD... " >&6; } ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -50,7 +43,7 @@ index 9619c10991..0c481d2339 100755 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; -@@ -5189,7 +5189,7 @@ int +@@ -4589,7 +4589,7 @@ int main () { From 576d709a693aab13affdbe3d6dca5253e51a4877 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 11 Apr 2023 21:19:30 +0200 Subject: [PATCH 0234/2890] Revert "package/skeleton: drop $(HOST_DIR)/usr compatibility symlink" In 38b798da73ba (package/skeleton: drop $(HOST_DIR)/usr compatibility symlink), we considered that $(HOST_DIR)/usr is a legacy symlink, and so we dropped it. During review, it was pointed out that: 1. [if] something installs in HOST_DIR/usr it's probably going to break somewhere down the line, 2. DESTDIR is empty for host builds. And PREFIX/usr would be completely crazy. However, we do have a package where DESTDIR is not empty for host packages. Indeed, for host-systemd, we do have a convoluted sequence where we configure it for the traditional /usr prefix, rather than $(HOST_DIR) for all other host packages, and we install it with DESTDIR=$(HOST_DIR). This is because systemd has to interpret path on the target, not on the host, and confusion ensues if host systemd is not configured with the same prefix as the target systemd. See commit 35c11a027c88 (package/systemd: add host variant) for the full, in-depth explanations. This reverts commit 38b798da73ba69c9e1d8279805b621f80b98bc64. This also changes the comment to note that, although legacy, the usr symlink is still required for some weird host packages. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) --- package/skeleton/skeleton.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index 186cb60189df..4eaaf32eada6 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -11,7 +11,12 @@ SKELETON_ADD_TOOLCHAIN_DEPENDENCY = NO SKELETON_ADD_SKELETON_DEPENDENCY = NO +# Although the $(HOST_DIR)/usr symlink is mostly for backward compatibility, +# there are weird packages that still require it (see host-systemd, and +# commit 35c11a027c88). define HOST_SKELETON_INSTALL_CMDS +# check-package DoNotInstallToHostdirUsr + $(Q)ln -snf . $(HOST_DIR)/usr $(Q)mkdir -p $(HOST_DIR)/lib $(Q)mkdir -p $(HOST_DIR)/include $(Q)case $(HOSTARCH) in \ From 7c01d5a1bb3f863a14636a516cadc78ecb71a907 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 13 Apr 2023 22:27:38 +0200 Subject: [PATCH 0235/2890] doc/website: tap2open have sponsored the association again .. so update and move their entry in the sponsors page. Signed-off-by: Yann E. MORIN --- docs/website/sponsors.html | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/docs/website/sponsors.html b/docs/website/sponsors.html index 9c17bed0c714..a90ca6c8df03 100644 --- a/docs/website/sponsors.html +++ b/docs/website/sponsors.html @@ -9,6 +9,21 @@
      +
      +
      +
      +
      + + + +
      +
      + Tap2Open + financially sponsored the Buildroot Association + in 2020 and 2023.
      +
      +
      +
      @@ -46,7 +61,9 @@
      +
      +
      @@ -348,24 +365,6 @@
      -
      -
      -
      -
      -
      - - - -
      -
      - Tap2Open - financially sponsored the Buildroot Association - in 2020.
      -
      -
      -
      -
      -
      From d45538f2e7acc1b330b191d559a81e8c1a961648 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 13 Apr 2023 10:04:34 -0700 Subject: [PATCH 0236/2890] configs/pc_x86_64_{bios, efi}_defconfig: Switch to kernel 6.1.24 LTS Let's use a more modern kernel with a broader range of hardware support for PCs. We stick to 6.1, rather than 6.2, as the former is an LTS, whicle the latter is not. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- configs/pc_x86_64_bios_defconfig | 6 +++--- configs/pc_x86_64_efi_defconfig | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig index ec34a41667ff..a057ddd2598d 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -21,13 +21,13 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-bios.cfg" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.24" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index da05471e28c1..efa603f0c009 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.24" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y From 7a4e8355e3751f620ef91239a1c61a9c1c41d5ca Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 13 Apr 2023 10:04:35 -0700 Subject: [PATCH 0237/2890] board/pc/linux.config: Add framebuffer and pci support Virtually all PCs nowadays have a PCI bridge and PCI devices. All framnebuffer options depend on CONFIG_FB, which default is not 'y', so also enable that. The overwhelming majority of PCs nowadays also come with an UEFI bootloader, that configures a framebuffer usable in early boot, which the kernel can reuse without needing any hardware-specific driver. EDID allows retrieving the capabilities of the connected display, especially the frequencies and so on, to properly drive the display. Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: - drop cosmetic CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y - rewrite commit log to explain all new options ] Signed-off-by: Yann E. MORIN --- board/pc/linux.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/pc/linux.config b/board/pc/linux.config index f86352e1ea71..43b15c94be49 100644 --- a/board/pc/linux.config +++ b/board/pc/linux.config @@ -15,6 +15,7 @@ CONFIG_IP_NF_FILTER=y CONFIG_CFG80211=m CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=m +CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y @@ -63,7 +64,10 @@ CONFIG_DRM_I915=y CONFIG_DRM_QXL=y CONFIG_DRM_BOCHS=y CONFIG_DRM_VIRTIO_GPU=y +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y CONFIG_FB_VESA=y +CONFIG_FB_EFI=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_HDA_INTEL=y From 9e90591b22caedfe72c87a8e3315ce8da6d1a4a9 Mon Sep 17 00:00:00 2001 From: Witold Lipieta Date: Thu, 13 Apr 2023 13:34:16 +0200 Subject: [PATCH 0238/2890] package/python-esptool: Bump version to 4.5.1 Signed-off-by: Witold Lipieta Acked-by: Bartosz Bilas Signed-off-by: Yann E. MORIN --- package/python-esptool/python-esptool.hash | 4 ++-- package/python-esptool/python-esptool.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-esptool/python-esptool.hash b/package/python-esptool/python-esptool.hash index b7246f978854..e1d318865843 100644 --- a/package/python-esptool/python-esptool.hash +++ b/package/python-esptool/python-esptool.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/esptool/json -md5 92c38551bc33bd5271bdea033aa51610 esptool-4.4.tar.gz -sha256 8acd4dfe70819b1302861ae92894380fb4700b377f5a4739479a4ec276e0b256 esptool-4.4.tar.gz +md5 fbad6fb6024580fd2645331f92a74555 esptool-4.5.1.tar.gz +sha256 e3eb59836123e5ebf793ef639311f7d85645526487d8b1c2b51159b455106b9a esptool-4.5.1.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index 0a71e1a78bb8..34bdf6cc96c0 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 4.4 +PYTHON_ESPTOOL_VERSION = 4.5.1 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/8b/4c/82d7fe5fa0643415bbb90bebff1f861816903c481ee5156fabd6d76dc684 +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/04/80/8eb97d1793cfaf830a4c0a7ea1d8f0674ccba8c23b7d02dcce074b5f44ea PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE From a94014898909f4538b106d21a5399ef7cc3608eb Mon Sep 17 00:00:00 2001 From: James Knight Date: Fri, 14 Apr 2023 17:53:54 -0400 Subject: [PATCH 0239/2890] board/qemu: restore readme globbing The QEMU board's post-image script will glob through various `readme.txt` files for an appropriate command line to use. Recent linter changes [1] prevents this from happening, and results in the following build error: >>> Executing post-image script board/qemu/post-image.sh sed: can't read board/qemu/*/readme.txt: No such file or directory Reverting part of the shellcheck fixes for the README file arguments and marking a linter exception. [1]: b32d7c99c64d6dcb7a68036a7abfa86b8b558627 Signed-off-by: James Knight Cc: Yann E. MORIN [yann.morin.1998@free.fr: also reinstate plural to the variable name] Signed-off-by: Yann E. MORIN --- board/qemu/post-image.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/board/qemu/post-image.sh b/board/qemu/post-image.sh index 763287ca391e..fe46d0d4af1a 100755 --- a/board/qemu/post-image.sh +++ b/board/qemu/post-image.sh @@ -2,7 +2,7 @@ QEMU_BOARD_DIR="$(dirname "$0")" DEFCONFIG_NAME="$(basename "$2")" -README_FILE="${QEMU_BOARD_DIR}/*/readme.txt" +README_FILES="${QEMU_BOARD_DIR}/*/readme.txt" START_QEMU_SCRIPT="${BINARIES_DIR}/start-qemu.sh" if [[ "${DEFCONFIG_NAME}" =~ ^"qemu_*" ]]; then @@ -12,7 +12,8 @@ fi # Search for "# qemu_*_defconfig" tag in all readme.txt files. # Qemu command line on multilines using back slash are accepted. -QEMU_CMD_LINE="$(sed -r ':a; /\\$/N; s/\\\n//; s/\t/ /; ta; /# '"${DEFCONFIG_NAME}"'$/!d; s/#.*//' \ "${README_FILE}")" +# shellcheck disable=SC2086 # glob over each readme file +QEMU_CMD_LINE="$(sed -r ':a; /\\$/N; s/\\\n//; s/\t/ /; ta; /# '"${DEFCONFIG_NAME}"'$/!d; s/#.*//' ${README_FILES})" if [ -z "${QEMU_CMD_LINE}" ]; then # No Qemu cmd line found, can't test. From 5b4eaa635f32ae6b2f1e1090372844c8c9001bde Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 14 Apr 2023 23:35:02 +0200 Subject: [PATCH 0240/2890] package/nginx: change project and download URL to https Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/nginx/Config.in | 2 +- package/nginx/nginx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx/Config.in b/package/nginx/Config.in index 406a1c861a61..8e888baa1c6b 100644 --- a/package/nginx/Config.in +++ b/package/nginx/Config.in @@ -6,7 +6,7 @@ menuconfig BR2_PACKAGE_NGINX nginx is an HTTP and reverse proxy server, as well as a mail proxy server. - http://nginx.org/ + https://nginx.org/ if BR2_PACKAGE_NGINX diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 10cc95d90ec1..185bcd576f2e 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -5,7 +5,7 @@ ################################################################################ NGINX_VERSION = 1.22.1 -NGINX_SITE = http://nginx.org/download +NGINX_SITE = https://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE NGINX_CPE_ID_VENDOR = f5 From b0236f934663a5f46d84ddba101a52cf2e04f429 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 14 Apr 2023 23:35:03 +0200 Subject: [PATCH 0241/2890] package/nginx: bump version to 1.24.0 For details see [1]. [1] https://nginx.org/en/CHANGES-1.24 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/nginx/nginx.hash | 2 +- package/nginx/nginx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 06454c5e320c..24bc588d855e 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 9ebb333a9e82b952acd3e2b4aeb1d4ff6406f72491bab6cd9fe69f0dea737f31 nginx-1.22.1.tar.gz +sha256 77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d nginx-1.24.0.tar.gz # License files, locally calculated sha256 ececed0b0e7243a4766cbc62b26df4bd3513b41de3a07425da1679c836d06320 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 185bcd576f2e..7bd2173b4892 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.22.1 +NGINX_VERSION = 1.24.0 NGINX_SITE = https://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE From cb78e8c362686660cdb3876607b67c92eacc6140 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 14 Apr 2023 23:35:04 +0200 Subject: [PATCH 0242/2890] package/nginx-naxsi: bump version to d714f16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update to latest upstream git version, fixes compile failure since nginx-1.23.0: src/event/ngx_event_udp.h:38:27: error: field ‘pkt6’ has incomplete type 38 | struct in6_pktinfo pkt6; | ^~~~ .../nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c:2925:36: error: ‘r->headers_in.x_forwarded_for’ is a pointer; did you mean to use ‘->’? 2925 | if (r->headers_in.x_forwarded_for.nelts >= 1) { | ^ | -> - remove 0001-naxsi_src-naxsi_runtime.c-fix-build-without-x_forwar.patch (upstream commit, see [1]) - remove 0002-PCRE2-compatibility.patch (upstream commit, see [2]) Changelog (since 1.3): - a2add9f docs: fix simple typo, registred -> registered (#538) - aa9da98 Fix #541 - Removing useless assert. - fbe6ffd Some includes are required for OpenBSD (#545) - 296583f naxsi_src/naxsi_runtime.c: fix build without x_forwarded_for (#568) - fe5df20 redirect naxsi log to a separate log file (#563) - c81a4e3 parse HTTP PATCH requests and associated tests (#595) - 2937c44 PCRE2 compatibility (#587) - d714f16 Fixes NGINX >= v.1.23.0 (all credits @lubomudr) (#598) Given the short history since 1.3, and rather than backporting one more patch, just bump to current HEAD of the upstream repository. [1] https://github.com/nbs-system/naxsi/commit/296583f06ba5c43cc859e01fd3c0ae1271eef0ce [2] https://github.com/nbs-system/naxsi/commit/2937c44276cba21601ade4e265d32515f570d68c Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...runtime.c-fix-build-without-x_forwar.patch | 63 ----- .../0002-PCRE2-compatibility.patch | 221 ------------------ package/nginx-naxsi/nginx-naxsi.hash | 2 +- package/nginx-naxsi/nginx-naxsi.mk | 2 +- 4 files changed, 2 insertions(+), 286 deletions(-) delete mode 100644 package/nginx-naxsi/0001-naxsi_src-naxsi_runtime.c-fix-build-without-x_forwar.patch delete mode 100644 package/nginx-naxsi/0002-PCRE2-compatibility.patch diff --git a/package/nginx-naxsi/0001-naxsi_src-naxsi_runtime.c-fix-build-without-x_forwar.patch b/package/nginx-naxsi/0001-naxsi_src-naxsi_runtime.c-fix-build-without-x_forwar.patch deleted file mode 100644 index 238a01923df9..000000000000 --- a/package/nginx-naxsi/0001-naxsi_src-naxsi_runtime.c-fix-build-without-x_forwar.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 8ea5218b07f715e9616a846bf305633ef1b3aa2a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 14 Aug 2021 11:46:08 +0200 -Subject: [PATCH] naxsi_src/naxsi_runtime.c: fix build without x_forwarded_for - -x_forwarded_for is not available if realip, geo, geoip or proxy modules -aren't enabled resulting in the following build failure since version -1.1a and -https://github.com/nbs-system/naxsi/commit/07a056ccd36bc3c5c40dc17991db226cb8cf6241: - -/home/buildroot/autobuild/instance-3/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c: In function 'ngx_http_naxsi_data_parse': -/home/buildroot/autobuild/instance-3/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c:2846:20: error: 'ngx_http_headers_in_t' has no member named 'x_forwarded_for' - if (r->headers_in.x_forwarded_for.nelts >= 1) { - ^ - -Fixes: - - http://autobuild.buildroot.org/results/cdbc1536f6b5de3d4c836efa2f0dcaf0cdbb1462 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/nbs-system/naxsi/pull/568] ---- - naxsi_src/naxsi_runtime.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c -index 28e0b29..6a723d2 100644 ---- a/naxsi_src/naxsi_runtime.c -+++ b/naxsi_src/naxsi_runtime.c -@@ -2842,10 +2842,12 @@ ngx_http_naxsi_data_parse(ngx_http_request_ctx_t* ctx, ngx_http_request_t* r) - unsigned int n = 0; - ngx_table_elt_t** h = NULL; - ngx_array_t a; -+#if (NGX_HTTP_X_FORWARDED_FOR) - if (r->headers_in.x_forwarded_for.nelts >= 1) { - a = r->headers_in.x_forwarded_for; - n = a.nelts; - } -+#endif - if (n >= 1) - h = a.elts; - if (n >= 1) { -@@ -2879,6 +2881,7 @@ ngx_http_naxsi_update_current_ctx_status(ngx_http_request_ctx_t* ctx, - - /*cr, sc, cf, ctx*/ - if (cf->check_rules && ctx->special_scores) { -+#if (NGX_HTTP_X_FORWARDED_FOR) - if (r->headers_in.x_forwarded_for.nelts >= 1) { - a = r->headers_in.x_forwarded_for; - n = a.nelts; -@@ -2896,7 +2899,9 @@ ngx_http_naxsi_update_current_ctx_status(ngx_http_request_ctx_t* ctx, - memcpy(ip.data, h[0]->value.data, ip.len); - ignore = nx_can_ignore_ip(&ip, cf) || nx_can_ignore_cidr(&ip, cf); - } -- } else { -+ } else -+#endif -+ { - ngx_str_t* ip = &r->connection->addr_text; - NX_DEBUG(_debug_whitelist_ignore, - NGX_LOG_DEBUG_HTTP, --- -2.30.2 - diff --git a/package/nginx-naxsi/0002-PCRE2-compatibility.patch b/package/nginx-naxsi/0002-PCRE2-compatibility.patch deleted file mode 100644 index aa3df4dff7d8..000000000000 --- a/package/nginx-naxsi/0002-PCRE2-compatibility.patch +++ /dev/null @@ -1,221 +0,0 @@ -From 2937c44276cba21601ade4e265d32515f570d68c Mon Sep 17 00:00:00 2001 -From: Danila Vershinin -Date: Thu, 16 Jun 2022 01:22:23 +0300 -Subject: [PATCH] PCRE2 compatibility (#587) - -* Fix: use pcre2 when building with nginx >= 1.21.5 - -I've tried to compile naxsi 1.3 as module for nginx 1.21.6, and got the error: - -error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} - 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, - -I found this issue report: Ref: https://github.com/nbs-system/naxsi/issues/580 -then i tried to solve the pcre2 compatibility issue. - -I've included an helper function that is 'copied' from: https://github.com/nginx/nginx/blob/master/src/core/ngx_regex.c#L393 -that it is called in place of 'pcre_exec' when nginx_version >= 1021005 - -Not sure if this is the best solution, but I managed to build naxsi 1.3 as module for nginx 1.21.6 succesfully, and it seems to work well. - -I'm not used to develop in C anymore (since 25 years ago, at least!), but I hope that this patch I made can help anybody else. - -* Added a check for nginx_version >= 1021005 - -Added a check for nginx_version >= 1021005 to avoid helper function definition on older versions - -* Use NGX_PCRE2 conditional - -Update naxsi.h - -Don't include pcre.h in order for compilation to work both against pcre and pcre2 - -Fix pcre vs pcre2 compilation - -Co-authored-by: laluigino <99279306+laluigino@users.noreply.github.com> -[Retrieved from: -https://github.com/nbs-system/naxsi/commit/2937c44276cba21601ade4e265d32515f570d68c] -Signed-off-by: Fabrice Fontaine ---- - naxsi_src/naxsi.h | 1 - - naxsi_src/naxsi_config.c | 9 ++++- - naxsi_src/naxsi_runtime.c | 82 ++++++++++++++++++++++++++++++++++++++- - naxsi_src/naxsi_utils.c | 8 ++++ - 4 files changed, 96 insertions(+), 4 deletions(-) - -diff --git a/naxsi_src/naxsi.h b/naxsi_src/naxsi.h -index 53df1bd8..b2f5c1a5 100644 ---- a/naxsi_src/naxsi.h -+++ b/naxsi_src/naxsi.h -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - - extern ngx_module_t ngx_http_naxsi_module; - -diff --git a/naxsi_src/naxsi_config.c b/naxsi_src/naxsi_config.c -index 4ea15567..6d2f0e23 100644 ---- a/naxsi_src/naxsi_config.c -+++ b/naxsi_src/naxsi_config.c -@@ -322,8 +322,11 @@ naxsi_zone(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) - - custom_rule->target_rx = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); - return_value_if(!custom_rule->target_rx, NGX_CONF_ERROR); -- -+#if (NGX_PCRE2) -+ custom_rule->target_rx->options = PCRE2_CASELESS | PCRE2_MULTILINE; -+#else - custom_rule->target_rx->options = PCRE_CASELESS | PCRE_MULTILINE; -+#endif - custom_rule->target_rx->pattern = custom_rule->target; - custom_rule->target_rx->pool = r->pool; - custom_rule->target_rx->err.len = 0; -@@ -442,7 +445,11 @@ naxsi_rx(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) - ha.len = tmp->len - strlen(RX_T); - rgc = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); - return_value_if(!rgc, NGX_CONF_ERROR); -+#if (NGX_PCRE2) -+ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; -+#else - rgc->options = PCRE_CASELESS | PCRE_MULTILINE; -+#endif - rgc->pattern = ha; - rgc->pool = r->pool; - rgc->err.len = 0; -diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c -index d548ce37..784852b0 100644 ---- a/naxsi_src/naxsi_runtime.c -+++ b/naxsi_src/naxsi_runtime.c -@@ -181,6 +181,75 @@ ngx_http_naxsi_rawbody_parse(ngx_http_request_ctx_t* ctx, - unsigned char* - ngx_utf8_check(ngx_str_t* str); - -+#if defined nginx_version && (nginx_version >= 1021005) -+/* -+ * variables to use pcre2 -+ */ -+static pcre2_match_data *ngx_pcre2_match_data; -+static ngx_uint_t ngx_pcre2_match_data_size; -+ -+/* -+ * helper function to use pcre2 -+ */ -+ngx_int_t -+ngx_pcre2_exec(ngx_regex_t *re, unsigned char* str, unsigned int len, ngx_int_t tmp_idx, int *captures, ngx_uint_t size) -+{ -+ size_t *ov; -+ ngx_int_t rc; -+ ngx_uint_t n, i; -+ -+ /* -+ * The pcre2_match() function might allocate memory for backtracking -+ * frames, typical allocations are from 40k and above. So the allocator -+ * is configured to do direct allocations from heap during matching. -+ */ -+ -+ if (ngx_pcre2_match_data == NULL -+ || size > ngx_pcre2_match_data_size) -+ { -+ /* -+ * Allocate a match data if not yet allocated or smaller than -+ * needed. -+ */ -+ -+ if (ngx_pcre2_match_data) { -+ pcre2_match_data_free(ngx_pcre2_match_data); -+ } -+ -+ ngx_pcre2_match_data_size = size; -+ ngx_pcre2_match_data = pcre2_match_data_create(size / 3, NULL); -+ -+ if (ngx_pcre2_match_data == NULL) { -+ rc = PCRE2_ERROR_NOMEMORY; -+ goto failed; -+ } -+ } -+ -+ rc = pcre2_match(re, str, len, tmp_idx, 0, ngx_pcre2_match_data, NULL); -+ -+ if (rc < 0) { -+ goto failed; -+ } -+ -+ n = pcre2_get_ovector_count(ngx_pcre2_match_data); -+ ov = pcre2_get_ovector_pointer(ngx_pcre2_match_data); -+ -+ if (n > size / 3) { -+ n = size / 3; -+ } -+ -+ for (i = 0; i < n; i++) { -+ captures[i * 2] = ov[i * 2]; -+ captures[i * 2 + 1] = ov[i * 2 + 1]; -+ } -+ -+failed: -+ -+ return rc; -+ -+} -+#endif -+ - /* - ** in : string to inspect, associated rule - ** does : apply the rule on the string, return 1 if matched, -@@ -201,7 +270,14 @@ ngx_http_process_basic_rule_buffer(ngx_str_t* str, ngx_http_rule_t* rl, ngx_int_ - tmp_idx = 0; - len = str->len; - while --#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) -+#if (NGX_PCRE2) -+ (tmp_idx < len && (match = ngx_pcre2_exec(rl->br->rx->regex, -+ str->data, -+ str->len, -+ tmp_idx, -+ captures, -+ 30)) >= 0) -+#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) - (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, - 0, - (const char*)str->data, -@@ -496,7 +572,9 @@ ngx_http_naxsi_pcre_wrapper(ngx_regex_compile_t* rx, unsigned char* str, unsigne - int match; - int captures[30]; - --#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) -+#if (NGX_PCRE2) -+ match = ngx_pcre2_exec(rx->regex, str, len, 0, captures, 1); -+#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) - match = pcre_exec(rx->regex->code, 0, (const char*)str, len, 0, 0, captures, 1); - #elif defined nginx_version && (nginx_version > 1001011) - match = pcre_exec(rx->regex->pcre, 0, (const char*)str, len, 0, 0, captures, 1); -diff --git a/naxsi_src/naxsi_utils.c b/naxsi_src/naxsi_utils.c -index e3d6f185..d2ecedec 100644 ---- a/naxsi_src/naxsi_utils.c -+++ b/naxsi_src/naxsi_utils.c -@@ -800,7 +800,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c - ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); - rgc = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target_rx; - if (rgc) { -+#if (NGX_PCRE2) -+ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; -+#else - rgc->options = PCRE_CASELESS | PCRE_MULTILINE; -+#endif - rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target; - rgc->pool = cf->pool; - rgc->err.len = 0; -@@ -816,7 +820,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c - ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); - rgc = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target_rx; - if (rgc) { -+#if (NGX_PCRE2) -+ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; -+#else - rgc->options = PCRE_CASELESS | PCRE_MULTILINE; -+#endif - rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target; - rgc->pool = cf->pool; - rgc->err.len = 0; diff --git a/package/nginx-naxsi/nginx-naxsi.hash b/package/nginx-naxsi/nginx-naxsi.hash index 4712ede2af1f..a724941b2568 100644 --- a/package/nginx-naxsi/nginx-naxsi.hash +++ b/package/nginx-naxsi/nginx-naxsi.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 439c8677372d2597b4360bbcc10bc86490de1fc75695b193ad5df154a214d628 nginx-naxsi-1.3.tar.gz +sha256 dbe2177411457f1cba98ee4673ce31876994ad06bdce5ecc0ee66384ef0e420e nginx-naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE sha256 d0732bc23658db5b9749e3f9cd4fe0f9b3e132b5955adccb08821845fe2a21c8 naxsi_src/ext/libinjection/COPYING diff --git a/package/nginx-naxsi/nginx-naxsi.mk b/package/nginx-naxsi/nginx-naxsi.mk index 2dba8ad5892c..84d167a663bb 100644 --- a/package/nginx-naxsi/nginx-naxsi.mk +++ b/package/nginx-naxsi/nginx-naxsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_NAXSI_VERSION = 1.3 +NGINX_NAXSI_VERSION = d714f1636ea49a9a9f4f06dba14aee003e970834 NGINX_NAXSI_SITE = $(call github,nbs-system,naxsi,$(NGINX_NAXSI_VERSION)) NGINX_NAXSI_LICENSE = GPL-3.0, BSD-3-Clause (libinjection) NGINX_NAXSI_LICENSE_FILES = LICENSE naxsi_src/ext/libinjection/COPYING From bfdf8873169c33ebc6e1ce5844fbfe841d97555f Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 15 Apr 2023 10:14:12 +0200 Subject: [PATCH 0243/2890] package/zstd: bump version to 1.5.5 - remove 0001-Fix-zstd-dll-build-missing-dependencies-3496.patch (from upstream, see [1]) For details see [2]. [1] https://github.com/facebook/zstd/commit/c78f434aa4f5f1097c8edb975f4c1635817a5a71 [2] https://github.com/facebook/zstd/releases/tag/v1.5.5 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...-dll-build-missing-dependencies-3496.patch | 321 ------------------ package/zstd/zstd.hash | 4 +- package/zstd/zstd.mk | 2 +- 3 files changed, 3 insertions(+), 324 deletions(-) delete mode 100644 package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch diff --git a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch deleted file mode 100644 index 60737159c6f9..000000000000 --- a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch +++ /dev/null @@ -1,321 +0,0 @@ -From e47c7c0d5a923dcdc3b302f9944eb4a70b7ee0be Mon Sep 17 00:00:00 2001 -From: Yonatan Komornik <11005061+yoniko@users.noreply.github.com> -Date: Sun, 12 Feb 2023 12:32:31 -0800 -Subject: [PATCH] Fix zstd-dll build missing dependencies (#3496) - -* Fixes zstd-dll build (https://github.com/facebook/zstd/issues/3492): -- Adds pool.o and threading.o dependency to the zstd-dll target -- Moves custom allocation functions into header to avoid needing to add dependency on common.o -- Adds test target for zstd-dll -- Adds github workflow that buildis zstd-dll - -[nolange79: backport from upstream c78f434aa4f5f1097c8edb975f4c1635817a5a71] -Signed-off-by: Norbert Lange ---- - .github/workflows/dev-short-tests.yml | 9 +++- - contrib/linux-kernel/zstd_common_module.c | 3 -- - lib/common/allocations.h | 55 +++++++++++++++++++++++ - lib/common/pool.c | 2 +- - lib/common/zstd_common.c | 35 --------------- - lib/common/zstd_internal.h | 5 --- - lib/compress/zstd_compress.c | 1 + - lib/compress/zstd_cwksp.h | 1 + - lib/compress/zstdmt_compress.c | 1 + - lib/decompress/zstd_ddict.c | 1 + - lib/decompress/zstd_decompress.c | 1 + - programs/Makefile | 2 +- - tests/Makefile | 8 +++- - 13 files changed, 76 insertions(+), 48 deletions(-) - create mode 100644 lib/common/allocations.h - -diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml -index 132dbb99..3ae2e9da 100644 ---- a/.github/workflows/dev-short-tests.yml -+++ b/.github/workflows/dev-short-tests.yml -@@ -55,6 +55,14 @@ jobs: - run: | - make c89build V=1 - -+ build-zstd-dll: -+ runs-on: ubuntu-latest -+ steps: -+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3 -+ - name: build zstd bin against a dynamic lib (debuglevel for more dependencies) -+ run: | -+ make -C lib lib-mt-release -+ DEBUGLEVEL=2 make -C programs zstd-dll - - gcc-7-libzstd: - runs-on: ubuntu-latest -@@ -328,7 +336,6 @@ jobs: - make -j -C programs allVariants MOREFLAGS=-O0 - ./tests/test-variants.sh - -- - qemu-consistency: - name: QEMU ${{ matrix.name }} - runs-on: ubuntu-20.04 -diff --git a/contrib/linux-kernel/zstd_common_module.c b/contrib/linux-kernel/zstd_common_module.c -index 2fead39e..466828e3 100644 ---- a/contrib/linux-kernel/zstd_common_module.c -+++ b/contrib/linux-kernel/zstd_common_module.c -@@ -24,9 +24,6 @@ EXPORT_SYMBOL_GPL(HUF_readStats_wksp); - EXPORT_SYMBOL_GPL(ZSTD_isError); - EXPORT_SYMBOL_GPL(ZSTD_getErrorName); - EXPORT_SYMBOL_GPL(ZSTD_getErrorCode); --EXPORT_SYMBOL_GPL(ZSTD_customMalloc); --EXPORT_SYMBOL_GPL(ZSTD_customCalloc); --EXPORT_SYMBOL_GPL(ZSTD_customFree); - - MODULE_LICENSE("Dual BSD/GPL"); - MODULE_DESCRIPTION("Zstd Common"); -diff --git a/lib/common/allocations.h b/lib/common/allocations.h -new file mode 100644 -index 00000000..a3153c4b ---- /dev/null -+++ b/lib/common/allocations.h -@@ -0,0 +1,55 @@ -+/* -+ * Copyright (c) Meta Platforms, Inc. and affiliates. -+ * All rights reserved. -+ * -+ * This source code is licensed under both the BSD-style license (found in the -+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found -+ * in the COPYING file in the root directory of this source tree). -+ * You may select, at your option, one of the above-listed licenses. -+ */ -+ -+/* This file provides custom allocation primitives -+ */ -+ -+#define ZSTD_DEPS_NEED_MALLOC -+#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ -+ -+#include "mem.h" /* MEM_STATIC */ -+#define ZSTD_STATIC_LINKING_ONLY -+#include "../zstd.h" /* ZSTD_customMem */ -+ -+#ifndef ZSTD_ALLOCATIONS_H -+#define ZSTD_ALLOCATIONS_H -+ -+/* custom memory allocation functions */ -+ -+MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) -+{ -+ if (customMem.customAlloc) -+ return customMem.customAlloc(customMem.opaque, size); -+ return ZSTD_malloc(size); -+} -+ -+MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) -+{ -+ if (customMem.customAlloc) { -+ /* calloc implemented as malloc+memset; -+ * not as efficient as calloc, but next best guess for custom malloc */ -+ void* const ptr = customMem.customAlloc(customMem.opaque, size); -+ ZSTD_memset(ptr, 0, size); -+ return ptr; -+ } -+ return ZSTD_calloc(1, size); -+} -+ -+MEM_STATIC void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) -+{ -+ if (ptr!=NULL) { -+ if (customMem.customFree) -+ customMem.customFree(customMem.opaque, ptr); -+ else -+ ZSTD_free(ptr); -+ } -+} -+ -+#endif /* ZSTD_ALLOCATIONS_H */ -diff --git a/lib/common/pool.c b/lib/common/pool.c -index f3d9d085..d5ca5a78 100644 ---- a/lib/common/pool.c -+++ b/lib/common/pool.c -@@ -10,9 +10,9 @@ - - - /* ====== Dependencies ======= */ -+#include "../common/allocations.h" /* ZSTD_customCalloc, ZSTD_customFree */ - #include "zstd_deps.h" /* size_t */ - #include "debug.h" /* assert */ --#include "zstd_internal.h" /* ZSTD_customCalloc, ZSTD_customFree */ - #include "pool.h" - - /* ====== Compiler specifics ====== */ -diff --git a/lib/common/zstd_common.c b/lib/common/zstd_common.c -index 32085524..3f04c22a 100644 ---- a/lib/common/zstd_common.c -+++ b/lib/common/zstd_common.c -@@ -14,7 +14,6 @@ - * Dependencies - ***************************************/ - #define ZSTD_DEPS_NEED_MALLOC --#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ - #include "error_private.h" - #include "zstd_internal.h" - -@@ -47,37 +46,3 @@ ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); } - /*! ZSTD_getErrorString() : - * provides error code string from enum */ - const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); } -- -- -- --/*=************************************************************** --* Custom allocator --****************************************************************/ --void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) --{ -- if (customMem.customAlloc) -- return customMem.customAlloc(customMem.opaque, size); -- return ZSTD_malloc(size); --} -- --void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) --{ -- if (customMem.customAlloc) { -- /* calloc implemented as malloc+memset; -- * not as efficient as calloc, but next best guess for custom malloc */ -- void* const ptr = customMem.customAlloc(customMem.opaque, size); -- ZSTD_memset(ptr, 0, size); -- return ptr; -- } -- return ZSTD_calloc(1, size); --} -- --void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) --{ -- if (ptr!=NULL) { -- if (customMem.customFree) -- customMem.customFree(customMem.opaque, ptr); -- else -- ZSTD_free(ptr); -- } --} -diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h -index 37836dc7..1f942f27 100644 ---- a/lib/common/zstd_internal.h -+++ b/lib/common/zstd_internal.h -@@ -350,11 +350,6 @@ typedef struct { - const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBuilder */ - int ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */ - --/* custom memory allocation functions */ --void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem); --void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem); --void ZSTD_customFree(void* ptr, ZSTD_customMem customMem); -- - - /* ZSTD_invalidateRepCodes() : - * ensures next compression will not use repcodes from previous block. -diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c -index b55f684c..173ce242 100644 ---- a/lib/compress/zstd_compress.c -+++ b/lib/compress/zstd_compress.c -@@ -11,6 +11,7 @@ - /*-************************************* - * Dependencies - ***************************************/ -+#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ - #include "../common/zstd_deps.h" /* INT_MAX, ZSTD_memset, ZSTD_memcpy */ - #include "../common/mem.h" - #include "hist.h" /* HIST_countFast_wksp */ -diff --git a/lib/compress/zstd_cwksp.h b/lib/compress/zstd_cwksp.h -index 97676693..9113cdbd 100644 ---- a/lib/compress/zstd_cwksp.h -+++ b/lib/compress/zstd_cwksp.h -@@ -14,6 +14,7 @@ - /*-************************************* - * Dependencies - ***************************************/ -+#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ - #include "../common/zstd_internal.h" - - #if defined (__cplusplus) -diff --git a/lib/compress/zstdmt_compress.c b/lib/compress/zstdmt_compress.c -index 7a2c7172..bf2de4a7 100644 ---- a/lib/compress/zstdmt_compress.c -+++ b/lib/compress/zstdmt_compress.c -@@ -20,6 +20,7 @@ - - - /* ====== Dependencies ====== */ -+#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ - #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memset, INT_MAX, UINT_MAX */ - #include "../common/mem.h" /* MEM_STATIC */ - #include "../common/pool.h" /* threadpool */ -diff --git a/lib/decompress/zstd_ddict.c b/lib/decompress/zstd_ddict.c -index ad5c34a7..309ec0d0 100644 ---- a/lib/decompress/zstd_ddict.c -+++ b/lib/decompress/zstd_ddict.c -@@ -14,6 +14,7 @@ - /*-******************************************************* - * Dependencies - *********************************************************/ -+#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ - #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ - #include "../common/cpu.h" /* bmi2 */ - #include "../common/mem.h" /* low level memory routines */ -diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c -index d487966c..3f3ca57c 100644 ---- a/lib/decompress/zstd_decompress.c -+++ b/lib/decompress/zstd_decompress.c -@@ -55,6 +55,7 @@ - /*-******************************************************* - * Dependencies - *********************************************************/ -+#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ - #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ - #include "../common/mem.h" /* low level memory routines */ - #define FSE_STATIC_LINKING_ONLY -diff --git a/programs/Makefile b/programs/Makefile -index fcff41dc..8507abef 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -225,7 +225,7 @@ zstd-noxz : zstd - .PHONY: zstd-dll - zstd-dll : LDFLAGS+= -L$(LIBZSTD) - zstd-dll : LDLIBS += -lzstd --zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c -+zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c pool.c threading.c - zstd-dll : zstd - - -diff --git a/tests/Makefile b/tests/Makefile -index 3eed19ea..778c7d67 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -95,7 +95,7 @@ allnothread: fullbench fuzzer paramgrill datagen decodecorpus - dll: fuzzer-dll zstreamtest-dll - - .PHONY: zstd zstd32 zstd-nolegacy # only external makefile knows how to build or update them --zstd zstd32 zstd-nolegacy: -+zstd zstd32 zstd-nolegacy zstd-dll: - $(MAKE) -C $(PRGDIR) $@ MOREFLAGS+="$(DEBUGFLAGS)" - - .PHONY: libzstd -@@ -328,13 +328,17 @@ test-all: test test32 test-decodecorpus-cli - test-zstd: ZSTD = $(PRGDIR)/zstd - test-zstd: zstd - -+.PHONY: test-zstd-dll -+test-zstd-dll: ZSTD = $(PRGDIR)/zstd -+test-zstd-dll: zstd-dll -+ - test-zstd32: ZSTD = $(PRGDIR)/zstd32 - test-zstd32: zstd32 - - test-zstd-nolegacy: ZSTD = $(PRGDIR)/zstd-nolegacy - test-zstd-nolegacy: zstd-nolegacy - --test-zstd test-zstd32 test-zstd-nolegacy: datagen -+test-zstd test-zstd32 test-zstd-nolegacy test-zstd-dll: datagen - file $(ZSTD) - EXE_PREFIX="$(QEMU_SYS)" ZSTD_BIN="$(ZSTD)" DATAGEN_BIN=./datagen ./playTests.sh $(ZSTDRTTEST) - --- -2.39.1 - diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index ca4e2fa0b9c9..abfb1d62e200 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,5 +1,5 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz.sha256 -sha256 0f470992aedad543126d06efab344dc5f3e171893810455787d38347343a4424 zstd-1.5.4.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz.sha256 +sha256 9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4 zstd-1.5.5.tar.gz # License files (locally computed) sha256 7055266497633c9025b777c78eb7235af13922117480ed5c674677adc381c9d8 LICENSE diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 45e8bf1bc2a1..e25202fd63c0 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.4 +ZSTD_VERSION = 1.5.5 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From 8f646eb2a124098bc7c34373a4921a19d436f26e Mon Sep 17 00:00:00 2001 From: Stefan Ott Date: Thu, 13 Apr 2023 00:40:39 +0200 Subject: [PATCH 0244/2890] package/eudev: fix compile-time issue with very old kernel headers Kernel versions prior to 3.4 did not have V4L2_CAP_DEVICE_CAPS and compiling against such a kernel will fail. This patch introduces a version check and makes eudev fall back to v2cap.capabilities on these kernels. Signed-off-by: Stefan Ott Signed-off-by: Yann E. MORIN --- ...mpile-time-issue-on-very-old-kernels.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch diff --git a/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch b/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch new file mode 100644 index 000000000000..46961cc9d103 --- /dev/null +++ b/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch @@ -0,0 +1,44 @@ +From 09b536e0b9d0964674936901ab9d2954f935c8b4 Mon Sep 17 00:00:00 2001 +From: Stefan Ott +Date: Wed, 5 Apr 2023 18:20:37 +0200 +Subject: [PATCH] Fix compile-time issue on very old kernels + +Kernel versions prior to 3.4 did not have V4L2_CAP_DEVICE_CAPS and +compiling against such a kernel will fail. + +This patch introduces a version check and makes eudev fall back to +v2cap.capabilities on these kernels. + +Upstream: https://github.com/eudev-project/eudev/commit/09b536e0b9d0964674936901ab9d2954f935c8b4 +Signed-off-by: Stefan Ott +--- + src/v4l_id/v4l_id.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c +index 6bf45effe..702d5b687 100644 +--- a/src/v4l_id/v4l_id.c ++++ b/src/v4l_id/v4l_id.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include "util.h" +@@ -71,9 +72,11 @@ int main(int argc, char *argv[]) { + printf("ID_V4L_VERSION=2\n"); + printf("ID_V4L_PRODUCT=%s\n", v2cap.card); + printf("ID_V4L_CAPABILITIES=:"); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) + if (v2cap.capabilities & V4L2_CAP_DEVICE_CAPS) + capabilities = v2cap.device_caps; + else ++#endif + capabilities = v2cap.capabilities; + if ((capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0 || + (capabilities & V4L2_CAP_VIDEO_CAPTURE_MPLANE) > 0) +-- +2.40.0 + From 53bad8f502687c5430cd7a4dc852314a3d75be2c Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 11 Apr 2023 22:39:30 +0200 Subject: [PATCH 0245/2890] package/openocd: bump to 0.12.0 As reported by [1], version 0.12.0 fixes these errors: Error executing event examine-end on target stm32f7x.cpu: buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl:37: Error: wrong # args: should be "expr expression" in procedure 'mmw' called at file "buildroot/output/host/bin/../share/openocd/scripts/target/stm32f7x.cfg", line 103 at file "buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl", line 37 Info : starting gdb server for stm32f7x.cpu on 3333 Info : Listening on port 3333 for gdb connections Info : Unable to match requested speed 2000 kHz, using 1800 kHz Info : Unable to match requested speed 2000 kHz, using 1800 kHz Error executing event examine-end on target stm32f7x.cpu: buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl:37: Error: wrong # args: should be "expr expression" in procedure 'ocd_process_reset' in procedure 'ocd_process_reset_inner' called at file "embedded:startup.tcl", line 288 in procedure 'mmw' called at file "buildroot/output/host/bin/../share/openocd/scripts/target/stm32f7x.cfg", line 103 at file "buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl", line 37 target halted due to debug-request, current mode: Thread xPSR: 0x01000000 pc: 0x080003fc msp: 0x20050000 Error executing event reset-init on target stm32f7x.cpu: buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl:37: Error: wrong # args: should be "expr expression" in procedure 'ocd_process_reset' in procedure 'ocd_process_reset_inner' called at file "embedded:startup.tcl", line 288 in procedure 'mmw' called at file "buildroot/output/host/bin/../share/openocd/scripts/board/stm32f769i-disco.cfg", line 71 at file "buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl", line 37 Remove upstream patches. The new version moves the GPL-2.0 license from COPYING to the subfolder "preferred", adding the header required by spdxcheck.py. A minimalist COPYING is added in the top directory, as required by automake, pointing to the files in LICENSES. [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014849 Signed-off-by: Dario Binacchi [yann.morin.1998@free.fr: - one license or license file per line - reorder licenses to match file order ] Signed-off-by: Yann E. MORIN --- ...ac-fix-autoreconf-with-autoconf-2.70.patch | 32 ------- ...GV-with-libusb-v1.0.24-33-g32a2206-1.patch | 89 ------------------- package/openocd/openocd.hash | 18 +++- package/openocd/openocd.mk | 33 ++++++- 4 files changed, 44 insertions(+), 128 deletions(-) delete mode 100644 package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch delete mode 100644 package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch diff --git a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch b/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch deleted file mode 100644 index ecb716b6fa0f..000000000000 --- a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3106d16bbc45de52bc0a8b638a84aa9d7c9abc46 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 6 Oct 2021 17:43:16 +0200 -Subject: [PATCH] configure.ac: fix autoreconf with autoconf >= 2.70 - -Fix the following build failure raised with openocd and autoconf >= 2.70 -due to -http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=aba75f6d4a9c875a9d5d90a07c6b3678db66a4bf: - ->>> openocd 0.11.0 Autoreconfiguring -autoreconf: error: configure.ac: AC_INIT not found; not an autoconf script? - -Fixes: - - http://autobuild.buildroot.org/results/5fb7aa28703aff61ba850eac11bd35c8804528ae - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/msteveb/jimtcl/pull/209] ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/jimtcl/configure.ac b/jimtcl/configure.ac -index b70b5d8..8c45114 100644 ---- a/jimtcl/configure.ac -+++ b/jimtcl/configure.ac -@@ -1 +1,3 @@ - # Dummy configure.ac to make automake happy -+AC_INIT([jimtcl], [0.80]) -+AC_OUTPUT --- -2.33.0 - diff --git a/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch b/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch deleted file mode 100644 index 776816892b30..000000000000 --- a/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch +++ /dev/null @@ -1,89 +0,0 @@ -From cff0e417da58adef1ceef9a63a99412c2cc87ff3 Mon Sep 17 00:00:00 2001 -From: Antonio Borneo -Date: Wed, 23 Jun 2021 16:52:16 +0200 -Subject: [PATCH] stlink: fix SIGSEGV with libusb v1.0.24-33-g32a2206 (11618) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The stlink driver incorrectly uses a NULL pointer for libusb's -struct libusb_context. -The correct value to be used is local in libusb_helper.c. - -Move in the helper file, in a wrapper function, the only call that -requires the above value, and let stlink driver to use this -wrapper. - -This issue has not triggered any visible problem until a code -refactoring [1] in libusb has made OpenOCD crashing on Windows and -on MacOS. - -Change-Id: Id1818c8af7cf0d4d17dfa1d22aad079da01ef740 -Signed-off-by: Antonio Borneo -Fixes: https://sourceforge.net/p/openocd/tickets/308/ -Fixes: https://github.com/libusb/libusb/issues/928/ -Fixes: 42d8fa899c6a ("stlink_usb: Submit multiple USB URBs at once to improve performance") -Link: [1] https://github.com/libusb/libusb/commit/32a22069428c -Reported-by: Andrzej Sierżęga -Co-developed-by: Andrzej Sierżęga -Co-developed-by: Xiaofan Chen -Reviewed-on: http://openocd.zylin.com/6331 -Tested-by: jenkins -Reviewed-by: Marc Schink -Reviewed-by: Xiaofan -Reviewed-by: Andrzej Sierżęga -Reviewed-by: Oleksij Rempel -Reviewed-by: Andreas Fritiofson -Signed-off-by: Yannick Brosseau ---- - src/jtag/drivers/libusb_helper.c | 5 +++++ - src/jtag/drivers/libusb_helper.h | 1 + - src/jtag/drivers/stlink_usb.c | 7 +------ - 3 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/src/jtag/drivers/libusb_helper.c b/src/jtag/drivers/libusb_helper.c -index f0122d534..18fe4bad4 100644 ---- a/src/jtag/drivers/libusb_helper.c -+++ b/src/jtag/drivers/libusb_helper.c -@@ -363,3 +363,8 @@ int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid) - - return ERROR_FAIL; - } -+ -+int jtag_libusb_handle_events_completed(int *completed) -+{ -+ return libusb_handle_events_completed(jtag_libusb_context, completed); -+} -diff --git a/src/jtag/drivers/libusb_helper.h b/src/jtag/drivers/libusb_helper.h -index fa7d06e28..3e77865d6 100644 ---- a/src/jtag/drivers/libusb_helper.h -+++ b/src/jtag/drivers/libusb_helper.h -@@ -60,5 +60,6 @@ int jtag_libusb_choose_interface(struct libusb_device_handle *devh, - unsigned int *usb_write_ep, - int bclass, int subclass, int protocol, int trans_type); - int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid); -+int jtag_libusb_handle_events_completed(int *completed); - - #endif /* OPENOCD_JTAG_DRIVERS_LIBUSB_HELPER_H */ -diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c -index c68bbb3ca..7b1932b9f 100644 ---- a/src/jtag/drivers/stlink_usb.c -+++ b/src/jtag/drivers/stlink_usb.c -@@ -497,13 +497,8 @@ static void sync_transfer_wait_for_completion(struct libusb_transfer *transfer) - { - int r, *completed = transfer->user_data; - -- /* Assuming a single libusb context exists. There no existing interface into this -- * module to pass a libusb context. -- */ -- struct libusb_context *ctx = NULL; -- - while (!*completed) { -- r = libusb_handle_events_completed(ctx, completed); -+ r = jtag_libusb_handle_events_completed(completed); - if (r < 0) { - if (r == LIBUSB_ERROR_INTERRUPTED) - continue; --- -2.35.1 - diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash index 91eb56d930ea..938711d86c0f 100644 --- a/package/openocd/openocd.hash +++ b/package/openocd/openocd.hash @@ -1,3 +1,15 @@ -# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/ -sha256 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d openocd-0.11.0.tar.bz2 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +# From http://sourceforge.net/projects/openocd/files/openocd/0.12.0/ +sha256 af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa openocd-0.12.0.tar.bz2 +sha256 1b8f7e37ee5afbbf95c2a4d62b12b25232e29538692663b434318503a9a88419 COPYING +sha256 034da732b4f3079b8783fff756613c1cff89dec5ac80c5cdd90532b7539922a1 LICENSES/exceptions/eCos-exception-2.0 +sha256 0a37155eb8bc0cb94477a0cae4f030e39da9317374e8a9f597e9229fd09aff78 LICENSES/license-rules.txt +sha256 f3ba76203a7b6993db31f987559cc4c621ae1ff78119ced2a669756c2c5fd3b1 LICENSES/preferred/BSD-1-Clause +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSES/preferred/BSD-2-Clause +sha256 1483f15e9fddc73b5df0acab1c42d21ecd0bf6ade8a79179fb90c09f13d03dcd LICENSES/preferred/BSD-2-Clause-Views +sha256 7a83b1aeb460458db9a4bd521d7f237c45b1650f6e60ea5ffc71e49472454de3 LICENSES/preferred/BSD-3-Clause +sha256 5cf024f6e3611d5c6fb98748d1a0ad99b8cf9ffe46f2d60fa10c299cd29e0a75 LICENSES/preferred/BSD-Source-Code +sha256 f35396f4095619f986736ca5e2976b313d381463a35c921c9ae677cc7eb83e28 LICENSES/preferred/GFDL-1.2 +sha256 76515be2d7334a1a038f775238c9a4c2b37e19514248e5eea0434cdfee526f9d LICENSES/preferred/gfdl-1.2.texi.readme +sha256 7d35bc44da7bb763022e3c2c32cfc0125dd222060bc50992420599d8e65f6c0a LICENSES/preferred/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT +sha256 9a41b56594cd89743ca72f188318c9871661847074dd16497ae0c695fe3ab9c9 LICENSES/stand-alone/GPL-3.0 diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 37a06ca848b7..9973498cf568 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -4,12 +4,37 @@ # ################################################################################ -OPENOCD_VERSION = 0.11.0 +OPENOCD_VERSION = 0.12.0 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION) -OPENOCD_LICENSE = GPL-2.0+ -OPENOCD_LICENSE_FILES = COPYING -# 0002-configure-enable-build-on-uclinux.patch patches configure.ac +OPENOCD_LICENSE = \ + eCos-exception-2.0, \ + BSD-1-clause, \ + BSD-2-clause, \ + BSD-2-Clause-Views, \ + BSD-3-clause, \ + BSD-Source-Code, \ + GFDL-1.2-no-invariants-or-later (docs), \ + GPL-2.0+ (code), \ + GPL-3.0+ (stand-alone code), \ + MIT + +OPENOCD_LICENSE_FILES = \ + COPYING \ + LICENSES/license-rules.txt \ + LICENSES/exceptions/eCos-exception-2.0 \ + LICENSES/preferred/BSD-1-Clause \ + LICENSES/preferred/BSD-2-Clause \ + LICENSES/preferred/BSD-2-Clause-Views \ + LICENSES/preferred/BSD-3-Clause \ + LICENSES/preferred/BSD-Source-Code \ + LICENSES/preferred/GFDL-1.2 \ + LICENSES/preferred/gfdl-1.2.texi.readme \ + LICENSES/preferred/GPL-2.0 \ + LICENSES/preferred/MIT \ + LICENSES/stand-alone/GPL-3.0 + +# 0001-configure-enable-build-on-uclinux.patch patches configure.ac OPENOCD_AUTORECONF = YES OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" From dcf91582637044e9137424752b1ea52e51b99358 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 11 Apr 2023 10:48:39 +0300 Subject: [PATCH 0246/2890] package/bubblewrap: bump to version 0.8.0 This version allows disabling usage of nested user namespaces and improves error messages. Release notes: https://github.com/containers/bubblewrap/releases/tag/v0.8.0 Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/bubblewrap/bubblewrap.hash | 4 ++-- package/bubblewrap/bubblewrap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash index 0475f8882a91..abc69d96be99 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,5 +1,5 @@ -# From https://github.com/containers/bubblewrap/releases/tag/v0.7.0 -sha256 764ab7100bd037ea53d440d362e099d7a425966bc62d1f00ab26b8fbb882a9dc bubblewrap-0.7.0.tar.xz +# From https://github.com/containers/bubblewrap/releases/tag/v0.8.0 +sha256 957ad1149db9033db88e988b12bcebe349a445e1efc8a9b59ad2939a113d333a bubblewrap-0.8.0.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 658e6e113c80..1081db697dac 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.7.0 +BUBBLEWRAP_VERSION = 0.8.0 BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap From 53baedf9126cf14f8ef80d4170ad9e9f1667fd65 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Mon, 10 Apr 2023 20:50:16 +0300 Subject: [PATCH 0247/2890] package/xr819-xradio: bump version With introduction of vmap'ed stacks to ARM in Linux v5.18, stack parameters can no longer be used for DMA. So pull the latest xradio changes that fix the driver and make it work with vmap'ed stacks in new kernels. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- package/xr819-xradio/xr819-xradio.hash | 2 +- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 60185db7363f..8676f065f82c 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2b297fbcc9b5ed190bcfff9f6f808c170632ac3d69dbd92156a7f4f57142dec9 xr819-xradio-005f28cfe9e20b7f2dfd9d32d38ee97060dc707f.tar.gz +sha256 93388424f1f136db541ce056be017f2f0f6688278ac15a88bef34da8f12ffea6 xr819-xradio-119cad7d07aef6973dd44e4dae74d4c9defd06a2.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index e5daaa60511d..66c08e79215a 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 005f28cfe9e20b7f2dfd9d32d38ee97060dc707f +XR819_XRADIO_VERSION = 119cad7d07aef6973dd44e4dae74d4c9defd06a2 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From 906789c758c677097b51c5637921dd02312ebec4 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Mon, 10 Apr 2023 20:50:17 +0300 Subject: [PATCH 0248/2890] configs/orangepi_zero: bump BSP versions Bump Linux to 6.1.14 and U-Boot to 2023.01 Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- configs/orangepi_zero_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 464e075e5c3f..40269db233ab 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" @@ -31,7 +31,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From c64135e9faf1a2336c967799979265b9cdd1dc54 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Mon, 10 Apr 2023 20:50:18 +0300 Subject: [PATCH 0249/2890] configs/orangepi_zero_plus2: update BSP versions Bump Linux kernel to 6.1.14, U-Boot to 2023.01, ATF to 2.8. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- configs/orangepi_zero_plus2_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index ef171c3ad302..377e9f1c5915 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -2,14 +2,14 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.8" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -17,7 +17,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -31,7 +31,7 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" From 5b00b40a05437e1042b25c097b977d5a26bdee1d Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Mon, 3 Apr 2023 09:41:03 -0500 Subject: [PATCH 0250/2890] docs/manual: rewrite section for upstream documentation Previously, the documentation only requested links to upstream commits when backporting patches. Based on a mailing list discussion [0], patches should, when possible and when approriate, provide a link as evidence that the patch has been submitted upstream. The motivation is that hopefully the patch gets applied to upstream at some point reducing the long term maintenance burden within Buildroot. This also makes future patch review on subsequent package version bumps more streamlined. For patches that are unique to BR and do not apply to the upstream repository, patches should have a comment explaining why they do not apply upstream. [0] https://lists.buildroot.org/pipermail/buildroot/2023-March/666000.html Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- docs/manual/patch-policy.txt | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt index 063ef984d824..dc35132ecfd2 100644 --- a/docs/manual/patch-policy.txt +++ b/docs/manual/patch-policy.txt @@ -144,24 +144,37 @@ AC_PROG_MAKE_SET +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) --------------- -=== Integrating patches found on the Web +=== Additional patch documentation -When integrating a patch of which you are not the author, you have to -add a few things in the header of the patch itself. +Ideally, all patches should document an upstream patch or patch submission, when +applicable, via the +Upstream+ trailer. -Depending on whether the patch has been obtained from the project -repository itself, or from somewhere on the web, add one of the -following tags: +When backporting an upstream patch that has been accepted into mainline, it is +preferred that the URL to the commit is referenced: --------------- -Backported from: +Upstream: --------------- -or +If a new issue is identified in Buildroot and upstream is generally affected by +the issue (it's not a Buildroot specific issue), users should submit the patch +upstream and provide a link to that submission when possible: --------------- -Fetch from: +Upstream: --------------- -It is also sensible to add a few words about any changes to the patch -that may have been necessary. +Patches that have been submitted but were denied upstream should note that and +include comments about why the patch is being used despite the upstream status. + +Note: in any of the above scenarios, it is also sensible to add a few words +about any changes to the patch that may have been necessary. + +If a patch does not apply upstream then this should be noted with a comment: + +--------------- +Upstream: N/A +--------------- + +Adding this documentation helps streamline the patch review process during +package version updates. \ No newline at end of file From 32934b526b647fc30bb0041b7b9f18bd765f7567 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Mon, 3 Apr 2023 09:41:04 -0500 Subject: [PATCH 0251/2890] utils/checkpackagelib: check for Upstream trailers Implement a check-package check for an Upstream: trailer in patches being applied to packages per a mailing list discussion [0]. No strict formatting checks are implemented for the contents within the trailer as the needed level of detail will vary patch-to-patch. Tested with: `./utils/docker-run python3 -m pytest utils/checkpackagelib` [0] https://lists.buildroot.org/pipermail/buildroot/2023-March/666016.html Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- utils/checkpackagelib/lib_patch.py | 18 ++++++++++++++++++ utils/checkpackagelib/test_lib_patch.py | 22 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/utils/checkpackagelib/lib_patch.py b/utils/checkpackagelib/lib_patch.py index caee36158fe4..1909d3acd063 100644 --- a/utils/checkpackagelib/lib_patch.py +++ b/utils/checkpackagelib/lib_patch.py @@ -61,3 +61,21 @@ def after(self): return ["{}:0: missing Signed-off-by in the header " "({}#_format_and_licensing_of_the_package_patches)" .format(self.filename, self.url_to_manual)] + +class Upstream(_CheckFunction): + UPSTREAM_ENTRY = re.compile(r"^Upstream: .*$") + + def before(self): + self.found = False + + def check_line(self, lineno, text): + if self.found: + return + if self.UPSTREAM_ENTRY.search(text): + self.found = True + + def after(self): + if not self.found: + return ["{}:0: missing Upstream in the header " + "({}#_additional_patch_documentation)" + .format(self.filename, self.url_to_manual)] diff --git a/utils/checkpackagelib/test_lib_patch.py b/utils/checkpackagelib/test_lib_patch.py index 3b6fadf38cfa..f7487ef3290e 100644 --- a/utils/checkpackagelib/test_lib_patch.py +++ b/utils/checkpackagelib/test_lib_patch.py @@ -94,3 +94,25 @@ def test_NumberedSubject(testname, filename, string, expected): def test_Sob(testname, filename, string, expected): warnings = util.check_file(m.Sob, filename, string) assert warnings == expected + + +Upstream = [ + ('good', + 'patch', + 'Upstream: https://some/amazing/patch/submission\n', + []), + ('empty', + 'patch', + '', + [['patch:0: missing Upstream in the header (url#_additional_patch_documentation)']]), + ('bad', + 'patch', + 'Subject: [PATCH 24/105] text\n', + [['patch:0: missing Upstream in the header (url#_additional_patch_documentation)']]), + ] + + +@pytest.mark.parametrize('testname,filename,string,expected', Upstream) +def test_Upstream(testname, filename, string, expected): + warnings = util.check_file(m.Upstream, filename, string) + assert warnings == expected From 1ed07521322d5d0ec262883169443af912db30f3 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Mon, 3 Apr 2023 09:41:05 -0500 Subject: [PATCH 0252/2890] .checkpackageignore: add entries missing Upstream trailer Due to the sheer number of patches that fail the new Upstream trailer check (1500+) and the time it would take to make them compliant, for now, just add them to the ignore list. Created via `./utils/docker-run make .checkpackageignore` Signed-off-by: Vincent Fazio [yann.morin.1998@free.fr: regenerate] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1647 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 1588 insertions(+), 59 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index cf58e59198cb..4847cd82bc75 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1,12 +1,16 @@ board/aarch64-efi/post-image.sh Shellcheck board/amarula/vyasa/post-build.sh Shellcheck +board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch Upstream +board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch Upstream board/andes/ae350/post-build.sh Shellcheck board/arcturus/aarch64-ucls1012a/post-build.sh Shellcheck board/arcturus/aarch64-ucls1012a/post-image.sh Shellcheck board/aspeed/common/post-image.sh Shellcheck board/asus/tinker/post-build.sh Shellcheck board/atmel/flasher.sh Shellcheck +board/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch Upstream board/beaglebone/post-build.sh Shellcheck +board/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch Upstream board/beagleboneai/post-build.sh Shellcheck board/beaglev/post-build.sh Shellcheck board/beelink/gs1/post-build.sh Shellcheck @@ -22,33 +26,37 @@ board/canaan/k210-soc/post-build.sh Shellcheck board/canaan/k210-soc/rootfs_overlay/sbin/init Shellcheck board/chromebook/elm/sign.sh Shellcheck board/chromebook/mksd.sh Shellcheck -board/chromebook/snow/linux-4.15-dts-tpm.patch ApplyOrder +board/chromebook/snow/linux-4.15-dts-tpm.patch ApplyOrder Upstream board/chromebook/snow/sign.sh Shellcheck +board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch Upstream board/cubietech/cubieboard2/post-image.sh Shellcheck board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck board/freescale/common/imx/post-image.sh Shellcheck board/freescale/common/mxs/post-image.sh Shellcheck +board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch Upstream board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck board/hardkernel/odroidc2/post-image.sh Shellcheck board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables board/hardkernel/odroidxu4/post-image.sh EmptyLastLine Shellcheck +board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch Upstream board/intel/galileo/post-build.sh Shellcheck board/intel/galileo/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables board/kontron/bl-imx8mm/post-build.sh Shellcheck -board/kontron/pitx-imx8m/patches/uboot/2022.04/0001-tools-mkeficapsule-use-pkg-config-to-get-luuid-and-l.patch NumberedSubject +board/kontron/pitx-imx8m/patches/uboot/2022.04/0001-tools-mkeficapsule-use-pkg-config-to-get-luuid-and-l.patch NumberedSubject Upstream board/kontron/pitx-imx8m/post-build.sh Shellcheck board/kontron/smarc-sal28/post-build.sh Shellcheck board/lego/ev3/post-image.sh Shellcheck +board/lemaker/bananapro/patches/linux/0001-arch-arm-boot-dts-sun7i-a20-bananapro.dts-disable-00.patch Upstream board/lemaker/bananapro/post-build.sh Shellcheck board/lemaker/bananapro/post-image.sh Shellcheck board/mender/x86_64/post-image-efi.sh ConsecutiveEmptyLines board/minnowboard/post-build.sh Shellcheck board/nexbox/a95x/post-build.sh Shellcheck board/nexbox/a95x/post-image.sh Shellcheck -board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch NumberedSubject -board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch NumberedSubject -board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch NumberedSubject -board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch NumberedSubject +board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch NumberedSubject Upstream +board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch NumberedSubject Upstream +board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch NumberedSubject Upstream +board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch NumberedSubject Upstream board/olimex/a13_olinuxino/post-build.sh Shellcheck board/olimex/a20_olinuxino/post-build.sh Shellcheck board/olimex/a33_olinuxino/post-build.sh Shellcheck @@ -56,15 +64,27 @@ board/olpc/post-build.sh Shellcheck board/orangepi/common/post-build.sh Shellcheck board/orangepi/orangepi-lite2/post-build.sh Shellcheck board/orangepi/orangepi-one-plus/post-build.sh Shellcheck +board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch Upstream +board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch Upstream +board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch Upstream +board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch Upstream +board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch Upstream board/pine64/rock64/post-build.sh Shellcheck board/pine64/rockpro64/post-build.sh Shellcheck board/qemu/aarch64-sbsa/assemble-flash-images Shellcheck +board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch Upstream +board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch Upstream +board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch Upstream board/qemu/x86/post-build.sh Shellcheck board/qemu/x86_64/post-build.sh Shellcheck +board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch Upstream board/radxa/rockpi-n8/post-build.sh Shellcheck board/raspberrypi/post-build.sh Shellcheck board/raspberrypi/post-image.sh Shellcheck +board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch Upstream board/roseapplepi/post-build.sh Shellcheck +board/seeed/stm32mp157c-odyssey/patches/linux/0001-ARM-dts-stm32-fix-stm32mp157c-odyssey-card-detect.patch Upstream +board/sheevaplug/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch Upstream board/sifive/hifive-unleashed/post-build.sh Shellcheck board/solidrun/clearfog/post-build.sh Shellcheck board/solidrun/macchiatobin/post-build-mainline.sh Shellcheck @@ -79,213 +99,1719 @@ board/synopsys/axs10x/post-build.sh Shellcheck board/technologic/ts4900/post-image.sh Shellcheck board/toradex/apalis-imx6/post-image.sh Shellcheck board/udoo/common/post-build.sh Shellcheck +board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch Upstream board/versal/post-build.sh Shellcheck board/versal/post-image.sh Shellcheck TrailingSpace board/zynq/post-build.sh Shellcheck board/zynq/post-image.sh Shellcheck board/zynqmp/kria/kv260/kv260.sh Shellcheck TrailingSpace -board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch ApplyOrder +board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch ApplyOrder Upstream board/zynqmp/post-build.sh Shellcheck board/zynqmp/post-image.sh Shellcheck -package/alsamixergui/0001-misc-fixes.patch Sob +boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch Upstream +boot/at91bootstrap/0001-eabi-fix.patch Upstream +boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch Upstream +boot/at91bootstrap/0003-u-boot-relocation-fix.patch Upstream +boot/at91dataflashboot/0001-do-not-install.patch Upstream +boot/at91dataflashboot/0002-eabi-fixes.patch Upstream +boot/grub2/0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch Upstream +boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch Upstream +boot/lpc32xxcdl/0001-compiler_name.patch Upstream +boot/lpc32xxcdl/0002-delete_redundant_files.patch Upstream +boot/lpc32xxcdl/0003-libnosys_gnu.patch Upstream +boot/lpc32xxcdl/0004-slashes.patch Upstream +boot/mv-ddr-marvell/0001-Makefile-disable-stack-protection.patch Upstream +boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch Upstream +boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch Upstream +boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch Upstream +boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch Upstream +boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch Upstream +boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch Upstream +boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch Upstream +boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch Upstream +boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch Upstream +boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch Upstream +boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch Upstream +boot/syslinux/0011-extlinux-Use-the-host-toolchain-to-build.patch Upstream +boot/syslinux/0012-pull-in-sys-sysmacros-h-for-major-minor-makedev.patch Upstream +boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch Upstream +boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch Upstream +boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch Upstream +boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch Upstream +linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch Upstream +package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch Upstream +package/4th/0001-avoid-regen-during-install.patch Upstream +package/ace/0001-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch Upstream +package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch Upstream +package/acl/0001-Build-with-old-GCC-versions.patch Upstream +package/acpica/0001-build-do-not-use-Werror.patch Upstream +package/acpid/0001-dont-use-isfdtype.patch Upstream +package/alchemy/0001-toolchains-remove-hash-style-management.patch Upstream +package/alsamixergui/0001-misc-fixes.patch Sob Upstream +package/alsamixergui/0002-configure-fix-detection-of-fltk-libs.patch Upstream +package/am335x-pru-package/0001-install-does-not-build.patch Upstream +package/am33x-cm3/0001-fix-makefile.patch Upstream +package/am33x-cm3/0002-Makefile-unconditionally-disable-SSP.patch Upstream +package/am33x-cm3/0003-Makefile-unconditionally-disable-PIE.patch Upstream +package/am33x-cm3/0004-Makefile-add-fno-builtin.patch Upstream package/am33x-cm3/S93-am335x-pm-firmware-load Variables -package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch Sob +package/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch Upstream +package/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch Upstream +package/android-tools/0003-Fix-build-issue-with-uclibc.patch Upstream +package/android-tools/0004-Fix-build-issue-with-musl.patch Upstream +package/android-tools/0005-Use-pkgconf-to-get-libs-deps.patch Upstream +package/android-tools/0006-fix-big-endian-build.patch Upstream +package/android-tools/0007-include-cdefs-h-when-needed.patch Upstream +package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch Sob Upstream +package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch Upstream +package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch Upstream +package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch Upstream +package/apache/0001-cross-compile.patch Upstream +package/apache/0002-nios2_is_not_os2.patch Upstream package/apache/S50apache Indent Shellcheck Variables +package/apitrace/0001-thirdparty-libbacktrace-backtrace-h-include-config.h.patch Upstream +package/apitrace/0002-gltrace-Avoid-__libc_dlsym-and-__libc_dlopen_mode-on-GLIBC-2-34.patch Upstream +package/apr-util/0001-remove-checkapr.patch Upstream +package/apr/0001-sys-param-h.patch Upstream +package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch Upstream +package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch Upstream +package/arptables/0001-Fix-musl-build-issue.patch Upstream +package/arptables/0002-libarptc-libarptc_incl.c-fix-build-with-O0.patch Upstream +package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch Upstream +package/asterisk/0002-configure-fix-detection-of-libcrypt.patch Upstream +package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch Upstream +package/asterisk/0004-install-samples-need-the-data-files.patch Upstream +package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch Upstream +package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch Upstream +package/at-spi2-atk/0001-meson-add-tests-option.patch Upstream +package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch Upstream package/at/S99at Indent Variables +package/atest/0001-seq.h-fix-build-with-gcc-10.patch Upstream +package/attr/0001-build-with-older-GCCs.patch Upstream package/audit/S02auditd Shellcheck Variables +package/aufs-util/0001-remove-user-settings.patch Upstream +package/aufs-util/0002-no-check-ver.patch Upstream +package/aufs-util/0003-no-strip-lib.patch Upstream +package/aumix/0001-fix-incorrect-makefile-am.patch Upstream +package/autoconf/0001-dont-add-dirty-to-version.patch Upstream +package/automake/0001-noman.patch Upstream +package/avahi/0001-Fix-NULL-pointer-crashes-from-175.patch Upstream package/avahi/S05avahi-setup.sh Indent Variables package/avahi/S50avahi-daemon Indent Variables package/babeld/S50babeld Indent Shellcheck Variables +package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch Upstream +package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch Upstream +package/bash/0001-input.h-add-missing-include-on-stdio.h.patch Upstream +package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch Upstream +package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch Upstream +package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch Upstream +package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch Upstream +package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch Upstream +package/bc/0003-dc-fix-exit-code-of-q-command.patch Upstream +package/bc/0004-no-gen-libmath.patch Upstream +package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch Upstream +package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch Upstream +package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch Upstream +package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch Upstream +package/bearssl/0001-Fix-missing-objdir-dependency.patch Upstream +package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch Upstream +package/beecrypt/0002-build-system.patch Upstream +package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch Upstream +package/benejson/0001-c-std.patch Upstream +package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch Upstream +package/bento4/0001-Add-support-for-cmake-install.patch Upstream +package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch Upstream +package/bento4/0003-Backport-Smmothstream-changes.patch Upstream +package/bento4/0004-more-SPS-parameters.patch Upstream +package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch Upstream +package/bento4/0006-Implement-SPS-Frame-parser.patch Upstream +package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch Upstream +package/bento4/0008-Hack-HBO.patch Upstream +package/bento4/0009-Android-32-ftello-fix.patch Upstream +package/bento4/0010-Dazn-sample-duration-workaround.patch Upstream +package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch Upstream +package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch Upstream +package/bento4/0013-Add-GetChannels-method.patch Upstream +package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch Upstream +package/bento4/0015-Avoid-set-next-fragment-position.patch Upstream +package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch Upstream +package/berkeleydb/0001-cwd-db_config.patch Upstream +package/berkeleydb/0002-atomic_compare_exchange.patch Upstream +package/bind/0001-cross.patch Upstream package/bind/S81named Indent Shellcheck Variables +package/binutils/2.37/0001-sh-conf.patch Upstream +package/binutils/2.37/0002-poison-system-directories.patch Upstream +package/binutils/2.37/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch Upstream +package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch Upstream +package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch Upstream +package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch Upstream +package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch Upstream +package/binutils/2.38/0001-sh-conf.patch Upstream +package/binutils/2.38/0002-poison-system-directories.patch Upstream +package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch Upstream +package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch Upstream +package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch Upstream +package/binutils/2.39/0001-sh-conf.patch Upstream +package/binutils/2.39/0002-poison-system-directories.patch Upstream +package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch Upstream +package/binutils/arc-2020.09-release/0001-poison-system-directories.patch Upstream +package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch Upstream +package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch Upstream +package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch Upstream +package/bmx7/0002-Fix-linking-error.patch Upstream +package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch Upstream package/boinc/S99boinc-client Indent Shellcheck Variables +package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch Upstream +package/botan/0001-Add-superh-alias-needed-by-Debian.patch Upstream +package/botan/0002-src-build-data-arch-superh.txt-add-sh4-eb-aeb.patch Upstream package/brickd/S70brickd Indent Shellcheck Variables +package/bridge-utils/0001-fix-build-on-musl.patch Upstream +package/brltty/0001-Fix-linking-error-on-mips64el.patch Upstream +package/brltty/0002-shell-prologue-runProgramTerminationCommands-used-a-.patch Upstream package/brltty/S10brltty Indent Shellcheck Variables +package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch Upstream +package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch Upstream +package/bsdiff/0001-Add-missing-header-for-u_char.patch Upstream +package/bustle/0001-Makefile-fix-pcap-config-call.patch Upstream +package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch Upstream +package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch Upstream +package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch Upstream +package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch Upstream package/busybox/S02sysctl Variables package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck package/busybox/S15watchdog Indent Variables package/busybox/S50telnet Indent Shellcheck Variables package/busybox/udhcpc.script Shellcheck +package/bzip2/0001-build-objects-twice.patch Upstream +package/bzip2/0002-improve-build-system.patch Upstream +package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch Upstream package/c-icap/S96cicap Indent Shellcheck Variables +package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch Upstream +package/cache-calibrator/0001-Fix-conflicting-round-function.patch Upstream +package/cage/0001-Upgrade-to-wlroots-0.15.patch Upstream +package/cairo/0001-fix-nofork-build.patch Upstream +package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch Upstream +package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch Upstream +package/cairo/0004-Fix-mask-usage-in-image-compositor.patch Upstream +package/caps/0001-Fix-stdint-types-with-musl.patch Upstream +package/catatonit/0002-fix-build-with-kernel-5.9.patch Upstream +package/cdrkit/0001-no-rcmd.patch Upstream +package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch Upstream +package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch Upstream package/cfm/S65cfm Indent Variables +package/cgic/0001-prepare_makefile.patch Upstream +package/cgic/0002-file_enhancements.patch Upstream +package/cgic/0003-restore-cgiFormFileGetTempfileName.patch Upstream package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables +package/chipmunk/0001-Fix-build-failure-on-musl.patch Upstream +package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch Upstream package/chrony/S49chrony Indent Shellcheck Variables +package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch Upstream +package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch Upstream +package/cmake/0001-rename-cmake-rootfile.patch Upstream +package/cmocka/0001-Don-t-redefine-uintptr_t.patch Upstream +package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch Upstream +package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch Upstream +package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch Upstream +package/connman/0003-wispr-Update-portal-context-references.patch Upstream package/connman/S45connman Variables +package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch Upstream package/coremark-pro/coremark-pro.sh.in Shellcheck -package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob -package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob -package/curlftpfs/0003-nocache-memleak-fix.patch Sob +package/cpio/0001-Minor-fix.patch Upstream +package/cpio/0002-Rewrite-dynamic-string-support.patch Upstream +package/cpio/0003-Fix-previous-commit.patch Upstream +package/cppdb/0001-mysql-library-suffix.patch Upstream +package/cpulimit/0001-Fix-crash-and-compiler-warnings.patch Upstream +package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch Upstream +package/cpulimit/0003-Fix-an-infrequent-crash.patch Upstream +package/cpulimit/0004-Remove-procfs.h-inclusion.patch Upstream +package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch Upstream +package/crda/0002-drop-ldconfig-call.patch Upstream +package/crda/0003-drop-werror.patch Upstream +package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch Upstream +package/ctorrent/0001-fix-musl-build.patch Upstream +package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch Upstream +package/cups/0002-Do-not-use-genstrings.patch Upstream +package/cups/0003-Sanitize-the-installation-process.patch Upstream +package/cups/0004-Remove-PIE-flags-from-the-build.patch Upstream +package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob Upstream +package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob Upstream +package/curlftpfs/0003-nocache-memleak-fix.patch Sob Upstream +package/curlftpfs/0004-fix-musl-build-off-t.patch Upstream +package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch Upstream +package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch Upstream +package/cwiid/0002-configure-make-wmgui-build-optional.patch Upstream +package/dahdi-linux/0001-drivers-dahdi-Kbuild-fix-HOTPLUG_FIRMWARE-definition.patch Upstream +package/dahdi-linux/0002-fix-build-with-32-bits-kernel.patch Upstream +package/dahdi-linux/0003-Fixed-compilation-issues-on-linux-kernel-5-18-0.patch Upstream +package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch Upstream +package/dahdi-tools/0001-no-build-docs.patch Upstream +package/dahdi-tools/0002-no-perl-manpages.patch Upstream +package/dante/0001-fix-sparc-compile.patch Upstream +package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch Upstream package/dante/S50dante Indent Shellcheck Variables +package/daq/0001-Fix-build-against-the-musl-C-library.patch Upstream +package/daq/0002-parallel-grammar.patch Upstream package/darkhttpd/S50darkhttpd Indent Shellcheck Variables +package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch Upstream +package/dbus-cpp/0001-gcc4.7.patch Upstream +package/dbus-cpp/0002-cross-compile-tools.patch Upstream +package/dbus-cpp/0003-src-pipe.c-fix-build-error-with-gcc-7.x.patch Upstream package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables +package/dc3dd/0001-no_man.patch Upstream +package/dc3dd/0002-fix-autoreconf.patch Upstream +package/dc3dd/0003-fix-for-glibc-2.28.patch Upstream +package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch Upstream package/dcron/S90dcron Variables package/dhcp/S80dhcp-relay Shellcheck Variables package/dhcp/S80dhcp-server Shellcheck Variables package/dhcp/dhclient-script Shellcheck TrailingSpace package/dhcpcd/S41dhcpcd Indent Variables -package/dhrystone/0001-cmdline-nruns.patch Sob -package/dhrystone/0002-HZ.patch Sob -package/dhrystone/0003-exit.patch Sob -package/dhrystone/0004-headers.patch Sob -package/dhrystone/0005-prototypes.patch Sob -package/directfb-examples/0001-remove-bzero.patch Sob +package/dhcpdump/0001-use-non-bsd-structures.patch Upstream +package/dhrystone/0001-cmdline-nruns.patch Sob Upstream +package/dhrystone/0002-HZ.patch Sob Upstream +package/dhrystone/0003-exit.patch Sob Upstream +package/dhrystone/0004-headers.patch Sob Upstream +package/dhrystone/0005-prototypes.patch Sob Upstream +package/dht/0001-cmake.patch Upstream +package/diffutils/0001-m4-stack-direction.m4-fix-build-on-microblazeel.patch Upstream +package/diffutils/0002-sigsegv-fix-build-on-or1k.patch Upstream +package/diffutils/0003-sys_random-port-better-to-uClibc-1-0-35.patch Upstream +package/diffutils/0004-sigsegv-Fix-compilation-error-on-arceb-CPUs.patch Upstream +package/diffutils/0005-sigsegv-Add-support-for-Linux-PowerPC-32-bit-with-mu.patch Upstream +package/dillo/0001-usr-local-include.patch Upstream +package/dillo/0002-Fix-openssl-detection.patch Upstream +package/dillo/0004-fix-build-with-gcc-10.patch Upstream +package/directfb-examples/0001-remove-bzero.patch Sob Upstream +package/directfb/0001-fix-missing-davinci-voodoo-header.patch Upstream +package/directfb/0002-imlib2-config.patch Upstream +package/directfb/0003-setregion-lock.patch Upstream +package/directfb/0004-use-gcc-link.patch Upstream +package/directfb/0005-add-missing-idivine-header.patch Upstream +package/directfb/0006-fix-client-gfx_state-initialisation.patch Upstream +package/dmalloc/0001-configure-fix-build-on-mips.patch Upstream +package/dmalloc/0003-configure-allow-overriding-some-tests.patch Upstream +package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch Upstream +package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch Upstream +package/dmraid/0001-fix-compilation-under-musl.patch Upstream package/dmraid/S20dmraid Variables package/dnsmasq/S80dnsmasq Shellcheck Variables package/docker-engine/S60dockerd Indent Shellcheck Variables +package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch Upstream package/domoticz/S99domoticz Shellcheck +package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch Upstream +package/dracut/0001-dracut.sh-don-t-unset-LD_PRELOAD.patch Upstream package/dracut/merged-usr-module-setup.sh Shellcheck package/dropbear/S50dropbear Indent Shellcheck Variables +package/dt/0001-adjust-os-symlink.patch Upstream +package/dt/0002-dt-default-source-define.patch Upstream +package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch Upstream +package/duma/0001-fix-cross-compilation.patch Upstream +package/duma/0002-no-tests.patch Upstream +package/duma/0003-fix-C++14.patch Upstream +package/duma/0004-Fix-build-with-latest-glibc.patch Upstream +package/dvb-apps/0001-Fix-generate-keynames.patch Upstream +package/dvb-apps/0002-Fix-compiler-warning-flags.patch Upstream +package/dvb-apps/0003-handle-static-shared-only-build.patch Upstream +package/dvb-apps/0004-Makefile-remove-test.patch Upstream +package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch Upstream +package/dvb-apps/0006-fix-glibc-2.31.patch Upstream +package/dvblast/0001-missing-lm.patch Upstream +package/dvblast/0002-fix-int-types.patch Upstream +package/dvbsnoop/0001-musl-types-h.patch Upstream +package/dvdrw-tools/0001-limits.h.patch Upstream +package/dvdrw-tools/0002-Include-sysmacros.h-to-compile-with-newer-gcc.patch Upstream +package/e2fsprogs/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch Upstream +package/earlyoom/0001-main.c-fix-build-with-kernel-4.3.patch Upstream package/earlyoom/S02earlyoom Indent Shellcheck +package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch Upstream +package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch Upstream +package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch Upstream +package/ecryptfs-utils/0001-musl.patch Upstream +package/ecryptfs-utils/0002-openssl110.patch Upstream +package/ecryptfs-utils/0003-fix-parallel-build-issue.patch Upstream +package/efivar/0001-Allow-build-with-uClibc.patch Upstream +package/efivar/0002-gcc.specs-drop-Werror.patch Upstream +package/efivar/0003-efivar-isolate-makeguids-host-tool-build.patch Upstream +package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch Upstream +package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch Upstream +package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch Upstream +package/efl/0003-ecore_fb-fix-build-with-tslib.patch Upstream +package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch Upstream +package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch Upstream +package/ejabberd/0002-fix-ejabberdctl.patch Upstream +package/ejabberd/0003-correct-includes.patch Upstream package/ejabberd/S50ejabberd Indent Shellcheck Variables package/ejabberd/check-erlang-lib Shellcheck +package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch Upstream +package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch Upstream +package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch Upstream +package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch Upstream +package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch Upstream +package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch Upstream +package/elftosb/0001-fixes-includes.patch Upstream +package/elftosb/0002-force-cxx-compiler.patch Upstream +package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch Upstream +package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch Upstream +package/empty/0001-respect-LDFLAGS.patch Upstream +package/erlang-p1-sip/0001-correct-include.patch Upstream +package/erlang-p1-xmpp/0001-fix-includes.patch Upstream +package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch Upstream +package/erlang/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch Upstream +package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch Upstream +package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch Upstream +package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch Upstream +package/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch Upstream +package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch Upstream package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables +package/evemu/0001-Include-limits.h-for-PATH_MAX.patch Upstream +package/evemu/0002-evemu-Update-struct-input_event.patch Upstream +package/evemu/0003-src-evemu.c-fix-build-with-kernels-4.16.patch Upstream +package/evemu/0004-src-evemu.c-fix-build-with-kernels-4.16.patch Upstream +package/exim/0001-Build-buildconfig-for-the-host.patch Upstream +package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch Upstream +package/exim/0003-Skip-version-check-and-symlink-installation.patch Upstream +package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch Upstream +package/exim/0005-sieve-fix-build-errors.patch Upstream +package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch Upstream +package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch Upstream +package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch Upstream +package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch Upstream package/exim/S86exim Indent Variables +package/expect/0001-enable-cross-compilation.patch Upstream +package/expect/0002-allow-tcl-build-directory.patch Upstream +package/f2fs-tools/0001-configure-ac-fix-cross-compilation.patch Upstream +package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch Upstream +package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch Upstream +package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch Upstream +package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch Upstream package/fail2ban/S60fail2ban Shellcheck Variables package/fakedate/fakedate Shellcheck -package/fbv/0001-cross.patch Sob -package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob -package/fbv/0005-include.patch Sob +package/falcosecurity-libs/0001-cmake-Permit-setting-GRPC_CPP_PLUGIN.patch Upstream +package/fbgrab/0001-fix-static-build.patch Upstream +package/fbset/0001-Fix-musl-compile.patch Upstream +package/fbterm/0001-fbio.cpp-improxy.cpp-fbterm.cpp-fix-musl-compile.patch Upstream +package/fbterm/0002-mouse.cpp-fix-musl-compile.patch Upstream +package/fbterm/0003-C++11-compliance.patch Upstream +package/fbterm/0004-iconv.patch Upstream +package/fbv/0001-cross.patch Sob Upstream +package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob Upstream +package/fbv/0003-fix-bgr555.patch Upstream +package/fbv/0004-giflib.patch Upstream +package/fbv/0005-include.patch Sob Upstream +package/fbv/0006-libpng15.patch Upstream +package/fbv/0007-gif.c-fic-build-with-gcc-10.patch Upstream +package/fcgiwrap/0001-use-LIBS-from-configure.patch Upstream +package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch Upstream +package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch Upstream +package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch Upstream +package/ffmpeg/0003-libavutil-Fix-mips-build.patch Upstream +package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch Upstream +package/ficl/0001-fix-Makefile.patch Upstream +package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch Upstream +package/file/0001-src-file.c-fix-build-without-wide-support.patch Upstream +package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch Upstream +package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch Upstream +package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch Upstream +package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch Upstream +package/flite/0001-fix-alsa-static.patch Upstream +package/fltk/0001-disable-tests.patch Upstream +package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch Upstream +package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch Upstream +package/fluent-bit/0003-fix-build-without-C.patch Upstream +package/fluxbox/0001-fixes-bug-1138.patch Upstream +package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch Upstream +package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch Upstream +package/freeipmi/0001-add-disable-doc.patch Upstream +package/freeradius-client/0001-fix-for-nettle.patch Upstream +package/freerdp/0001-Fix-variable-declaration-in-loop.patch Upstream +package/freerdp/0002-Fixed-variable-declaration-in-loop.patch Upstream +package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch Upstream +package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch Upstream +package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch Upstream +package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch Upstream package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables +package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch Upstream +package/freescale-imx/imx-vpu-hantro/0002-Fix-build-with-uclibc-toolchain.patch Upstream +package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch Upstream +package/freeswitch/0001-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch Upstream package/frr/S50frr Shellcheck -package/gamin/0002-no-const-return.patch Sob -package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob -package/genromfs/0001-build-system.patch Sob +package/fstrcmp/0001-disable-rpath.patch Upstream +package/ftop/0001-overflow.patch Upstream +package/fwts/0001-build-do-not-use-Werror.patch Upstream +package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch Upstream +package/fxload/0001-fix-static-build.patch Upstream +package/gamin/0001-no-abstract-sockets.patch Upstream +package/gamin/0002-no-const-return.patch Sob Upstream +package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch Upstream +package/gawk/0001-Fix-a-bug-with-Node_elem_new.patch Upstream +package/gcc/10.4.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch Upstream +package/gcc/10.4.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch Upstream +package/gcc/10.4.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch Upstream +package/gcc/10.4.0/0004-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch Upstream +package/gcc/10.4.0/0005-disable-split-stack-for-non-thread-builds.patch Upstream +package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch Upstream +package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch Upstream +package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch Upstream +package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch Upstream +package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch Upstream +package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch Upstream +package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream +package/gcc/12.2.0/0002-fix-condvar.patch Upstream +package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch Upstream +package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch Upstream +package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch Upstream +package/gcc/8.4.0/0004-disable-split-stack-for-non-thread-builds.patch Upstream +package/gcc/arc-2020.09-release/0001-arc-Refurbish-adc-sbc-patterns.patch Upstream +package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob Upstream +package/gcc/arc-2020.09-release/0100-uclibc-conf.patch Upstream +package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch Upstream +package/gdal/0001-fix-uclibc-build-without-NPTL.patch Upstream +package/gdb/10.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream +package/gdb/10.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream +package/gdb/10.2/0003-use-asm-sgidefs.h.patch Upstream +package/gdb/10.2/0004-gdbserver-fix-build-for-m68k.patch Upstream +package/gdb/10.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch Upstream +package/gdb/10.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream +package/gdb/10.2/0007-fix-musl-build-on-riscv.patch Upstream +package/gdb/10.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream +package/gdb/10.2/0009-gdb-Fix-native-build-on-xtensa.patch Upstream +package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream +package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream +package/gdb/11.2/0003-use-asm-sgidefs.h.patch Upstream +package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch Upstream +package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch Upstream +package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream +package/gdb/11.2/0007-fix-musl-build-on-riscv.patch Upstream +package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream +package/gdb/11.2/0009-gdb-Fix-native-build-on-xtensa.patch Upstream +package/gdb/12.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream +package/gdb/12.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream +package/gdb/12.1/0003-use-asm-sgidefs.h.patch Upstream +package/gdb/12.1/0004-gdbserver-fix-build-for-m68k.patch Upstream +package/gdb/12.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch Upstream +package/gdb/12.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream +package/gdb/12.1/0007-fix-musl-build-on-riscv.patch Upstream +package/gdb/12.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream +package/gdb/12.1/0009-gdb-Fix-native-build-on-xtensa.patch Upstream +package/gengetopt/0001-configure.ac-add-disable-doc-option.patch Upstream +package/genpart/0001-fix-return-code.patch Upstream +package/genromfs/0001-build-system.patch Sob Upstream +package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch Upstream +package/gerbera/0001-Fix-build-with-fmt-9-0.patch Upstream package/gerbera/S99gerbera Indent +package/gettext-gnu/0001-error_print_progname.patch Upstream +package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch Upstream +package/giblib/0001-fix-imlib2-detection.patch Upstream +package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch Upstream +package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch Upstream +package/gli/0001-Optional-building-tests.patch Upstream +package/glib-networking/0001-meson-change-std-to-gnu99.patch Upstream +package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch Upstream +package/glmark2/0002-libmatrix-Add-missing-utility-include.patch Upstream +package/glog/0001-added-emscripten-support.patch Upstream +package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch Upstream +package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream +package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream +package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch Upstream +package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch Upstream +package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch Upstream +package/gnuplot/0001-configure-add-without-demo-option.patch Upstream +package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch Upstream +package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch Upstream +package/go/0001-build.go-explicit-option-for-crosscompilation.patch Upstream +package/gob2/0001-dont-include-from-prefix.patch Upstream +package/gobject-introspection/0001-disable-tests.patch Upstream +package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch Upstream +package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch Upstream +package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch Upstream package/google-breakpad/gen-syms.sh Shellcheck +package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch Upstream +package/gpm/0002-Install-unversioned-solibrary.patch Upstream +package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch Upstream +package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch Upstream +package/gpm/0005-fix-building-w-newer-glibc.patch Upstream +package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch Upstream package/gpsd/S50gpsd Indent Shellcheck Variables +package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch Upstream +package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch Upstream +package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch Upstream +package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch Upstream +package/grpc/0003-host-grpc-only-cpp-plugin.patch Upstream +package/grpc/0004-disable-unconditionally-downloading-api-repos.patch Upstream +package/gsl/0001-configure.ac-fix-build-on-powerpc.patch Upstream +package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch Upstream +package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch Upstream +package/guile/0001-calculate-csqrt_manually.patch Upstream +package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch Upstream +package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch Upstream +package/gutenprint/0001-use-pregen-xmli18n-header.patch Upstream +package/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch Upstream +package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch Upstream +package/harfbuzz/0001-meson.build-check-for-pthread.h.patch Upstream +package/haserl/0001-add-haserl_lualib.inc.patch Upstream package/haveged/S21haveged Shellcheck Variables +package/heirloom-mailx/0001-fix-libressl-support.patch Upstream +package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch Upstream +package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch Upstream +package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch Upstream +package/hplip/0001-build-use-pkg-config-to-discover-libusb.patch Upstream +package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch Upstream package/htpdate/S43htpdate Shellcheck +package/httping/0001-fix-math-library-linking.patch Upstream +package/httping/0002-Makefile-allow-build-without-gettext.patch Upstream package/i2pd/S99i2pd Indent Shellcheck Variables -package/ifplugd/0001-cross.patch Sob -package/ifplugd/0002-fix-headers.patch Sob +package/i7z/0001-fix-build-with-gcc-10.patch Upstream +package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch Upstream +package/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch Upstream +package/ibrcommon/0002-ibrcommon-added-openssl-1.1-compatibility-264.patch Upstream +package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch Upstream +package/icu/0001-dont-build-static-dynamic-twice.patch Upstream +package/icu/0002-workaround-toolchain-bugs.patch Upstream +package/icu/0003-link-icudata-as-data-only.patch Upstream +package/icu/0004-fix-static-linking-with-icu-uc.patch Upstream +package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch Upstream +package/ifplugd/0001-cross.patch Sob Upstream +package/ifplugd/0002-fix-headers.patch Sob Upstream +package/ifplugd/0003-no-cxx.patch Upstream +package/ifplugd/0004-musl-fix-types.patch Upstream +package/ifplugd/0005-src-interface.h-fix-build-with-gcc-10.patch Upstream +package/iftop/0001-ui_common.h-fix-build-with-gcc-10.patch Upstream +package/iftop/0002-Rename-pcap_filter-to-iftop_pcap_filter.patch Upstream package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables package/ifupdown-scripts/network/if-pre-up.d/wait_iface EmptyLastLine Shellcheck package/ifupdown-scripts/nfs_check Shellcheck +package/ifupdown/0001-archcommon-define-GNU-only-FNM_EXTMATCH-to-zero-on-n.patch Upstream +package/ifupdown/0001-dont-use-dpkg-architecture.patch Upstream package/igd2-for-linux/S99upnpd Indent Shellcheck Variables +package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch Upstream +package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch Upstream +package/imx-mkimage/0003-Add-unused-fake-version.patch Upstream +package/imx-mkimage/0004-Add-support-for-overriding-BL31-BL32-and-BL33.patch Upstream package/inadyn/S70inadyn Indent NotExecutable package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck package/initscripts/init.d/rcS ConsecutiveEmptyLines EmptyLastLine Shellcheck package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables +package/intel-gmmlib/0001-Drop-hardening-related-flags.patch Upstream +package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch Upstream +package/intltool/0001-perl-5.26-compatibility.patch Upstream +package/iodine/0001-disable-systemd-and-selinux.patch Upstream +package/iotop/0001-Fix-build-error-with-Python-3.patch Upstream +package/iozone/0001-Add-new-targets-for-iozone.patch Upstream +package/iperf/0001-fix-single-threaded-compile-breakage.patch Upstream +package/ipmitool/0001-configure.ac-fix-readline-static-build.patch Upstream +package/ipmitool/0002-Fix-enterprise-numbers-URL.patch Upstream +package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch Upstream +package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch Upstream +package/iprutils/0001-configure.ac-add-AC_USE_SYSTEM_EXTENSIONS.patch Upstream package/iptables/S35iptables Shellcheck -package/irda-utils/0001-daemon.patch Sob -package/irda-utils/0002-nommu.patch Sob -package/irda-utils/0003-subdir.patch Sob +package/irda-utils/0001-daemon.patch Sob Upstream +package/irda-utils/0002-nommu.patch Sob Upstream +package/irda-utils/0003-subdir.patch Sob Upstream +package/irda-utils/0004-musl.patch Upstream package/irqbalance/S13irqbalance Indent Shellcheck Variables +package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch Upstream +package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch Upstream package/iucode-tool/S00iucode-tool Variables package/iwd/S40iwd Shellcheck Variables -package/keyutils/0002-cifs.patch Sob +package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch Upstream +package/janet/0001-Update-for-more-minimal-builds.patch Upstream +package/janus-gateway/0001-disable-ssp.patch Upstream +package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch Upstream +package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch Upstream +package/jose/0002-man-add-option-to-skip-building-man-pages.patch Upstream +package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch Upstream +package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch Upstream +package/keepalived/0003-fix-build-with-libressl.patch Upstream +package/kexec-lite/0001-clean-restart.patch Upstream +package/keyutils/0001-fix-install-rule.patch Upstream +package/keyutils/0002-cifs.patch Sob Upstream +package/kmod/0001-fix-O_CLOEXEC.patch Upstream +package/kodi-texturepacker/0001-texturepacker.patch Upstream +package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch Upstream +package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch Upstream +package/kodi/0002-cmake-findpython.patch Upstream +package/kodi/0003-cmake-search-for-python-interpreter.patch Upstream +package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch Upstream package/kodi/S50kodi Shellcheck Variables -package/libart/0001-art-config-cross.patch Sob -package/libcgicc/0001-disable-documentation-option.patch Sob -package/libfcgi/0002-disable-examples.patch Sob -package/libftdi/0001-pkgconfig_libusb.patch Sob -package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch Sob +package/latencytop/0001-makefile.patch Upstream +package/lbase64/0001-retro-compatible-with-Lua-5.1.patch Upstream +package/lcdproc/0001-LCDd.conf.patch Upstream +package/lcdproc/0002-Add-missing-ioctl-header.patch Upstream +package/lcdproc/0003-Fixcompilation-with-GCC-10-x.patch Upstream +package/leafnode2/0001-cross_makefile.patch Upstream +package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch Upstream +package/let-me-create/0001-fix-build-with-musl-C-library.patch Upstream +package/leveldb/0001-Fix-compilation-with-g-4.8.2.patch Upstream +package/leveldb/0002-CMake-install-libmemenv.a.patch Upstream +package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch Upstream +package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch Upstream +package/lftp/0002-src-lftp_ssl.c-fix-build-with-libressl-2.7.0.patch Upstream +package/libabseil-cpp/0001-force-position-independent-code.patch Upstream +package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch Upstream +package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch Upstream +package/libart/0001-art-config-cross.patch Sob Upstream +package/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch Upstream +package/libatasmart/0001-strpool-cross-flags.patch Upstream +package/libavl/0001-fix-makefile.patch Upstream +package/libb64/0001-Integer-overflows.patch Upstream +package/libb64/0002-Initialize-C++-objects.patch Upstream +package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch Upstream +package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch Upstream +package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch Upstream +package/libcec/0001-cecloader-h-fix-null-return.patch Upstream +package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch Upstream +package/libcgicc/0001-disable-documentation-option.patch Sob Upstream +package/libclc/0001-support-out-of-tree-build.patch Upstream +package/libcodec2/0001-update-cmake.patch Upstream +package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch Upstream +package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch Upstream +package/libcuefile/0001-fix-static-link.patch Upstream +package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch Upstream +package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch Upstream +package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch Upstream +package/libdnet/0001-python-makefile.patch Upstream +package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch Upstream +package/libdrm/0001-tests-meson.build-disable-nouveau-tests-for-static-b.patch Upstream +package/libdvbcsa/0001-altivec-powerpc64.patch Upstream +package/libeXosip2/0001-src-eXtl_dtls.c-fix-build-with-libressl-3.4.1.patch Upstream +package/libebml/0001-include-appropriate-header-files-for-std-numeric_limits.patch Upstream +package/libedit/0001-check-bsd-functions-in-libbsd.patch Upstream +package/libevent/0001-Don-t-define-BIO_get_init-for-LibreSSL-3-5.patch Upstream +package/libfcgi/0001-link-against-math.patch Upstream +package/libfcgi/0002-disable-examples.patch Sob Upstream +package/libffi/0001-Fix-installation-location-of-libffi.patch Upstream +package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch Upstream +package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch Upstream +package/libfm/0001-modules-fix-cross-compilation.patch Upstream +package/libfreeimage/0001-no-root-install.patch Upstream +package/libfreeimage/0002-fix-cpuid-x86.patch Upstream +package/libfreeimage/0003-fix-big-endian-os.patch Upstream +package/libfreeimage/0004-fixed-C-11-warnings.patch Upstream +package/libftdi/0001-pkgconfig_libusb.patch Sob Upstream +package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch Sob Upstream +package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch Upstream +package/libftdi1/0002-CMakeLists.txt-fix-paths-when-FTDIPP-is-set.patch Upstream +package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch Upstream +package/libfuse/0001-fix-aarch64-build.patch Upstream +package/libfuse/0002-util-ulockmgr_server-c-conditionally-define-closefrom-fix-glibc-2-34.patch Upstream +package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch Upstream +package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch Upstream +package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch Upstream +package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch Upstream +package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch Upstream +package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch Upstream +package/libglib2/0001-fix-compile-time-atomic-detection.patch Upstream +package/libglib2/0002-remove-cpp-requirement.patch Upstream +package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch Upstream +package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch Upstream +package/libgpgme/0001-Fix-build-without-threads.patch Upstream +package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch Upstream +package/libgsm/0001-misc-fixes-from-archlinux.patch Upstream +package/libgtk2/0001-reduce-dependencies.patch Upstream +package/libgtk3/0001-disable-atk-bridge.patch Upstream +package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch Upstream +package/libhdhomerun/0001-dont-strip.patch Upstream +package/libhid/0001-dont-fiddle-with-debug-flags.patch Upstream +package/libhid/0002-no-newline-in-ldflags.patch Upstream +package/libhid/0003-uclinux.patch Upstream +package/libical/0001-no-tests.patch Upstream +package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch Upstream +package/libiio/0001-iiod-serial.c-fix-sparc-build.patch Upstream package/libiio/S99iiod Shellcheck Variables -package/libmad/0001-mips-h-constraint-removal.patch Sob +package/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch Upstream +package/libiqrf/0002-use-only-c-language.patch Upstream +package/libjson/0001-fix-broken-makefile.patch Upstream +package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch Upstream +package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch Upstream +package/libkcapi/0002-Add-disable-werror.patch Upstream +package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch Upstream +package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch Upstream +package/liblinear/0001-build-static-lib.patch Upstream +package/liblockfile/0001-Makefile.in-fix-cross-compilation.patch Upstream +package/liblog4c-localtime/0001-log4c.m4-fix-underquoted-definition-of-AM_PATH_LOG4C.patch Upstream +package/liblog4c-localtime/0002-Fix-linking-error-without-pthread.patch Upstream +package/liblog4c-localtime/0003-Fix-debug-mode-build-with-uClibc.patch Upstream +package/liblog4c-localtime/0004-Add-AC_CONFIG_MACRO_DIR-to-configure.in.patch Upstream +package/liblog4c-localtime/0005-Fix-C-support.patch Upstream +package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch Upstream +package/libloki/0002-use-ln-snf.patch Upstream +package/libmad/0001-mips-h-constraint-removal.patch Sob Upstream +package/libmad/0002-configure-ac-automake-foreign.patch Upstream +package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch Upstream +package/libmemcached/0001-disable-tests.patch Upstream +package/libmemcached/0002-disable-sanitizer.patch Upstream +package/libmemcached/0003-move-ac_config_aux_dir.patch Upstream +package/libmemcached/0004-disable-doc-and-man.patch Upstream +package/libmemcached/0005-fix-pointer-comparaison.patch Upstream +package/libmng/0001-jpeg-9a.patch Upstream +package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch Upstream +package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch Upstream +package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch Upstream +package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch Upstream +package/libmpd/0001-Fix-build-on-archlinux-missing-include.patch Upstream +package/libmpeg2/0001-altivec.patch Upstream +package/libmpeg2/0002-armv4l.patch Upstream +package/libmpeg2/0003-fix-arm-detection.patch Upstream +package/libmpeg2/0004-fix-sparc.patch Upstream +package/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-cross-build.patch Upstream +package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch Upstream +package/libnfc/0001-autotools-make-example-build-optional.patch Upstream +package/libnfs/0001-Fix-include-sys-time.h.patch Upstream +package/libnids/0001-libpcap-use-pkg-config.patch Upstream +package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch Upstream +package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch Upstream +package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch Upstream +package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch Upstream +package/libodb-mysql/0002-mariadb-FTBFS-fix.patch Upstream +package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch Upstream +package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch Upstream +package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch Upstream +package/libopenssl/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch Upstream +package/libopenssl/0006-Add-support-for-io_pgetevents_time64-syscall.patch Upstream +package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch Upstream +package/liboping/0001-fix-utf8-support.patch Upstream +package/liboping/0002-Open-raw-sockets-when-adding-hosts-not-when-doing-th.patch Upstream +package/liboping/0003-Fix-compile-break-with-GCC-7-buffer-overflow-with-snprintf.patch Upstream +package/liboping/0004-Fix-compile-error-on-GCC-7.patch Upstream +package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch Upstream +package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch Upstream +package/libpam-tacplus/0001-Add-an-option-to-disable-Werror.patch Upstream +package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch Upstream +package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch Upstream +package/libplatform/0001-cmake-require-c-11-as-the-minimum-standard.patch Upstream +package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch Upstream +package/libpthsem/0001-fix-build-on-linux-3.x-host.patch Upstream +package/libqb/0001-Add-disable-tests-option.patch Upstream +package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch Upstream +package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch Upstream +package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch Upstream +package/librtas/0001-configure.ac-remove-LOCAL_CHECK_FLAGS.patch Upstream +package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch Upstream +package/libselinux/0001-fix-musl-build.patch Upstream +package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch Upstream +package/libsepol/0001-support-static-only.patch Upstream +package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch Upstream +package/libserial/0002-SerialPort.cpp-don-t-use-high-baudrates-when-not-ava.patch Upstream +package/libserialport/0001-uclinux-detection.patch Upstream +package/libshdata/0001-backend-Add-missing-include-files.patch Upstream +package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch Upstream +package/libsidplay2/0001-sidplay2-libs-2.1.1.patch Upstream +package/libsidplay2/0002-pkg-config.patch Upstream +package/libsidplay2/0003-gcc6.patch Upstream +package/libsigrok/0001-Support-glibmm-2.68.patch Upstream +package/libsigrokdecode/0001-configure-ac-Add-support-for-Python-3-9.patch Upstream +package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch Upstream +package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch Upstream +package/libsolv/0001-Fix-build-without-C.patch Upstream +package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch Upstream +package/libsoxr/0001-Add-Libs.private-for-static-linking.patch Upstream +package/libspatialindex/0001-allow-building-static-libs.patch Upstream +package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch Upstream +package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch Upstream +package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch Upstream +package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch Upstream +package/libsvg/0001-fix-expat-static-declaration.patch Upstream +package/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch Upstream +package/libsvgtiny/0001-disable-debug-printfs.patch Upstream +package/libsvgtiny/0002-Remove-Werror.patch Upstream +package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch Upstream +package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch Upstream +package/libtalloc/0001-buildtools-wafsamba-add-disable-stack-protector-opti.patch Upstream +package/libteam/0001-revert-disregard-current-state.patch Upstream +package/libteam/0002-fix-build-on-openwrt-musl-libc.patch Upstream +package/libteam/0003-increase-wait-time-for-daemon-kill.patch Upstream +package/libtelnet/0001-fix-compilation-without-zlib.patch Upstream +package/libtheora/0001-link-libtheoradec.patch Upstream +package/libtheora/0002-fix-autoreconf.patch Upstream +package/libtomcrypt/0001-fix-CVE-2019-17362.patch Upstream +package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch Upstream +package/libtorrent/0001-libtorrent.pc.in-add-Libs.Private.patch Upstream +package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch Upstream +package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch Upstream +package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch Upstream +package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch Upstream +package/liburcu/0002-fix-don-t-use-C-thread_local-on-MacOs.patch Upstream +package/liburcu/0003-Always-use-__thread-for-Thread-local-storage-except-on-MSVC.patch Upstream +package/libusb-compat/0001-fix-a-build-issue-on-linux.patch Upstream +package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch Upstream +package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch Upstream +package/libuwsc/0002-fix-bad-indentation.patch Upstream +package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch Upstream +package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch Upstream +package/libwebsock/0002-fix-ssl.patch Upstream +package/libwebsock/0003-fix-incorrect-inline.patch Upstream +package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch Upstream +package/libyuv/0001-i386-sse2.patch Upstream +package/lightning/0001-lib-jit_disasm.c-fix-build.patch Upstream +package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch Upstream package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables +package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch Upstream +package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch Upstream +package/linphone/0001-src-core-paths-paths.cpp-fix-powerpc-build.patch Upstream +package/linux-fusion/0001-fix-for-linux-4-and-above.patch Upstream +package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch Upstream +package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch Upstream +package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch Upstream package/linux-tools/S10hyperv Variables +package/linux-zigbee/0001-test-serial-Remove-test-serial.patch Upstream +package/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch Upstream +package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch Upstream +package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch Upstream package/linuxptp/S65ptp4l Indent Shellcheck package/linuxptp/S66phc2sys Indent Shellcheck +package/lirc-tools/0001-plugins-devinput.c-fix-build-with-musl-1.2.0.patch Upstream +package/lirc-tools/0002-configure-add-disable-doc-option.patch Upstream package/lirc-tools/S25lircd Indent Variables -package/lite/0001-dfbspy-stat.patch Sob -package/lite/0002-no-tests.patch Sob -package/lite/0003-pkg-config.patch Sob +package/lite/0001-dfbspy-stat.patch Sob Upstream +package/lite/0002-no-tests.patch Sob Upstream +package/lite/0003-pkg-config.patch Sob Upstream +package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch Upstream package/lldpd/S60lldpd Indent Shellcheck Variables -package/lockfile-progs/0001-sus3v-legacy.patch Sob -package/madplay/0001-switch-to-new-alsa-api.patch Sob +package/llvm/0001-nfc-Fix-missing-include.patch Upstream +package/lm-sensors/0001-static-build.patch Upstream +package/lm-sensors/0002-no-host-ldconfig.patch Upstream +package/lmbench/0001-scripts-build-use-bin-bash-as-shell.patch Upstream +package/lmbench/0002-src-Makefile-add-lmbench-to-list-of-executables.patch Upstream +package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch Upstream +package/lmbench/0004-Fix-garbage-pointer-for-lat_rpc-S-localhost.patch Upstream +package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch Upstream +package/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch Upstream +package/lockfile-progs/0001-sus3v-legacy.patch Sob Upstream +package/lshw/0001-solve-Compile-error-when-g-version-is-less-than-5.patch Upstream +package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch Upstream +package/ltrace/0001-arm-plt.patch Upstream +package/ltrace/0002-sparc-add-missing-library.h-include.patch Upstream +package/ltrace/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch Upstream +package/ltris/0001-fix-build-with-gcc-4.8.patch Upstream +package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch Upstream +package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch Upstream +package/lttng-libust/0001-configure.ac-add-disable-tests.patch Upstream +package/lttng-tools/0001-configure.ac-add-disable-tests.patch Upstream +package/lua-gd/0001-Protect-declaration-of-LgdImageCreateFromPng-with-GD.patch Upstream +package/lua-lunix/0001-remove-link-with-librt.patch Upstream +package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch Upstream +package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch Upstream +package/lua/5.1.5/0001-root-path.patch Upstream +package/lua/5.1.5/0002-shared-libs-for-lua.patch Upstream +package/lua/5.1.5/0011-linenoise.patch Upstream +package/lua/5.1.5/0012-fix-reader-at-eoz.patch Upstream +package/lua/5.3.6/0001-root-path.patch Upstream +package/lua/5.3.6/0002-shared-libs-for-lua.patch Upstream +package/lua/5.3.6/0003-linenoise.patch Upstream +package/lua/5.4.4/0001-root-path.patch Upstream +package/lua/5.4.4/0002-shared-libs-for-lua.patch Upstream +package/lua/5.4.4/0011-linenoise.patch Upstream +package/luajit/0001-no-bin-symlink.patch Upstream +package/luajit/0002-install-inc.patch Upstream +package/luasyslog/0001-remove-AX_LUA_LIBS.patch Upstream +package/luasyslog/0002-build-ax_lua.m4-fix-cross-compilation.patch Upstream +package/lugaru/0001-ImageIO-fix-invalid-conversion.patch Upstream +package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch Upstream +package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch Upstream +package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch Upstream +package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch Upstream +package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch Upstream +package/lz4/0001-build-Support-BUILD_SHARED-no.patch Upstream +package/lzma/0001-Remove-static-from-LDFLAGS.patch Upstream +package/lzop/0001-allow-overriding-modification-time.patch Upstream +package/macchanger/0001-Fix-missing-include-for-caddr_t.patch Upstream +package/madplay/0001-switch-to-new-alsa-api.patch Sob Upstream +package/madplay/0002-configure-ac-automake-foreign.patch Upstream +package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch Upstream +package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch Upstream +package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch Upstream +package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch Upstream +package/makedumpfile/0002-Handle-__mips64.patch Upstream +package/mariadb/0001-add-extra-check-for-librt.patch Upstream +package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch Upstream package/mariadb/S97mysqld Indent Shellcheck Variables package/matchbox-keyboard/mb-applet-kbd-wrapper.sh Shellcheck TrailingSpace +package/matchbox-lib/0001-index-is-legacy.patch Upstream +package/matchbox-panel/0001-index-is-legacy.patch Upstream +package/matchbox-panel/0002-mb-applet-wireless.patch Upstream +package/matchbox-panel/0003-mb-applet-battery.patch Upstream +package/matchbox-startup-monitor/0001-true-false.patch Upstream +package/matchbox/0001-defaulttheme.patch Upstream +package/matchbox/0002-src-Fix-build-with-gcc-10.patch Upstream +package/mbw/0001-CMakeLists.txt-fix-build-without-C.patch Upstream +package/mediastreamer/0001-src-videofilters-nowebcam.c-fix-build-without-ffmpeg.patch Upstream +package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch Upstream +package/memcached/0001-logger.c-initialize-rport.patch Upstream +package/memcached/0002-check-for-sys-auxv.h.patch Upstream +package/memcached/0003-configure.ac-add-disable-werror.patch Upstream +package/memstat/0001-PATH_MAX.patch Upstream package/mender-connect/S43mender-connect Shellcheck -package/mii-diag/0001-strchr.patch Sob +package/menu-cache/0001-Support-gcc10-compilation.patch Upstream +package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch Upstream +package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch Upstream +package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch Upstream +package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch Upstream +package/mesa3d/0004-Fix-uClibc-build.patch Upstream +package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch Upstream +package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch Upstream +package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch Upstream +package/metacity/0001-add-libm-reference.patch Upstream +package/metacity/0002-gconf.patch Upstream +package/metacity/0003-mag-add-libm-reference.patch Upstream +package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch Upstream +package/midori/0001-disable-vala-fatal-warnings.patch Upstream +package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch Upstream +package/mii-diag/0001-strchr.patch Sob Upstream +package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch Upstream +package/mini-snmpd/0001-linux.c-fix-musl-build.patch Upstream package/minidlna/S60minidlnad Indent Shellcheck Variables package/minissdpd/S50minissdpd Indent Shellcheck Variables package/modem-manager/S44modem-manager Shellcheck Variables +package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch Upstream +package/mongodb/0002-src-mongo-db-exec-plan_stats.h-fix-build-with-gcc-11.patch Upstream +package/mongrel2/0001-Do-not-run-tests.patch Upstream +package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch Upstream +package/mongrel2/0003-fix-build-with-gcc-4.8.patch Upstream +package/monit/0001-no-force-static.patch Upstream +package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch Upstream +package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch Upstream +package/mono/0001-Fix-linkage-with-a-system-libatomic_ops-shared-library.patch Upstream +package/mono/0002-Ongoing-work-on-the-cmake-build.patch Upstream package/mosquitto/S50mosquitto Indent Shellcheck Variables package/motion/S99motion Indent Shellcheck Variables +package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch Upstream package/mpd/S95mpd Variables +package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch Upstream +package/mpv/0001-fix-powerpc64-altivec.patch Upstream +package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch Upstream package/mrouted/S41mrouted NotExecutable package/mrp/S65mrp Indent Variables +package/mstpd/0001-bridge-stp.in-support-different-versions-of-pidof-13.patch Upstream package/multipath-tools/S60multipathd Shellcheck +package/musepack/0001-shared.patch Upstream +package/musepack/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch Upstream +package/musepack/0003-include-fpu-control-with-glibc-only.patch Upstream +package/musepack/0004-missing-sys-select.patch Upstream +package/musepack/0005-fix-build-with-gcc-10.patch Upstream +package/musl/0001-avoid-kernel-if_ether.h.patch Upstream +package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch Upstream +package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch Upstream +package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream +package/nanocom/0001-fix-build-with-gcc-10.patch Upstream +package/ncftp/0001-fix-gcc-10.patch Upstream +package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch Upstream +package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch Upstream +package/ne10/0002-fix-build-without-C.patch Upstream package/neard/S53neard Indent Shellcheck Variables +package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch Upstream +package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch Upstream +package/neon/0002-configure.ac-fix-autoreconf.patch Upstream +package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch Upstream +package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch Upstream package/netatalk/S50netatalk EmptyLastLine Indent Variables -package/netcat/0001-signed-bit-counting.patch Sob -package/netopeer2/S52netopeer2 Shellcheck Variables -package/netplug/0001-makefile-flags.patch Sob +package/netcat/0001-signed-bit-counting.patch Sob Upstream +package/netopeer2/S52netopeer2 Variables +package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch Upstream +package/netplug/0001-makefile-flags.patch Sob Upstream +package/netplug/0002-add-missing-time-include.patch Upstream +package/netplug/0003-remove-assert-fail.patch Upstream package/netplug/S29netplug Indent Shellcheck Variables package/netplug/netplug-script ConsecutiveEmptyLines Shellcheck +package/netsniff-ng/0001-Detect-libpcap-dependencies-using-pkg-config.patch Upstream package/netsnmp/S59snmpd Indent Shellcheck Variables +package/netsurf/0001-avoid-system-perl-dependencies.patch Upstream +package/netsurf/0002-do-not-cross-compile-nsgenbind.patch Upstream +package/netsurf/0003-fix-compilation-without-curl.patch Upstream +package/netsurf/0004-framebuffer-Fix-internal-font-generated-source-for-GCC-10.patch Upstream +package/nettle/0001-disable-testsuite-examples.patch Upstream +package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch Upstream +package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch Upstream package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables +package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch Upstream +package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch Upstream package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables +package/nginx-modsecurity/0001-config-use-pkg-config.patch Upstream +package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch Upstream +package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch Upstream +package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch Upstream +package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch Upstream +package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch Upstream +package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch Upstream +package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch Upstream +package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch Upstream +package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch Upstream +package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch Upstream package/nginx/S50nginx Indent Variables +package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch Upstream +package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch Upstream +package/ngrep/0003-fix-disable-tcpkill.patch Upstream +package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch Upstream +package/nmap/0001-libdnet-wrapper-configure.patch Upstream +package/nodejs/0001-add-qemu-wrapper-support.patch Upstream +package/nodejs/0002-check-if-uclibc-has-backtrace-support.patch Upstream +package/nodejs/0003-include-obj-name-in-shared-intermediate.patch Upstream +package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch Upstream package/nodm/S90nodm Indent Shellcheck Variables +package/norm/0001-protolib-drop-linux-version-check.patch Upstream +package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch Upstream +package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch Upstream package/nss-pam-ldapd/S45nslcd EmptyLastLine Indent Shellcheck Variables +package/ntp/0001-nano.patch Upstream +package/ntp/0002-ntp-syscalls-fallback.patch Upstream +package/ntp/0003-override-shell.patch Upstream +package/ntp/0004-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch Upstream package/ntp/S49ntp.in Variables +package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch Upstream +package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch Upstream +package/numactl/0001-link-with-latomic-if-needed-again.patch Upstream +package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch Upstream +package/nuttcp/0001-susv3-legacy.patch Upstream +package/nvidia-driver/0001-use-LDFLAGS.patch Upstream +package/octave/0001-Fix-BLAS-library-integer-size-detection.patch Upstream +package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch Upstream +package/odb/0002-Remove-gratuitous-classes.patch Upstream +package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch Upstream +package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch Upstream +package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch Upstream +package/odb/0006-Adapt-to-changes-in-GCC-8.patch Upstream +package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch Upstream +package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch Upstream +package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch Upstream +package/odb/0010-Add-initial-support-for-GCC-9.patch Upstream +package/odb/0011-Adjust-to-changes-in-GCC-10.patch Upstream +package/odb/0012-Adjust-to-changes-in-GCC-11.patch Upstream +package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch Upstream +package/ofono/0001-uclibc-backtrace.patch Upstream +package/ofono/0002-fix-musl-compile.patch Upstream package/ofono/S46ofono Variables +package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch Upstream +package/olsr/0001-olsrd-migrate-to-using-bison-3.7.1.patch Upstream +package/olsr/0002-lib-pud-Makefile-fix-parallel-build.patch Upstream +package/olsr/0003-pud-adapt-to-API-changes-in-gpsd-3-20.patch Upstream +package/olsr/0005-lib-pud-src-gpsdclient.c-drop-handling-of-gpsdata-fi.patch Upstream package/olsr/S50olsr Indent Shellcheck Variables +package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch Upstream +package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch Upstream +package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch Upstream +package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch Upstream +package/open2300/0001-fix-makefile.patch Upstream +package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch Upstream +package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream +package/openldap/0001-fix_cross_strip.patch Upstream +package/openldap/0002-fix-bignum.patch Upstream +package/openldap/0003-disable-docs.patch Upstream +package/openldap/0004-revert-ITS-3977-fix-libtool-static-behavior-to-match.patch Upstream package/openntpd/S49ntp Shellcheck Variables +package/openocd/0001-configure-enable-build-on-uclinux.patch Upstream +package/openpgm/0001-Rename-openpgm-5.2.pc.in.patch Upstream +package/openpgm/0002-openpgm-pgm-checksum.c-fix-build-with-32-bits-MMX.patch Upstream +package/openpgm/0003-fix-build-on-macOS-ARM.patch Upstream +package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch Upstream +package/openpowerlink/0002-cmake-install-oplk-headers-files.patch Upstream +package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch Upstream +package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch Upstream +package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch Upstream +package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch Upstream +package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch Upstream +package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch Upstream +package/openrc/0006-Also-create-run-lock-subsys-directory.patch Upstream +package/opensc/0002-added-compatibility-with-LibreSSL.patch Upstream +package/opensc/0003-Fix-build-with-libressl-3.5.0.patch Upstream package/openssh/S50sshd EmptyLastLine Indent Variables +package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch Upstream +package/opentyrian/0001-Move-definitions-that-don-t-need-to-be-exposed-from-opl-h-to-opl-c.patch Upstream +package/openvmtools/0001-no_cflags_werror.patch Upstream +package/openvmtools/0002-dont-force-cppflags.patch Upstream +package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch Upstream +package/openvmtools/0004-Remove-assumptions-about-glibc-being-only-libc-imple.patch Upstream +package/openvmtools/0005-Use-configure-test-for-struct-timespec.patch Upstream +package/openvmtools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch Upstream +package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch Upstream +package/openvmtools/0008-Use-configure-test-for-sys-stat.h-include.patch Upstream +package/openvmtools/0011-open-vm-tools-vmhgfs-fuse-fsutils.h-fix-build-on-mus.patch Upstream +package/openvmtools/0012-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch Upstream package/openvmtools/shutdown Shellcheck package/openvpn/S60openvpn Indent Shellcheck Variables +package/oprofile/0001-musl.patch Upstream +package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch Upstream +package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch Upstream +package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch Upstream +package/oracle-mysql/0000-ac_cache_check.patch Upstream +package/oracle-mysql/0001-configure-ps-cache-check.patch Upstream +package/oracle-mysql/0002-use-new-readline-iface.patch Upstream +package/oracle-mysql/0003-ac_stack_direction-is-unset.patch Upstream +package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch Upstream +package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch Upstream +package/oracle-mysql/0006-no-force-static-build.patch Upstream +package/oracle-mysql/0007-dont-install-in-mysql-directory.patch Upstream +package/oracle-mysql/0008-fix-type-conversion.patch Upstream +package/oracle-mysql/0009-gcc7.patch Upstream +package/oracle-mysql/0010-fix-build-without-zlib.patch Upstream package/oracle-mysql/S97mysqld Shellcheck Variables package/owfs/S55owserver Shellcheck Variables package/owfs/S60owfs Shellcheck Variables +package/owl-linux/0001-fix-for-linux-3.3.x.patch Upstream +package/patch/0001-Fix-segfault-with-mangled-rename-patch.patch Upstream +package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch Upstream +package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch Upstream +package/patch/0004-Invoke-ed-directly-instead-of-using-the-shell.patch Upstream +package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch Upstream +package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch Upstream +package/paxtest/0001-genpaxtest-move-log-location.patch Upstream +package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch Upstream +package/pciutils/0001-Workaround-build-failure-with-older-binutils.patch Upstream +package/pcm-tools/0001-pmu-query.py-fix-python3-errors-add-linux-platform-s.patch Upstream +package/pcmanfm/0001-po-de-po-fix-build-with-gettext-tiny.patch Upstream +package/pcre/0001-Kill-compatibility-bits.patch Upstream +package/pcre/0002-Disable-C-unit-tests.patch Upstream +package/pdmenu/0001-autoconf-makeinfo.in-link-with-INTLLIBS-if-needed.patch Upstream +package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch Upstream +package/perl-net-ssleay/0001-fix-build-system.patch Upstream +package/perl-sys-cpu/0001-remove-extraneous-include.patch Upstream +package/perl-xml-libxml/0001-Makefile-PL.patch Upstream +package/php-amqp/0001-add-build-support-for-php-8.patch Upstream +package/php-amqp/0002-more-work-for-php-8.patch Upstream +package/php-geoip/0001-add-build-support-for-php8.patch Upstream +package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch Upstream +package/php-lua/0001-ZEND_ACC_ALLOW_STATIC-ZEND_ACC_STATIC-for-static-met.patch Upstream +package/php-lua/0002-php8-explicitly-declare-arginfo.patch Upstream +package/php-zmq/0001-updates-for-php7.4-and-php8.0.patch Upstream +package/php-zmq/0002-fix-for-php-7.3.patch Upstream +package/php-zmq/0003-fix-for-php-8.0.0beta2.patch Upstream +package/php/0001-acinclude.m4-don-t-unset-variables.patch Upstream +package/php/0002-iconv-tweak-iconv-detection.patch Upstream +package/php/0003-configure-disable-the-phar-tool.patch Upstream +package/php/0004-Call-apxs-with-correct-prefix.patch Upstream +package/php/0005-allow-opcache-cross-compiling.patch Upstream +package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch Upstream +package/pifmrds/0001-Makefile-cross-compile-friendly.patch Upstream +package/pifmrds/0002-Makefile-use-LDFLAGS.patch Upstream +package/pifmrds/0003-Makefile-fix-static-link.patch Upstream package/pigpio/S50pigpio Shellcheck Variables +package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch Upstream +package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch Upstream +package/pixman/0001-Disable-tests.patch Upstream +package/pkcs11-helper/0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch Upstream +package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch Upstream +package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch Upstream package/pkgconf/pkg-config.in Shellcheck -package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob +package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob Upstream +package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch Upstream +package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream +package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch Upstream +package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch Upstream package/postgresql/S50postgresql Variables +package/pound/0001-fix-openssl-1.0.2.patch Upstream +package/pound/0002-fix-openssl-1.1.0.patch Upstream +package/powertop/0001-dont-force-stack-smashing-protection.patch Upstream +package/pppd/0001-pppd-Fix-compilation-with-older-glibc-or-kernel-headers.patch Upstream +package/pppd/0002-pppd-eap-tls.c-fix-build-with-libressl.patch Upstream +package/pptp-linux/0001-susv3-legacy.patch Upstream +package/pptp-linux/0002-fix-parallel-build.patch Upstream +package/prboom/0001-libpng-1.4.patch Upstream +package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch Upstream +package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch Upstream +package/procps-ng/0001-configure-Add--disable-w.patch Upstream +package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch Upstream +package/procps-ng/0003-fix-pifd_open-check.patch Upstream package/procps-ng/S02sysctl Variables package/proftpd/S50proftpd Indent Shellcheck Variables +package/prosody/0001-enable-syslog.patch Upstream +package/prosody/0002-add-pidfile.patch Upstream package/prosody/S50prosody Indent Shellcheck Variables +package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch Upstream +package/proxychains-ng/0001-add-configure-check-for-non-POSIX-compliant-getnameinfo-signature.patch Upstream package/ptpd/S65ptpd Indent Shellcheck Variables +package/ptpd2/0001-musl.patch Upstream +package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch Upstream +package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch Upstream package/ptpd2/S65ptpd2 Indent Shellcheck Variables +package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.patch Upstream +package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch Upstream +package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch Upstream +package/pulseaudio/0004-meson.build-fix-build-without-C.patch Upstream package/pulseaudio/S50pulseaudio ConsecutiveEmptyLines EmptyLastLine Indent Variables +package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch Upstream +package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch Upstream +package/pulseview/0003-Support-glibmm-2.68.patch Upstream +package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch Upstream +package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch Upstream +package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch Upstream +package/python-crossbar/0001-Avoid-intentional-syntax-error.patch Upstream +package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch Upstream +package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch Upstream +package/python-daphne/0001-remove-pytest-runner-requirement.patch Upstream +package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch Upstream +package/python-hiredis/0001-setup.py-fix-build-with-gcc-4.8.patch Upstream +package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch Upstream +package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch Upstream +package/python-pylibftdi/0001-do-not-use-find-library.patch Upstream +package/python-pyqt5/0001-configure-skip-qtdetail.patch Upstream +package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch Upstream +package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch Upstream +package/python-pyzmq/0001-detect.py-fix-the-ZMQ-version-check-to-the-ZMQ-versi.patch Upstream +package/python-scipy/0001-build-sh4-FE.patch Upstream +package/python-setuptools/0001-add-executable.patch Upstream +package/python-sip/0001-remove-join-from-sip-h-files-string.patch Upstream package/python-web2py/S51web2py Shellcheck Variables -package/rdesktop/0001-8bit-colors.patch Sob +package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch Upstream +package/python3/0001-Make-the-build-of-pyc-files-conditional.patch Upstream +package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch Upstream +package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch Upstream +package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch Upstream +package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch Upstream +package/python3/0006-Don-t-add-multiarch-paths.patch Upstream +package/python3/0007-Abort-on-failed-module-build.patch Upstream +package/python3/0008-Serial-ioctl-workaround.patch Upstream +package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch Upstream +package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch Upstream +package/python3/0011-Add-an-option-to-disable-pydoc.patch Upstream +package/python3/0012-Add-an-option-to-disable-lib2to3.patch Upstream +package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch Upstream +package/python3/0014-Add-an-option-to-disable-the-tk-module.patch Upstream +package/python3/0015-Add-an-option-to-disable-the-curses-module.patch Upstream +package/python3/0016-Add-an-option-to-disable-expat.patch Upstream +package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch Upstream +package/python3/0018-Add-an-option-to-disable-NIS.patch Upstream +package/python3/0019-Add-an-option-to-disable-unicodedata.patch Upstream +package/python3/0020-Add-an-option-to-disable-IDLE.patch Upstream +package/python3/0021-Add-an-option-to-disable-decimal.patch Upstream +package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch Upstream +package/python3/0023-Add-an-option-to-disable-openssl-support.patch Upstream +package/python3/0024-Add-an-option-to-disable-the-readline-module.patch Upstream +package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch Upstream +package/python3/0026-python-config.sh-don-t-reassign-prefix.patch Upstream +package/python3/0027-Add-an-option-to-disable-uuid-module.patch Upstream +package/python3/0028-fix-building-on-older-distributions.patch Upstream +package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch Upstream +package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch Upstream +package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch Upstream +package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch Upstream +package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch Upstream +package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch Upstream +package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch Upstream +package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch Upstream +package/qt5/qt5base/0001-qtbase-Fix-build-error-when-using-EGL.patch Upstream +package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch Upstream +package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch Upstream +package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch Upstream +package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch Upstream +package/qt5/qt5base/0006-Fix-build-on-riscv32.patch Upstream +package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch Upstream +package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch Upstream +package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch Upstream +package/qt5/qt5declarative/0002-qv4regexp_p-needs-c-limits-include-instead-of-plain-.patch Upstream +package/qt5/qt5enginio/0001-Do-not-use-deprecated-QLinkedList.patch Upstream +package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch Upstream +package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch Upstream +package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch Upstream +package/qt5/qt5wayland/0001-Add-missing-define-guards.patch Upstream +package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch Upstream +package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch Upstream +package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch Upstream +package/qt5/qt5webengine/0002-Add-python3-build-support.patch Upstream +package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch Upstream +package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch Upstream +package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch Upstream +package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch Upstream +package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch Upstream +package/qt5/qt5webkit/0006-Warnings-due-to-AppSinkCallbacks-struct-growth-https.patch Upstream +package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch Upstream +package/quagga/0001-fix-ipctl-forwarding.patch Upstream +package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch Upstream +package/quagga/0003-Fix-build-with-gcc-10.patch Upstream +package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch Upstream +package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch Upstream +package/ranger/0001-colorscheme-check-for-compiled-python-files.patch Upstream +package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch Upstream +package/raptor/0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch Upstream +package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch Upstream +package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch Upstream +package/rdesktop/0001-8bit-colors.patch Sob Upstream +package/read-edid/0001-Fix-install-file-list.patch Upstream +package/read-edid/0002-Fix-compiler-check.patch Upstream +package/read-edid/0003-fix-build-with-gcc-10.patch Upstream +package/readline/0001-curses-link.patch Upstream +package/redis/0001-uclibc.patch Upstream +package/redis/0002-largefile-conditional-define.patch Upstream +package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch Upstream package/redis/S50redis Shellcheck Variables +package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch Upstream package/restorecond/S02restorecond Shellcheck +package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch Upstream +package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch Upstream package/rng-tools/S21rngd Shellcheck Variables +package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch Upstream +package/rp-pppoe/0001-src-pppoe.h-fix-build-with-musl-libc.patch Upstream +package/rpcbind/0001-Remove-yellow-pages-support.patch Upstream package/rpcbind/S30rpcbind EmptyLastLine Indent Variables -package/rubix/0002-misc-fixes.patch Sob +package/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch Upstream +package/rpi-userland/0002-interface-remove-faulty-assert-to-make-weston-happy-.patch Upstream +package/rpi-userland/0003-Disable-Werror-everywhere.patch Upstream +package/rpi-userland/0004-host-applications-disable-missing-applications.patch Upstream +package/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch Upstream +package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.patch Upstream +package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch Upstream +package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch Upstream +package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch Upstream +package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch Upstream +package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch Upstream +package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch Upstream +package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch Upstream +package/rtmpdump/0001-include-limits.h.patch Upstream +package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch Upstream +package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch Upstream +package/rubix/0001-dont-use-legacy-functions.patch Upstream +package/rubix/0002-misc-fixes.patch Sob Upstream +package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch Upstream +package/rygel/0001-build-Add-man_pages-build-options.patch Upstream +package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch Upstream package/rygel/S99rygel Indent Shellcheck Variables +package/s6-linux-init/0001-configure-add-D_GNU_SOURCE.patch Upstream +package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch Upstream +package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch Upstream +package/samba4/0001-libreplace-disable-libbsd-support.patch Upstream +package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch Upstream +package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch Upstream +package/samba4/0004-lib-util-Add-signal.h-include.patch Upstream +package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch Upstream package/samba4/S91smb Indent Shellcheck Variables +package/sane-backends/0001-sane_backend-add-missing-config.h.patch Upstream +package/screen/0001-no-memcpy-fallback.patch Upstream +package/screen/0002-install-no-backup-binary.patch Upstream +package/screen/0003-install-always-chmod.patch Upstream +package/screen/0004-install-nonversioned-binary.patch Upstream +package/screen/0005-rename-sched_h.patch Upstream +package/screen/0006-comm-h-now-depends-on-term-h.patch Upstream +package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch Upstream +package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch Upstream +package/sdl/0001-use-correct-directfb-config.patch Upstream +package/sdl/0002-fix-compilation-with-libx11.patch Upstream +package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch Upstream +package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch Upstream +package/sdl_mixer/0002-configure__set_macro_directory.patch Upstream +package/sdl_mixer/0003-configure.ac-fix-static-linking-with-tremor.patch Upstream +package/sdl_sound/0001-fix-constness.patch Upstream +package/sdl_sound/0002-remove-werror.patch Upstream +package/sdl_sound/0003-renamed-physfs-export.patch Upstream package/seatd/S70seatd NotExecutable Variables +package/sedutil/0001-Common-log.h-time-2-needs-time.h.patch Upstream +package/sentry-native/0001-sentry.h-include-ucontext.h.patch Upstream package/ser2net/S50ser2net Indent Shellcheck Variables +package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch Upstream +package/setserial/0001-build-system-fix.patch Upstream +package/setserial/0002-tiocghayesesp-build-fix.patch Upstream +package/sg3_utils/0001-src-sg_dd.c-fix-musl-build.patch Upstream +package/sg3_utils/0002-configure.ac-fix-uclibc-ng-build.patch Upstream +package/shadowsocks-libev/0001-configure.ac-use-pkg-config-to-find-netfilter_conntr.patch Upstream +package/shadowsocks-libev/0002-fix-maybe-uninitialized-errors.patch Upstream +package/shadowsocks-libev/0003-lib-Makefile.am-remove-static-from-LDFLAGS.patch Upstream +package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch Upstream package/shairport-sync/S99shairport-sync Indent Shellcheck Variables +package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch Upstream +package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch Upstream +package/shellinabox/0001-Makefile-disable-always-building-statically.patch Upstream +package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch Upstream package/skeleton-init-systemd/fakeroot_tmpfiles.sh Shellcheck +package/slang/0001-slsh-libs.patch Upstream package/smcroute/S41smcroute Indent NotExecutable Variables +package/smstools3/0001-fix-Makefile.patch Upstream +package/smstools3/0002-fix-build-with-gcc-10.x.patch Upstream package/smstools3/S50smsd Shellcheck Variables -package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob +package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch Upstream +package/snmppp/0001-fix-build-without-v3.patch Upstream +package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch Upstream +package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch Upstream +package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch Upstream +package/snort/0004-configure.in-convert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch Upstream +package/snort/0005-fix-sparc.patch Upstream +package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch Upstream +package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch Upstream +package/snort/0008-Fix-NO-OPTIMIZE.patch Upstream +package/socat/0001-no-documentation.patch Upstream +package/socat/0002-compat-set-NETDB_INTERNAL.patch Upstream +package/socketcand/0001-Fix-GCC10-build-failure.patch Upstream +package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch Upstream +package/softether/0002-Create-libsoftether.so-and-dynamically-link.patch Upstream +package/softether/0003-use-fhs-install-directories.patch Upstream +package/softether/0004-create-non-forking-softetherd-for-upstart-and-systemd.patch Upstream +package/softether/0005-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch Upstream +package/softether/0006-cross-compile.patch Upstream +package/softether/0007-iconv.patch Upstream +package/softether/0008-librt.patch Upstream +package/softether/0009-uclibc-ai-addrconfig.patch Upstream +package/solarus/0001-cmake-remove-Werror.patch Upstream +package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob Upstream +package/sox/0001-uclibc.patch Upstream +package/sox/0002-configure.ac-put-back-disable-stack-protector.patch Upstream +package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch Upstream +package/sox/0004-configure.ac-fix-static-linking-with-magic.patch Upstream +package/sox/0005-configure.ac-fix-static-linking-with-sndfile.patch Upstream +package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch Upstream +package/sp-oops-extract/0002-stdint-cleanup.patch Upstream +package/spandsp/0001-configure.ac-fix-AVX-SSE-and-MMX-options.patch Upstream +package/speechd/0001-add-disable-doc.patch Upstream +package/speex/0001-thumb2-support.patch Upstream package/squid/S97squid Indent Shellcheck Variables +package/sredird/0001-termio.patch Upstream +package/sscep/0001-Fix-getopt-linking-error.patch Upstream package/sshguard/S49sshguard Indent package/sslh/S35sslh Indent Shellcheck Variables +package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch Upstream +package/start-stop-daemon/0002-just-warn-on-missing-arch.patch Upstream +package/statserial/0001-ncurses-link.patch Upstream +package/stellarium/0001-add-missing-include.patch Upstream +package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch Upstream +package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch Upstream +package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch Upstream package/stunnel/S50stunnel Indent Shellcheck Variables +package/sudo/0001-configure.ac-fix-openssl-static-build.patch Upstream package/supervisor/S99supervisord Variables +package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch Upstream +package/suricata/0002-configure.ac-allow-the-user-to-override-RUST_TARGET.patch Upstream package/suricata/S99suricata Shellcheck package/swupdate/swupdate.sh Shellcheck -package/sysrepo/S51sysrepo-plugind Indent Shellcheck +package/sylpheed/0001-harden-link-checker-before-accepting-click.patch Upstream +package/syslog-ng/0001-fix-build-on-uclibc.patch Upstream +package/sysprof/0001-define-NT_GNU_BUILD_ID.patch Upstream +package/sysrepo/S51sysrepo-plugind Indent +package/system-config-printer/0001-Add-option-to-disable-xmlto-manual-generation.patch Upstream +package/system-config-printer/0002-configure-accept-non-system-cups-config.patch Upstream +package/sysvinit/0001-Makefile-disable-stack-protector-strong.patch Upstream +package/tar/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream package/targetcli-fb/S50target Shellcheck Variables +package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch Upstream +package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch Upstream +package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch Upstream +package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch Upstream +package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch Upstream +package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch Upstream package/tcf-agent/S55tcf-agent Shellcheck Variables +package/tcl/0001-dont-build-compat.patch Upstream +package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch Upstream +package/tesseract-ocr/0002-configure.ac-fix-build-on-aarch64_be.patch Upstream +package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch Upstream package/tftpd/S80tftpd-hpa Indent Shellcheck Variables +package/ti-gfx/0001-newclkapi.patch Upstream +package/ti-gfx/0002-fix-build-omaplfb-linux.patch Upstream +package/ti-gfx/0003-km_install_modules.patch Upstream package/ti-gfx/S80ti-gfx Shellcheck Variables package/ti-gfx/esrev.sh Shellcheck +package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch Upstream package/ti-sgx-um/S80ti-sgx Variables +package/ti-utils/0001-plt.h-fix-build-with-gcc-10.patch Upstream +package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch Upstream +package/tinyalsa/0001-include-time.h-before-asound.h.patch Upstream +package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch Upstream +package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch Upstream +package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch Upstream +package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch Upstream +package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch Upstream +package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstream +package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch Upstream +package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch Upstream +package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch Upstream +package/tovid/0001-manpage.patch Upstream package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables +package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch Upstream +package/transmission/0001-fix-utypes.patch Upstream +package/transmission/0002-fix-utp-include.patch Upstream +package/transmission/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch Upstream package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables package/triggerhappy/S10triggerhappy Indent Shellcheck Variables +package/trinity/0001-Fix-build-with-GCC-10.patch Upstream +package/trinity/0002-net-proto-ip-raw.c-fix-build-with-kernel-5.13.patch Upstream +package/trinity/0003-Use-fcntl-h-for-dev_t-mode_t.patch Upstream +package/trinity/0004-drop-decnet.patch Upstream +package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch Upstream +package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch Upstream +package/trousers/0003-Fix-build-with-LibreSSL-2-7.patch Upstream +package/tstools/0001-build-get-along-with-buildroot.patch Upstream +package/tvheadend/0001-no-check_config.patch Upstream package/tvheadend/S99tvheadend Indent Shellcheck Variables -package/unbound/S70unbound Shellcheck +package/uboot-tools/0001-drop-configh-from-tools.patch Upstream +package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch Upstream +package/uboot-tools/0003-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch Upstream +package/ubus/0001-Install-server-and-client-examples.patch Upstream +package/udpcast/0001-fix-musl-build.patch Upstream +package/uemacs/01-clear-ixon-termios-flag.patch Upstream +package/uftrace/0001-cmds-records-replace-ADDR_NO_RANDOMIZE-by-its-value.patch Upstream +package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch Upstream +package/uhttpd/0001-Remove-Werror.patch Upstream +package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch Upstream +package/umtprd/0001-Fix-output_dir-make-dependency.patch Upstream +package/unifdef/0001-Makefile-fix-error-on-install.patch Upstream +package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch Upstream package/unscd/S46unscd Indent Shellcheck Variables +package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch Upstream package/upmpdcli/S99upmpdcli Indent Shellcheck Variables +package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch Upstream +package/urg/0001-select-h.patch Upstream +package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch Upstream +package/usb_modeswitch/0001-fix-systemd-detection.patch Upstream package/usbguard/S20usbguard Indent Shellcheck Variables +package/usbmount/0001-rules-fix.patch Upstream +package/usbmount/0002-use-udev-environment-instead-of-blkid.patch Upstream +package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch Upstream +package/ussp-push/0001-fix-build-against-bluez-4.patch Upstream +package/ussp-push/0002-fix-build-again-obex-bluez.patch Upstream +package/ussp-push/0003-add-OBEX_CharToUnicode.patch Upstream +package/util-linux/0001-lsns-improve-dependence-on-NS_GET_-ioctls.patch Upstream +package/vala/0001-dont-add-dirty-to-valac-version.patch Upstream package/vala/vala-wrapper Shellcheck +package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch Upstream +package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch Upstream +package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch Upstream +package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch Upstream +package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch Upstream +package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch Upstream +package/vboot-utils/0004-Disable-static-futility.patch Upstream +package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch Upstream +package/vboot-utils/0006-Update-for-openssl-1.1.patch Upstream +package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch Upstream +package/vde2/0001-no-cxx.patch Upstream +package/vde2/0002-fstp-Add-static-to-inline-functions.patch Upstream +package/vde2/0003-vde_l3-Add-static-to-inline-functions.patch Upstream +package/vdr/0001-getloadavg.patch Upstream +package/vdr/0002-musl-compat.patch Upstream +package/vdr/0003-include-missing-limits.patch Upstream +package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch Upstream +package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch Upstream +package/vlc/0002-automake-add-subdir-objects-option.patch Upstream +package/vlc/0003-build-use-pkg-config-to-get-tremor-libs.patch Upstream +package/vlc/0004-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch Upstream +package/vlc/0005-Don-t-assume-strerror_l-is-available.patch Upstream +package/vlc/0006-posix-remove-ancient-run-time-fallback-to-real-time-.patch Upstream +package/vlc/0007-Add-support-for-freerdp2.patch Upstream +package/vlc/0008-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch Upstream +package/vlc/0009-modules-video_filter-opencv_example.cpp-fix-build-wi.patch Upstream +package/vlc/0010-opengl-missing-library-check.patch Upstream +package/vpnc/0001-Makefile-allow-to-override-the-PREFIX-variable.patch Upstream +package/vpnc/0002-Makefile-allow-to-override-the-version.patch Upstream +package/vpnc/0003-Makefile-allow-passing-custom-CFLAGS-CPPFLAGS.patch Upstream +package/vpnc/0004-Makefile-provide-an-option-to-not-build-manpages.patch Upstream +package/vpnc/0005-Makefile-allow-passing-a-custom-path-to-libgcrypt-co.patch Upstream +package/vpnc/0006-config.c-Replace-deprecated-SUSv3-functions-with-POS.patch Upstream +package/vpnc/0007-sysdep.h-don-t-assume-error.h-is-available-on-all-Li.patch Upstream +package/vpnc/0008-sysdep.c-don-t-include-linux-if_tun.h-on-Linux.patch Upstream +package/vpnc/0009-config.c-add-missing-sys-ttydefaults.h-include.patch Upstream +package/vsftpd/0001-utmpx-builddef.patch Upstream +package/vsftpd/0002-fix-CVE-2015-1419.patch Upstream +package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch Upstream package/vsftpd/S70vsftpd Indent Shellcheck Variables +package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch Upstream +package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch Upstream +package/vtun/0001-fix-installation.patch Upstream +package/vtun/0002-fix-ssl-headers-checks.patch Upstream +package/vtun/0003-openssl11.patch Upstream +package/w_scan/0001-musl.patch Upstream +package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch Upstream +package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch Upstream +package/waffle/0002-wayland-fix-build-against-version-1-20.patch Upstream +package/waffle/0003-drop-C-dependency.patch Upstream +package/wampcc/0001-Add-RISC-V-endian-detection.patch Upstream +package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch Upstream +package/wampcc/0003-Broken-build-on-Windows.patch Upstream package/watchdogd/S01watchdogd Indent NotExecutable +package/wavemon/0001-iw_if.h-don-t-include-linux-if.h.patch Upstream +package/wayland-utils/0001-wayland-info-Fix-build-without-libdrm.patch Upstream +package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch Upstream +package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch Upstream +package/wget/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream +package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch Upstream +package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch Upstream +package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch Upstream +package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch Upstream +package/wilc-driver/0005-Fix-cast-warnings.patch Upstream +package/wipe/0001-musl.patch Upstream +package/wireless_tools/0001-remove-bzero.patch Upstream +package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch Upstream +package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch Upstream +package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch Upstream +package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch Upstream package/wpa_supplicant/ifupdown.sh Shellcheck +package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch Upstream +package/x11r7/xapp_luit/0001-posix-openpt.patch Upstream package/x11r7/xapp_xdm/S99xdm Indent Variables -package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob -package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob -package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob +package/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch Upstream +package/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch Upstream +package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch Upstream +package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch Upstream +package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch Upstream +package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch Upstream +package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch Upstream +package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch Upstream +package/x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch Upstream +package/x11r7/xdriver_xf86-video-ati/0003-Guard-local-variable-priv-only-used-with-glamor.patch Upstream +package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch Upstream +package/x11r7/xdriver_xf86-video-fbturbo/0001-sunxi_x_g2d-drop-unused-dri2-include.patch Upstream +package/x11r7/xdriver_xf86-video-fbturbo/0002-Use-own-thunk-functions-instead-of-fbdevHW-Weak.patch Upstream +package/x11r7/xdriver_xf86-video-fbturbo/0003-Update-for-1.20-ABI.patch Upstream +package/x11r7/xdriver_xf86-video-fbturbo/0004-xorg.conf-add-mandatory-modules-fb-shadow-fbdevhw.patch Upstream +package/x11r7/xdriver_xf86-video-fbturbo/0005-backing_store_tuner-struct-_Window-backStorage-is-go.patch Upstream +package/x11r7/xdriver_xf86-video-imx/0001-Update-to-newer-swap-macros.patch Upstream +package/x11r7/xdriver_xf86-video-imx/0002-Fix-error-unknown-type-name-uint.patch Upstream +package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch Upstream +package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch Upstream +package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch Upstream +package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch Upstream +package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob Upstream +package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch Upstream +package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob Upstream +package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch Upstream +package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob Upstream +package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch Upstream package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables +package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch Upstream +package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch Upstream +package/x265/0001-fix-gcc-options.patch Upstream +package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch Upstream +package/xen/0002-Fix-build-with-64-bits-time_t.patch Upstream +package/xen/0003-libs-light-fix-tv_sec-printf-format.patch Upstream +package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch Upstream +package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch Upstream +package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch Upstream +package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch Upstream +package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch Upstream +package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch Upstream +package/xfsprogs/0003-libxfs-stop-overriding-MAP_SYNC-in-publicly-exported.patch Upstream +package/xinetd/0001-ar.patch Upstream +package/xinetd/0002-destdir.patch Upstream +package/xinetd/0003-rpc-fix.patch Upstream +package/xinetd/0004-configure-rlim_t.patch Upstream +package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch Upstream package/xl2tp/xl2tpd TrailingSpace +package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch Upstream +package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch Upstream +package/xxhash/0001-fix-man-page-installation.patch Upstream +package/xxhash/0002-Makefile-add-dedicated-install-targets.patch Upstream +package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch Upstream +package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch Upstream +package/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch Upstream +package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch Upstream +package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch Upstream +package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch Upstream +package/ympd/0001-only-c-language.patch Upstream +package/ympd/0002-added-forward-declarations.patch Upstream +package/ytree/0001-fix-musl.patch Upstream +package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch Upstream +package/zabbix/0002-fix-build-with-libressl-3.5.0.patch Upstream +package/zbar/0001-python-enum-fix-build-for-Python-3.11.patch Upstream +package/zchunk/0001-meson-fix-argp-standalone-wrap-and-find_library.patch Upstream +package/zchunk/0002-zck-declare-write_data-as-static.patch Upstream +package/zic/0001-remove-dependency-check-on-version-file.patch Upstream +package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch Upstream +package/zip/0002-configure-Don-t-use-host-CPP.patch Upstream +package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch Upstream +package/zip/0004-configure-use-LDFLAGS-from-command-line.patch Upstream +package/zip/0005-unix-configure-remove-GID-UID-size-check.patch Upstream +package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch Upstream +package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch Upstream +package/zip/0008-fix-musl-static-build.patch Upstream +package/zlib-ng/0001-Use-static-keyword-for-vec_sumsu-to-prevent-undefine.patch Upstream +package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch Upstream +package/zlib-ng/0003-zlib-ng-check-that-sys-auxv.h-exists-at-configure-time.patch Upstream +package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch Upstream +package/znc/0001-LibreSSL-3.5-opaqued-structures.patch Upstream +package/znc/0002-Fix-build-with-libressl.patch Upstream +package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch Upstream +package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch Upstream support/dependencies/check-host-asciidoc.sh Shellcheck support/dependencies/check-host-cmake.sh Shellcheck support/dependencies/check-host-gzip.sh Shellcheck @@ -309,10 +1835,10 @@ support/download/sftp Shellcheck support/download/svn Shellcheck support/download/wget Shellcheck support/gnuconfig/update Shellcheck -support/libtool/buildroot-libtool-v1.5.patch ApplyOrder Sob -support/libtool/buildroot-libtool-v2.2.patch ApplyOrder Sob -support/libtool/buildroot-libtool-v2.4.4.patch ApplyOrder -support/libtool/buildroot-libtool-v2.4.patch ApplyOrder Sob +support/libtool/buildroot-libtool-v1.5.patch ApplyOrder Sob Upstream +support/libtool/buildroot-libtool-v2.2.patch ApplyOrder Sob Upstream +support/libtool/buildroot-libtool-v2.4.4.patch ApplyOrder Upstream +support/libtool/buildroot-libtool-v2.4.patch ApplyOrder Sob Upstream support/misc/relocate-sdk.sh Shellcheck support/scripts/apply-patches.sh Shellcheck support/scripts/br2-external Shellcheck @@ -327,4 +1853,7 @@ support/scripts/mkusers Shellcheck support/scripts/setlocalversion Shellcheck support/testing/tests/core/post-build.sh Shellcheck support/testing/tests/package/test_opkg/post-build.sh Shellcheck -support/testing/tests/utils/test_get_developers/0001-package-binutils-change-.mk.patch NumberedSubject +support/testing/tests/utils/test_get_developers/0001-package-binutils-change-.mk.patch NumberedSubject Upstream +utils/brmake Shellcheck +utils/checkpackagelib/lib_patch.py Flake8 +utils/test-pkg Shellcheck From ae1fc4350473bbcc21b09268a253e7cdea6d25ba Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 1 Apr 2023 20:36:58 +0300 Subject: [PATCH 0253/2890] configs/linksprite_pcduino_defconfig: bump BSP versions Bump Linux kernel to 6.1.14 and U-Boot to 2023.01. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- configs/linksprite_pcduino_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index 806c4f069766..cf58e021bade 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -19,12 +19,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y # Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" @@ -40,7 +40,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 8f5dc080e55f650657bcd8bec536a17376c9b1c0 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 1 Apr 2023 20:36:59 +0300 Subject: [PATCH 0254/2890] configs/orangepi_one_defconfig: bump BSP versions Bump Linux to 6.1.14 and U-Boot to 2023.01. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- configs/orangepi_one_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index ba128424a0bf..3f383e337eb1 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -1,13 +1,13 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From d8a1bb2f639c5fcfa0e455c001c44799abbd407e Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 1 Apr 2023 20:37:00 +0300 Subject: [PATCH 0255/2890] configs/orangepi_pc_plus: bump BSP versions Bump Linux to 6.1.14 and U-Boot to 2023.01. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- configs/orangepi_pc_plus_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index ba946e5285ff..73ba934b6985 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC Plus" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" @@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From fdd9772739f3e8263fe711cf14aa4d01e37b9aac Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Apr 2023 20:00:08 +0200 Subject: [PATCH 0256/2890] checkpacakge: regenerate ignore list in reference build envirnment Commit 1ed07521322d (.checkpackageignore: add entries missing Upstream trailer) regenerated the list in a local environment, which differs from our reference build image, causing spurious issues [0]. Regenerate the list in the regerence image, now. [0] https://gitlab.com/buildroot.org/buildroot/-/jobs/4119717539 Signed-off-by: Yann E. MORIN --- .checkpackageignore | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 4847cd82bc75..02c892c1b314 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1106,7 +1106,7 @@ package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch Upstre package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch Upstream package/netatalk/S50netatalk EmptyLastLine Indent Variables package/netcat/0001-signed-bit-counting.patch Sob Upstream -package/netopeer2/S52netopeer2 Variables +package/netopeer2/S52netopeer2 Shellcheck Variables package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch Upstream package/netplug/0001-makefile-flags.patch Sob Upstream package/netplug/0002-add-missing-time-include.patch Upstream @@ -1570,7 +1570,7 @@ package/swupdate/swupdate.sh Shellcheck package/sylpheed/0001-harden-link-checker-before-accepting-click.patch Upstream package/syslog-ng/0001-fix-build-on-uclibc.patch Upstream package/sysprof/0001-define-NT_GNU_BUILD_ID.patch Upstream -package/sysrepo/S51sysrepo-plugind Indent +package/sysrepo/S51sysrepo-plugind Indent Shellcheck package/system-config-printer/0001-Add-option-to-disable-xmlto-manual-generation.patch Upstream package/system-config-printer/0002-configure-accept-non-system-cups-config.patch Upstream package/sysvinit/0001-Makefile-disable-stack-protector-strong.patch Upstream @@ -1636,6 +1636,7 @@ package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch Upst package/uhttpd/0001-Remove-Werror.patch Upstream package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch Upstream package/umtprd/0001-Fix-output_dir-make-dependency.patch Upstream +package/unbound/S70unbound Shellcheck package/unifdef/0001-Makefile-fix-error-on-install.patch Upstream package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch Upstream package/unscd/S46unscd Indent Shellcheck Variables @@ -1854,6 +1855,4 @@ support/scripts/setlocalversion Shellcheck support/testing/tests/core/post-build.sh Shellcheck support/testing/tests/package/test_opkg/post-build.sh Shellcheck support/testing/tests/utils/test_get_developers/0001-package-binutils-change-.mk.patch NumberedSubject Upstream -utils/brmake Shellcheck utils/checkpackagelib/lib_patch.py Flake8 -utils/test-pkg Shellcheck From b713a230c54559637baea065b731748201e19c1a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 4 Apr 2023 20:57:20 +0200 Subject: [PATCH 0257/2890] package/mali-driver: bump to version 2023-04-04 This versions fixed build failure on Linux 6.1 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/mali-driver/mali-driver.hash | 2 +- package/mali-driver/mali-driver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mali-driver/mali-driver.hash b/package/mali-driver/mali-driver.hash index 5d32c1af8a5e..de3b6e69f05b 100644 --- a/package/mali-driver/mali-driver.hash +++ b/package/mali-driver/mali-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 761e3f000b4c546cbd35baf34f5a0d1090f048dd44ee543773674192fd95f6b3 mali-driver-87c13e6994b20b5068e3a5e4f4c1b64db666a4c8.tar.gz +sha256 763d3cf76eb03584df6a13986a2877dc0ae5f310fc3d91e8a498fc5f89271dcc mali-driver-c90627f78d58567a2acb7cbf77d565e03a131294.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mali-driver/mali-driver.mk b/package/mali-driver/mali-driver.mk index bdc9fedeb4e4..8e059fe8bdab 100644 --- a/package/mali-driver/mali-driver.mk +++ b/package/mali-driver/mali-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -MALI_DRIVER_VERSION = 87c13e6994b20b5068e3a5e4f4c1b64db666a4c8 +MALI_DRIVER_VERSION = c90627f78d58567a2acb7cbf77d565e03a131294 MALI_DRIVER_SITE = $(call github,bootlin,mali-driver,$(MALI_DRIVER_VERSION)) MALI_DRIVER_DEPENDENCIES = linux MALI_DRIVER_LICENSE = GPL-2.0 From 4466c206212226da3d68374299989cada8d4542d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Aug 2022 12:17:18 +0200 Subject: [PATCH 0258/2890] package/poppler: fix introspection build Fix the following build failure raised since commit 9d1d4818c39d97ad7a1cdf6e075b9acae6dfff71: [ 98%] Generating Poppler-0.18.typelib Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" Fixes: - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: - drop patch adding INTROSPECTION_COMPILER_ARGS as it's now upstream as of 22.02.0, and we use 22.10.0 ] Signed-off-by: Yann E. MORIN --- package/poppler/poppler.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 02ccf742acdd..5524bfc420f7 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -47,7 +47,8 @@ POPPLER_DEPENDENCIES += gobject-introspection POPPLER_CONF_OPTS += \ -DENABLE_GOBJECT_INTROSPECTION=ON \ -DINTROSPECTION_SCANNER=$(STAGING_DIR)/usr/bin/g-ir-scanner \ - -DINTROSPECTION_COMPILER=$(STAGING_DIR)/usr/bin/g-ir-compiler + -DINTROSPECTION_COMPILER=$(STAGING_DIR)/usr/bin/g-ir-compiler \ + -DINTROSPECTION_COMPILER_ARGS="--includedir=$(STAGING_DIR)/usr/share/gir-1.0" else POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=OFF endif From d9228faa4dbda084168e3c83273e651c05b6b08b Mon Sep 17 00:00:00 2001 From: Thierry GUIBERT Date: Sun, 4 Sep 2022 15:46:13 +0200 Subject: [PATCH 0259/2890] doc/manual: add documentation about docker registry on gitlab.com Add a paragraph and an example about using the Buildroot image registry hosted on gtilab.com, for people who want to build their own image based on the offical one. Signed-off-by: Thierry GUIBERT Signed-off-by: Yann E. MORIN --- docs/manual/adding-board-support.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index cd90a5871fa2..b3a880245236 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -54,3 +54,19 @@ utils/docker-run script and inside it issue these commands: $ make +_defconfig+ $ make -------------------- + +By default, Buildroot developers use the official image hosted on the +https://gitlab.com/buildroot.org/buildroot/container_registry/2395076[gitlab.com +registry] and it should be convenient for most usage. If you still want +to build your own docker image, you can base it off the official image +as the +FROM+ directive of your own _Dockerfile_: + +---- +FROM registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM +RUN ... +COPY ... +---- + +The current version _YYYYMMDD.HHMM_ can be found in the +.gitlab-ci.yml+ +file at the top of the Buildroot source tree; all past versions are +listed in the aforementioned registry as well. From 4468f828859de1f4be82655d63e96d59e760db7d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 16 Apr 2023 14:28:41 +0200 Subject: [PATCH 0260/2890] doc/manual: fix formatting slightly Signed-off-by: Thierry GUIBERT [yann.morin.1998@free.fr: split off the previous patch by Thierry] Signed-off-by: Yann E. MORIN --- docs/manual/adding-board-support.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index b3a880245236..ef6dbd3c2b92 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -49,9 +49,10 @@ Buildroot configuration. Refer to xref:customize[] for more details. Before submitting patches for new boards it is recommended to test it by building it using latest gitlab-CI docker container. To do this use -utils/docker-run script and inside it issue these commands: ++utils/docker-run+ script and inside it issue these commands: + -------------------- - $ make +_defconfig+ + $ make _defconfig $ make -------------------- From 115d362e079a2c733508f5d1b37fafabcdd27370 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Sep 2022 16:45:41 +0200 Subject: [PATCH 0261/2890] package/ghostscript: add pdf support PDF support was disabled in commit 7a4944569ce8 (package/ghostscript: bump to version 9.55.0) as it was then a new option which broke the build. PDF support depends on both openjpeg and jbig2dec. There is already a conditional block for each, but it is not trivial to merge sanely, so we introduce a third conditionl block to enable PDF. AS explained in the comment, the dependencies are duplicated in that conditional block: in case the other conditions get dropped in the future, we will still want to depend on both for PDF support (unless that changes too, in which case it will also be easier to spot and update). Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14976 Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: - move to its own conditional block - add a comment about duplicated dependencies - expadn commit log. ] Signed-off-by: Yann E. MORIN --- package/ghostscript/ghostscript.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 5bf8b08966c6..364fa1469aab 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -43,7 +43,6 @@ GHOSTSCRIPT_CONF_OPTS = \ --enable-freetype \ --disable-gtk \ --without-libpaper \ - --without-pdf \ --with-system-libtiff ifeq ($(BR2_PACKAGE_JBIG2DEC),y) @@ -67,6 +66,15 @@ else GHOSTSCRIPT_CONF_OPTS += --disable-openjpeg endif +ifeq ($(BR2_PACKAGE_OPENJPEG)$(BR2_PACKAGE_JBIG2DEC),yy) +# Dependencies already handle on per-package basis above, +# but duplicated here for consistency. +GHOSTSCRIPT_DEPENDENCIES += openjpeg jbig2dec +GHOSTSCRIPT_CONF_OPTS += --with-pdf +else +GHOSTSCRIPT_CONF_OPTS += --without-pdf +endif + ifeq ($(BR2_PACKAGE_CUPS),y) GHOSTSCRIPT_DEPENDENCIES += cups GHOSTSCRIPT_CONF_OPTS += \ From c9a13ae0838174d1c05f026cee3ff66482620626 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 13 Sep 2022 16:53:03 +0930 Subject: [PATCH 0262/2890] package/coremark: Set cflags The coremark build needs to set PORT_CFLAGS explicitly in order to pick up the configured optmisation level, and other flags. Signed-off-by: Joel Stanley Acked-by: Chris Packham Signed-off-by: Yann E. MORIN --- package/coremark/coremark.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/coremark/coremark.mk b/package/coremark/coremark.mk index 418fd5c8d39b..9ea8693e7189 100644 --- a/package/coremark/coremark.mk +++ b/package/coremark/coremark.mk @@ -11,6 +11,7 @@ COREMARK_LICENSE_FILES = LICENSE.md define COREMARK_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) \ + PORT_CFLAGS="$(TARGET_CFLAGS)" \ PORT_DIR=linux$(if $(BR2_ARCH_IS_64),64) EXE= link endef From 7c73f93218c293cd7a2245763c63d02910de88b8 Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Tue, 13 Sep 2022 19:40:38 +0200 Subject: [PATCH 0263/2890] package/nodejs: introduce BR2_PACKAGE_HOST_NODEJS_COREPACK Corepack is a zero-runtime-dependency Node.js script that acts as a bridge between Node.js projects and the package managers. It ships with Node.js but is disabled by default. Some JavaScript packages, such as vuejs and vuejs-router can benefit from having Corepack installed on the host. Therefore, add an option to enable Corepack with host-nodejs. Signed-off-by: Thomas Claveirole Signed-off-by: Yann E. MORIN --- package/nodejs/Config.in.host | 21 +++++++++++++++++++-- package/nodejs/nodejs.mk | 21 +++++++++++++++++---- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host index f7f2b80a9b83..06a1ca22ad03 100644 --- a/package/nodejs/Config.in.host +++ b/package/nodejs/Config.in.host @@ -1,3 +1,6 @@ +comment "host nodejs needs a host gcc >= 8" + depends on !BR2_HOST_GCC_AT_LEAST_8 + config BR2_PACKAGE_HOST_NODEJS bool "host nodejs" depends on BR2_HOST_GCC_AT_LEAST_8 @@ -10,5 +13,19 @@ config BR2_PACKAGE_HOST_NODEJS http://nodejs.org/ -comment "host nodejs needs a host gcc >= 8" - depends on !BR2_HOST_GCC_AT_LEAST_8 +if BR2_PACKAGE_HOST_NODEJS + +config BR2_PACKAGE_HOST_NODEJS_COREPACK + bool "Corepack" + help + Enable Corepack with host nodejs. + + Corepack is a zero-runtime-dependency Node.js script that + acts as a bridge between Node.js projects and the package + managers they are intended to be used with during + development. In practical terms, Corepack will let you use + Yarn and pnpm without having to install them - just like + what currently happens with npm, which is shipped by Node.js + by default. + +endif diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 367d5d20587b..539ded06cd9e 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -109,10 +109,17 @@ define HOST_NODEJS_BUILD_CMDS $(HOST_NODEJS_MAKE_OPTS) endef +ifeq ($(BR2_PACKAGE_HOST_NODEJS_COREPACK),y) +define HOST_NODEJS_ENABLE_COREPACK + $(COREPACK) enable +endef +endif + define HOST_NODEJS_INSTALL_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) install \ $(HOST_NODEJS_MAKE_OPTS) + $(HOST_NODEJS_ENABLE_COREPACK) endef ifeq ($(BR2_i386),y) @@ -223,8 +230,7 @@ endef NODEJS_MODULES_LIST= $(call qstrip,\ $(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL)) -# Define NPM for other packages to use -NPM = $(TARGET_CONFIGURE_OPTS) \ +NODEJS_BIN_ENV = $(TARGET_CONFIGURE_OPTS) \ LDFLAGS="$(NODEJS_LDFLAGS)" \ LD="$(TARGET_CXX)" \ npm_config_arch=$(NODEJS_CPU) \ @@ -232,8 +238,15 @@ NPM = $(TARGET_CONFIGURE_OPTS) \ npm_config_build_from_source=true \ npm_config_nodedir=$(BUILD_DIR)/nodejs-$(NODEJS_VERSION) \ npm_config_prefix=$(TARGET_DIR)/usr \ - npm_config_cache=$(BUILD_DIR)/.npm-cache \ - $(HOST_DIR)/bin/npm + npm_config_cache=$(BUILD_DIR)/.npm-cache + +# Define various packaging tools for other packages to use +NPM = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/npm +ifeq ($(BR2_PACKAGE_HOST_NODEJS_COREPACK),y) +COREPACK = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/corepack +PNPM = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/pnpm +YARN = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/yarn +endif # # We can only call NPM if there's something to install. From c6bb759e2cb14ebaf2603e69652c44d337a39c72 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 18 Sep 2022 14:22:39 +0200 Subject: [PATCH 0264/2890] package/pkg-golang.mk: add osusergo and netgo tags in static builds CGO (the Go language C bindings) normally links dynamically with the C libraries. It seems that passing -extldflags=-static is not sufficient to make sure they link statically. As a result, a build using CGO will fail with runtime.gcdata: missing Go type information for global symbol .dynsym: size 72 There are two modules in the standard Go library that can use CGO: os/user and net. Both of these have pure Go versions, however, which can be selected with the osusergo and netgo tags. Since these two are standard library modules that get used in almost all Go programs, pass those flags in the common infrastructure. It's not entirely clear if this is always the case or only depending on the specific way CGO is used. In the former case, we could instead disable CGO globally if static libs are enabled. However, it turns out that this doesn't solve the problem completely anyway (delve still fails to link, with different errors). Also, it is possible that other cgo modules do still work. Therefore, just stick to adding the osusergo and netgo tags. Cf. Statically compiling Go programs [0] Fixes: - crucible: http://autobuild.buildroot.net/results/c2f/c2f29f55b461899e8e15c0494578304e6f74bf51/ - containerd: http://autobuild.buildroot.net/results/699/69910fc6b9f474a7eb0ca7ffa27ac5512cc1bb37/ - delve: http://autobuild.buildroot.net/results/552/55225d5da17e85271943f7adce6f07d014d9717d/ - probably others... [0] https://www.arp242.net/static-go.html Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-golang.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index da9c9a21ac92..7ba82284f3e8 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -102,6 +102,7 @@ ifeq ($(4),target) ifeq ($(BR2_STATIC_LIBS),y) $(2)_LDFLAGS += -extldflags '-static' +$(2)_TAGS += osusergo netgo endif # Build package for target From 5e1c238b7202c3b04d9eab94e429c5580c77444b Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sun, 16 Apr 2023 22:17:04 +0200 Subject: [PATCH 0265/2890] package/ltp-testsuite: require 5.11 headers for musl There was a conflict between musl and kernel headers prior to 5.11, due to a bug in kernel headers, which was fixed in a85cbe6159ff ("uapi: move constants from to ") in v5.11, and backported to stable/LTS kernels. Upsteam ltp-testsuite has been unreceptive to accepting the workaround, as they argue that the kernel headers have been fixed, and people should update their toolchains. However, it is not always practical, or even possible, to update the toolchain, so lets require kernel headers at least 5.11 for musl-based toolchains. Signed-off-by: Petr Vorel [yann.morin.1998@free.fr: reword commit log] Signed-off-by: Yann E. MORIN --- ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 211 ------------------ package/ltp-testsuite/Config.in | 1 + 2 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch diff --git a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch deleted file mode 100644 index 1553908cf8fe..000000000000 --- a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +++ /dev/null @@ -1,211 +0,0 @@ -From f34c6ca3d543968e900d6327d8b5900db63f08ad Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 1 Oct 2020 23:28:39 +0200 -Subject: [PATCH] lapi: Add sysinfo.h to fix build with MUSL libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The reason is to avoid indirect include when using -some network headers: or others -> --> - -This indirect include causes on MUSL redefinition of struct sysinfo when -included both and some of UAPI headers: - -In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5, - from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5, - from ../include/tst_netlink.h:14, - from tst_crypto.c:13: -x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of ‘struct sysinfo’ - struct sysinfo { - ^~~~~~~ -In file included from ../include/tst_safe_macros.h:15, - from ../include/tst_test.h:93, - from tst_crypto.c:11: -x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here - -Signed-off-by: Petr Vorel - -[ upstream status: -https://patchwork.ozlabs.org/project/ltp/patch/20201001231256.6930-1-petr.vorel@gmail.com/, -rebased for 20220527 ] - -But this patch is not going to get upstreamed because it got fixed in Linux kernel: -a85cbe6159ff "uapi: move constants from to " - -This patch was also backported to stable and LTS versions, -which we use since buildroot 54584d233b "{linux, linux-headers}: bump -5.{4, 10}.x 4.{4, 9, 14, 19} series". -We just wait for all musl based toolchains to be rebuilt. ] - -Signed-off-by: Petr Vorel ---- - include/lapi/sysinfo.h | 22 +++++++++++++++++++ - include/tst_safe_macros.h | 2 +- - lib/safe_macros.c | 2 +- - lib/tst_memutils.c | 2 +- - testcases/kernel/mem/mtest01/mtest01.c | 2 +- - testcases/kernel/syscalls/madvise/madvise06.c | 2 +- - testcases/kernel/syscalls/sysinfo/sysinfo01.c | 2 +- - testcases/kernel/syscalls/sysinfo/sysinfo02.c | 2 +- - testcases/kernel/syscalls/sysinfo/sysinfo03.c | 2 +- - .../interfaces/pthread_cond_broadcast/1-2.c | 2 +- - 10 files changed, 31 insertions(+), 9 deletions(-) - create mode 100644 include/lapi/sysinfo.h - -diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h -new file mode 100644 -index 000000000..d0e0e93d7 ---- /dev/null -+++ b/include/lapi/sysinfo.h -@@ -0,0 +1,22 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later -+/* -+ * Copyright (c) 2020 Petr Vorel -+ */ -+ -+#ifndef SYSINFO_H__ -+ -+/* -+ * Don't use as it breaks build MUSL toolchain. -+ * Use instead. -+ * -+ * Some kernel UAPI headers do indirect include: -+ * or others -> -> -+ * -+ * This indirect include causes on MUSL redefinition of struct sysinfo when -+ * included both and some of UAPI headers: -+ */ -+#include -+ -+#define SYSINFO_H__ -+ -+#endif /* SYSINFO_H__ */ -diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h -index 81c4b0844..a8c02d7df 100644 ---- a/include/tst_safe_macros.h -+++ b/include/tst_safe_macros.h -@@ -12,7 +12,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/lib/safe_macros.c b/lib/safe_macros.c -index a5b6bc504..87d922a92 100644 ---- a/lib/safe_macros.c -+++ b/lib/safe_macros.c -@@ -11,7 +11,7 @@ - #include - #include - #include --#include -+#include "lapi/sysinfo.h" - #include - #include - #include -diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index 0d20bb17c..21a3a5ba0 100644 ---- a/lib/tst_memutils.c -+++ b/lib/tst_memutils.c -@@ -6,7 +6,7 @@ - #include - #include - #include --#include -+#include "lapi/sysinfo.h" - #include - - #define TST_NO_DEFAULT_MAIN -diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c -index fb991ce8b..0fccd5405 100644 ---- a/testcases/kernel/mem/mtest01/mtest01.c -+++ b/testcases/kernel/mem/mtest01/mtest01.c -@@ -20,7 +20,6 @@ - */ - - #include --#include - #include - #include - #include -@@ -29,6 +28,7 @@ - #include - - #include "lapi/abisize.h" -+#include "lapi/sysinfo.h" - #include "tst_test.h" - - #define FIVE_HUNDRED_MB (500ULL*1024*1024) -diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c -index 6d218801c..8af11a030 100644 ---- a/testcases/kernel/syscalls/madvise/madvise06.c -+++ b/testcases/kernel/syscalls/madvise/madvise06.c -@@ -46,7 +46,7 @@ - #include - #include - #include --#include -+#include "lapi/sysinfo.h" - #include "tst_test.h" - - #define CHUNK_SZ (400*1024*1024L) -diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c -index 2ea44a2be..a237345ef 100644 ---- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c -+++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c -@@ -69,7 +69,7 @@ - #include - #include - #include --#include -+#include "lapi/sysinfo.h" - - #include "test.h" - -diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c -index 7ad0e8bdc..61fa1ab75 100644 ---- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c -+++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c -@@ -65,7 +65,7 @@ - #include - #include - #include --#include -+#include "lapi/sysinfo.h" - #include - - #include "test.h" -diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c -index af7cb6421..dc5ae65e3 100644 ---- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c -+++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c -@@ -13,7 +13,7 @@ - - */ - --#include -+#include "lapi/sysinfo.h" - #include "lapi/namespaces_constants.h" - #include "lapi/posix_clocks.h" - #include "tst_test.h" -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c -index 22e7c3638..572701f9f 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c -@@ -43,7 +43,7 @@ - #include - #include - #ifdef __linux__ --#include -+#include "lapi/sysinfo.h" - #endif - - #include "../testfrmw/testfrmw.h" --- -2.36.1 - diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in index 272c2ede374f..b42082e2cc5b 100644 --- a/package/ltp-testsuite/Config.in +++ b/package/ltp-testsuite/Config.in @@ -12,6 +12,7 @@ config BR2_PACKAGE_LTP_TESTSUITE bool "ltp-testsuite" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_TOOLCHAIN_USES_MUSL || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 depends on BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC From 1ace31aec59dc06375ba192b5838c4cc99072e81 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sun, 16 Apr 2023 22:17:05 +0200 Subject: [PATCH 0266/2890] package/ltp-testsuite: bump version to 20230127 Backport mount_attr fix for glibc-based toolchain. Fixes: - http://autobuild.buildroot.org/results/4dbb72e1bf081afd3cd944571b9beeefc7608865 Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- ...onfigure.ac-fix-mount_attr-detection.patch | 54 +++++++++++++++++++ package/ltp-testsuite/ltp-testsuite.hash | 5 +- package/ltp-testsuite/ltp-testsuite.mk | 2 +- 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 package/ltp-testsuite/0001-configure.ac-fix-mount_attr-detection.patch diff --git a/package/ltp-testsuite/0001-configure.ac-fix-mount_attr-detection.patch b/package/ltp-testsuite/0001-configure.ac-fix-mount_attr-detection.patch new file mode 100644 index 000000000000..740d3a6d6af6 --- /dev/null +++ b/package/ltp-testsuite/0001-configure.ac-fix-mount_attr-detection.patch @@ -0,0 +1,54 @@ +From 30353a1eb3ee8940f38d6a0e8f5f39352fd8a179 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 20:25:54 +0100 +Subject: [PATCH] configure.ac: fix mount_attr detection +Upstream: https://github.com/linux-test-project/ltp/commit/30353a1eb3ee8940f38d6a0e8f5f39352fd8a179 + +Commit b857f8723f30a4b9554bf6b0ff8fa52fd07e8b60 tried to fix build with +latest glibc which provides mount_attr in sys/mount.h. Unfortunately, +the following build failure is still raised because sys/mount is now +unconditionally included in include/lapi/fsmount.h: + +In file included from fsconfig01.c:9: +../../../../include/lapi/fsmount.h:55:8: error: redefinition of 'struct mount_attr' + 55 | struct mount_attr { + | ^~~~~~~~~~ +In file included from ../../../../include/lapi/fsmount.h:14: +/home/autobuild/autobuild/instance-4/output-1/host/armeb-buildroot-linux-gnueabi/sysroot/usr/include/sys/mount.h:210:8: note: originally defined here + 210 | struct mount_attr + | ^~~~~~~~~~ + +Fixes: b857f8723 ("lapi/fsmount: resolve conflict in different header files") +Fixes: http://autobuild.buildroot.org/results/4dbb72e1bf081afd3cd944571b9beeefc7608865 +Link: https://lore.kernel.org/ltp/20230226192554.669332-1-fontaine.fabrice@gmail.com/ +Reviewed-by: Li Wang +[ pvorel: fix from b857f8723 is needed for glibc before glibc-2.37~426, +i.e. without fix 774058d729 ("linux: Fix sys/mount.h usage with kernel headers") +(which was backported to 2.35 and 2.34 maintenance). ] +Reviewed-by: Petr Vorel +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 114468ae3..4c8763376 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -224,10 +224,10 @@ AC_CHECK_TYPES([struct __kernel_old_timeval, struct __kernel_old_timespec, struc + + AC_CHECK_TYPES([struct futex_waitv],,,[#include ]) + AC_CHECK_TYPES([struct mount_attr],,,[ +-#ifdef HAVE_LINUX_MOUNT_H +-# include +-#else ++#ifdef HAVE_MOUNT_SETATTR + # include ++#elif HAVE_LINUX_MOUNT_H ++# include + #endif + ]) + +-- +2.40.0 + diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index 8b411a8ffe50..59ba5d00458c 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,5 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20220527/ltp-full-20220527.tar.bz2.sha1 -sha1 c8d658cd3ab1f5a5c7b5bf56398d3a9525012c6b ltp-full-20220930.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20230127/ltp-full-20230127.tar.xz.sha256 +sha256 254412a52c7238f35a247337da186f485e76fb64c6549ed849b3442fc7a417ef ltp-full-20230127.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 533ab63915b916640667ecce17ee4998006d80d394d4b1f1d105a7aa1df50d38 ltp-full-20220930.tar.xz diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 34412d562fa4..78271b07306a 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20220930 +LTP_TESTSUITE_VERSION = 20230127 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) From 1557312f18a5e2a84387055aada9b1e6d59c5ad4 Mon Sep 17 00:00:00 2001 From: Mario Haustein Date: Mon, 26 Sep 2022 18:08:49 +0200 Subject: [PATCH 0267/2890] package/dcron: fix /etc/cron.d/system cron jobs Jobs with the syntax @hourly, @daily, ... were not executed since the version bump from `v4.5` to commit `1ba33c3325df48de46263276a43ed76cf9d81518`. This patch fixes the bug downstream. Signed-off-by: Mario Haustein Signed-off-by: Yann E. MORIN --- package/dcron/0002-system-crontab.patch | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/dcron/0002-system-crontab.patch diff --git a/package/dcron/0002-system-crontab.patch b/package/dcron/0002-system-crontab.patch new file mode 100644 index 000000000000..ac2936872759 --- /dev/null +++ b/package/dcron/0002-system-crontab.patch @@ -0,0 +1,28 @@ +From 1fd99b71b063b1573beaf9f6b801ec5be2fbe24f Mon Sep 17 00:00:00 2001 +From: Mario Haustein +Date: Fri, 2 Sep 2022 23:20:14 +0200 +Subject: [PATCH] Make @hourly, @daily, ... work again + +closes #15 + +Signed-off-by: Mario Haustein +Upstream: https://github.com/dubiousjim/dcron/pull/35 +--- + database.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/database.c b/database.c +index 37cf17a..6ec720e 100644 +--- a/database.c ++++ b/database.c +@@ -455,6 +455,8 @@ SynchronizeFile(const char *dpath, const char *fileName, const char *userName) + line.cl_Days[j] = 1; + for (j=0; j<12; ++j) + line.cl_Mons[j] = 1; ++ for (j=0; j<7; ++j) ++ line.cl_Dow[j] = ALL_DOW; + } + + while (*ptr == ' ' || *ptr == '\t') +-- +2.35.1 From a7ad7816262dd1b0db6c51a08f3013e2c473c0b3 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 27 Sep 2022 15:11:33 -0700 Subject: [PATCH 0268/2890] package/linux-tools: Exclude checking PE binaries from perf test Since upstream Linux commit ed21d6d7c48e6e96c2d617e304a7ebfbd17b1807 ("perf tests: Add test for PE binary format support") present in >= v5.10 there is an unconditional installation of PE binaries. Some toolchains have a readelf tool that correctly interpret the PE files, and reports ELF-alike fields. This causes check-bin-arch to reject those files. Make sure that these binaries are excluded from being checked to allow the installation of the perf tests. Fixes: 6fcdaa4c5096 ("package/linux-tools: Allow installation of perf scripts") Signed-off-by: Florian Fainelli Signed-off-by: Yann E. MORIN --- package/linux-tools/linux-tool-perf.mk.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index 5431c78152c5..122c7cbbc42e 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -169,6 +169,10 @@ define PERF_INSTALL_REMOVE_SCRIPTS $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/scripts/ $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/tests/ endef + +LINUX_TOOLS_BIN_ARCH_EXCLUDE += \ + /usr/libexec/perf-core/tests/pe-file.exe \ + /usr/libexec/perf-core/tests/pe-file.exe.debug endif define PERF_INSTALL_TARGET_CMDS From b100440bffea3e47e72a9ccce0bee618658f6a47 Mon Sep 17 00:00:00 2001 From: Witold Lipieta Date: Mon, 17 Apr 2023 15:03:42 +0200 Subject: [PATCH 0269/2890] package/python-evdev: new package evdev 1.6.1 https://pypi.org/project/evdev/ Signed-off-by: Witold Lipieta [yann.morin.1998@free.fr: - add missing comment on kernel headers - fix flake8 in test ] Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/python-evdev/Config.in | 10 ++++++++++ package/python-evdev/python-evdev.hash | 5 +++++ package/python-evdev/python-evdev.mk | 18 ++++++++++++++++++ .../tests/package/sample_python_evdev.py | 11 +++++++++++ .../testing/tests/package/test_python_evdev.py | 11 +++++++++++ 6 files changed, 56 insertions(+) create mode 100644 package/python-evdev/Config.in create mode 100644 package/python-evdev/python-evdev.hash create mode 100644 package/python-evdev/python-evdev.mk create mode 100644 support/testing/tests/package/sample_python_evdev.py create mode 100644 support/testing/tests/package/test_python_evdev.py diff --git a/package/Config.in b/package/Config.in index 760dda6ac1d1..eaac32a01af3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1049,6 +1049,7 @@ menu "External python modules" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" source "package/python-esptool/Config.in" + source "package/python-evdev/Config.in" source "package/python-falcon/Config.in" source "package/python-filelock/Config.in" source "package/python-fire/Config.in" diff --git a/package/python-evdev/Config.in b/package/python-evdev/Config.in new file mode 100644 index 000000000000..33e43c1f77f2 --- /dev/null +++ b/package/python-evdev/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_EVDEV + bool "python-evdev" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 + help + Bindings to the Linux input handling subsystem. + + https://github.com/gvalkov/python-evdev + +comment "python-evdev needs a toolchain w/ headers >= 4.4" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 diff --git a/package/python-evdev/python-evdev.hash b/package/python-evdev/python-evdev.hash new file mode 100644 index 000000000000..9a6d0d07beb8 --- /dev/null +++ b/package/python-evdev/python-evdev.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/evdev/json +md5 905b12ef6136b518ddf418d8d5b053e4 evdev-1.6.1.tar.gz +sha256 299db8628cc73b237fc1cc57d3c2948faa0756e2a58b6194b5bf81dc2081f1e3 evdev-1.6.1.tar.gz +# Locally computed sha256 checksums +sha256 55fd76d7b3f90d312f161d318631b93c58a0e69d662d07c4f5aca2c6c9ecc85e LICENSE diff --git a/package/python-evdev/python-evdev.mk b/package/python-evdev/python-evdev.mk new file mode 100644 index 000000000000..5cf62b516037 --- /dev/null +++ b/package/python-evdev/python-evdev.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# python-evdev +# +################################################################################ + +PYTHON_EVDEV_VERSION = 1.6.1 +PYTHON_EVDEV_SOURCE = evdev-$(PYTHON_EVDEV_VERSION).tar.gz +PYTHON_EVDEV_SITE = https://files.pythonhosted.org/packages/05/50/629b011a7f61cb2fca754ea8631575784bf8605a1ec4d6970a010bc54e2b +PYTHON_EVDEV_SETUP_TYPE = setuptools +PYTHON_EVDEV_LICENSE = Revised BSD License +PYTHON_EVDEV_LICENSE_FILES = LICENSE + +PYTHON_EVDEV_BUILD_OPTS = \ + build_ecodes \ + --evdev-headers $(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_evdev.py b/support/testing/tests/package/sample_python_evdev.py new file mode 100644 index 000000000000..0c00fa6e2f55 --- /dev/null +++ b/support/testing/tests/package/sample_python_evdev.py @@ -0,0 +1,11 @@ +import evdev + +devices = [evdev.InputDevice(path) for path in evdev.list_devices()] +e = evdev.events.InputEvent(1036996631, 984417, evdev.ecodes.EV_KEY, evdev.ecodes.KEY_A, 2) +k = evdev.events.KeyEvent(e) + +assert(k.keystate == evdev.events.KeyEvent.key_hold) +assert(k.event == e) +assert(k.scancode == evdev.ecodes.KEY_A) +assert(k.keycode == 'KEY_A') +assert(len(devices) > 0) diff --git a/support/testing/tests/package/test_python_evdev.py b/support/testing/tests/package/test_python_evdev.py new file mode 100644 index 000000000000..162e53072ed6 --- /dev/null +++ b/support/testing/tests/package/test_python_evdev.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Evdev(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_EVDEV=y + """ + sample_scripts = ["tests/package/sample_python_evdev.py"] From 548e30d140066d5464eef1c3be57284a1a3dcf5e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 22 Apr 2023 15:36:07 +0200 Subject: [PATCH 0270/2890] package/openocd: add the eCos exception to the GPL-2.0+ license As noted by Yann E. MORIN in [1] only the src/flash/nand/ecc.c file refers to the eCos license. The SPDX identifier for that file is: SPDX-License-Identifier: GPL-2.0-or-later WITH eCos-exception-2.0 The file is part of the openocd executable via libopenocd.la, which being a static library it is not installed. Based on this, becomes more natural to associate the eCos exception with the GPL 2.0+ license, rather than considering it separately as a license. [1] https://patchwork.ozlabs.org/project/buildroot/patch/20230411203930.2455301-1-dario.binacchi@amarulasolutions.com/ Suggested-by: Yann E. MORIN Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/openocd/openocd.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 9973498cf568..78c6e10c58e4 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -8,14 +8,13 @@ OPENOCD_VERSION = 0.12.0 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION) OPENOCD_LICENSE = \ - eCos-exception-2.0, \ BSD-1-clause, \ BSD-2-clause, \ BSD-2-Clause-Views, \ BSD-3-clause, \ BSD-Source-Code, \ GFDL-1.2-no-invariants-or-later (docs), \ - GPL-2.0+ (code), \ + GPL-2.0+ with eCos-exception-2.0 (code), \ GPL-3.0+ (stand-alone code), \ MIT From 1f9332229e52f1792c1296dfacc910a330b3d850 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 23 Apr 2023 12:58:54 +0200 Subject: [PATCH 0271/2890] checkpackageignore: regenerate Commit 5e1c238b7202 (package/ltp-testsuite: require 5.11 headers for musl) dropped a patch, which had no "upstream" status, and thus had an ignore entry, which itself was ignored when the patch got removed. Regenerate .checkpackage ignore now. Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index 02c892c1b314..e11b5b6bb854 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -979,7 +979,6 @@ package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch package/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch Upstream package/lockfile-progs/0001-sus3v-legacy.patch Sob Upstream package/lshw/0001-solve-Compile-error-when-g-version-is-less-than-5.patch Upstream -package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch Upstream package/ltrace/0001-arm-plt.patch Upstream package/ltrace/0002-sparc-add-missing-library.h-include.patch Upstream package/ltrace/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch Upstream From d2758794a453aa1eacdcb048070e6434ec601ca5 Mon Sep 17 00:00:00 2001 From: James Knight Date: Fri, 21 Apr 2023 10:12:07 -0400 Subject: [PATCH 0272/2890] package/libglib2: add upstream status to girdir patch Providing an upstream status for the remaining libglib2 patch from a recent version bump. This patch was introduced in Buildroot around November 2021 to help deal with build errors where `GObject-2.0.gir` could not be found (tied to Buildroot changes made in `gobject-introspection.mk`). The discussion thread mentions this could be submitted upstream, but looks like it never was. Reflecting that this package has not been submitted upstream. Signed-off-by: James Knight [yann.morin.1998@free.fr: update .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...04-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index e11b5b6bb854..f0ad3e88bd81 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -804,7 +804,6 @@ package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch package/libglib2/0001-fix-compile-time-atomic-detection.patch Upstream package/libglib2/0002-remove-cpp-requirement.patch Upstream package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch Upstream -package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch Upstream package/libgpgme/0001-Fix-build-without-threads.patch Upstream package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch Upstream package/libgsm/0001-misc-fixes-from-archlinux.patch Upstream diff --git a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index db77a73203fa..fb9905724278 100644 --- a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -14,6 +14,7 @@ Fixes: - http://autobuild.buildroot.org/results/3088ef32b03e0bb984291b1227b187f1ff816eb7 Signed-off-by: Fabrice Fontaine +Upstream: Never submitted --- gio/meson.build | 1 + glib/meson.build | 1 + From 3f9622fe3d85b4d9f734b879abc1d485afea19b2 Mon Sep 17 00:00:00 2001 From: James Knight Date: Fri, 21 Apr 2023 10:12:06 -0400 Subject: [PATCH 0273/2890] package/libglib2: bump version to 2.76.1 - glib2 has moved from PCRE to PCRE2 [1]. - Drop `fam` option since it no longer available [2]. - Drop "0001-fix-compile-time-atomic-detection.patch" since upstream patch was dropped and new atomic detection implementation has been applied in this version. - Drop "0002-remove-cpp-requirement.patch" since upstream has modified its Meson scripts to have any C++ usage as optional. - Drop "0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch" since change is available in this version. - Add new patch to address new Werror compilation errors [3]. - Renamed "0004-*.patch" -> "0001-*.patch" since it should still be applicable for its mentioned build case. [1]: https://bugzilla.redhat.com/show_bug.cgi?id=1938974 [2]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2570 [3]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3390 Signed-off-by: James Knight [yann.morin.1998@free.fr: - update upstream status on new patch - regenerate .checkpackageignore ] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 3 - ...01-fix-compile-time-atomic-detection.patch | 34 ------- ...irdir-to-gio-2.0.pc-and-glib-2.0.pc.patch} | 0 ...rmat-in-gio-gunixconnection.c-part-2.patch | 93 +++++++++++++++++++ .../0002-remove-cpp-requirement.patch | 87 ----------------- ...mat-nonliteral-to-compiler-arguments.patch | 29 ------ package/libglib2/Config.in | 3 +- package/libglib2/libglib2.hash | 6 +- package/libglib2/libglib2.mk | 14 ++- 9 files changed, 106 insertions(+), 163 deletions(-) delete mode 100644 package/libglib2/0001-fix-compile-time-atomic-detection.patch rename package/libglib2/{0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch => 0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch} (100%) create mode 100644 package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch delete mode 100644 package/libglib2/0002-remove-cpp-requirement.patch delete mode 100644 package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch diff --git a/.checkpackageignore b/.checkpackageignore index f0ad3e88bd81..2758ad93778a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -801,9 +801,6 @@ package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.pat package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch Upstream package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch Upstream package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch Upstream -package/libglib2/0001-fix-compile-time-atomic-detection.patch Upstream -package/libglib2/0002-remove-cpp-requirement.patch Upstream -package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch Upstream package/libgpgme/0001-Fix-build-without-threads.patch Upstream package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch Upstream package/libgsm/0001-misc-fixes-from-archlinux.patch Upstream diff --git a/package/libglib2/0001-fix-compile-time-atomic-detection.patch b/package/libglib2/0001-fix-compile-time-atomic-detection.patch deleted file mode 100644 index aae505f8e5c9..000000000000 --- a/package/libglib2/0001-fix-compile-time-atomic-detection.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d5c628a6179b99705fa05ab87437321b132c81bc Mon Sep 17 00:00:00 2001 -From: Brendan Heading -Date: Wed, 21 Jun 2017 16:36:15 -0400 -Subject: [PATCH] Fix compile time atomic detection - -Improved compile-time detection of atomic support in the compiler. - -Upstream-Status: 'Needs information' -See : https://gitlab.gnome.org/GNOME/glib/issues/1063 - -Signed-off-by: Brendan Heading -Signed-off-by: Adam Duskett -Refresh for 2.68.1 ---- - glib/gthread-posix.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c -index 71a6b7b..d09d029 100644 ---- a/glib/gthread-posix.c -+++ b/glib/gthread-posix.c -@@ -72,8 +72,7 @@ - #include - #endif - --#if defined(HAVE_FUTEX) && \ -- (defined(HAVE_STDATOMIC_H) || defined(__ATOMIC_SEQ_CST)) -+#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && !defined(__clang__) - #define USE_NATIVE_MUTEX - #endif - --- -2.9.4 - diff --git a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch similarity index 100% rename from package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch rename to package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch diff --git a/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch b/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch new file mode 100644 index 000000000000..6075bacb06fd --- /dev/null +++ b/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch @@ -0,0 +1,93 @@ +From 4ae8606b6f80f9764e1f0a82cea7e23c8af487ae Mon Sep 17 00:00:00 2001 +From: James Knight +Date: Thu, 20 Apr 2023 23:41:32 -0400 +Subject: [PATCH] Fix error format in gio/gunixconnection.c (part 2) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Update a series of error messages to use `g_set_error_literal` instead +of `g_set_error`. This should prevent `format-nonliteral` compiler +issues when `-Werror` is configured: + + ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_fd’: + ../gio/gunixconnection.c:183:9: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] + 183 | nscm); + | ^~~~ + ../gio/gunixconnection.c:217:20: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] + 217 | nfd); + | ^~~ + ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_credentials’: + ../gio/gunixconnection.c:601:24: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] + 601 | nscm); + | ^~~~ + +This is similar to a previous change [1] made to `gunixconnection.c`. + +[1]: 44b3d5d80445234041f6c59feb89645f7102c3a4 + +Signed-off-by: James Knight +Upstream: backport from upstream https://gitlab.gnome.org/GNOME/glib/-/commit/4ae8606b6f80f9764e1f0a82cea7e23c8af487ae +--- + gio/gunixconnection.c | 31 ++++++++++++++----------------- + 1 file changed, 14 insertions(+), 17 deletions(-) + +diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c +index b3f2b1c04b0abdf7136918585ae4cea8970a88bb..c012fcbfe00b69e9da609c7b626229db98e931ac 100644 +--- a/gio/gunixconnection.c ++++ b/gio/gunixconnection.c +@@ -176,11 +176,10 @@ g_unix_connection_receive_fd (GUnixConnection *connection, + { + gint i; + +- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, +- ngettext("Expecting 1 control message, got %d", +- "Expecting 1 control message, got %d", +- nscm), +- nscm); ++ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, ++ ngettext ("Expecting 1 control message, got %d", ++ "Expecting 1 control message, got %d", ++ nscm)); + + for (i = 0; i < nscm; i++) + g_object_unref (scms[i]); +@@ -210,11 +209,10 @@ g_unix_connection_receive_fd (GUnixConnection *connection, + { + gint i; + +- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, +- ngettext("Expecting one fd, but got %d\n", +- "Expecting one fd, but got %d\n", +- nfd), +- nfd); ++ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, ++ ngettext ("Expecting one fd, but got %d\n", ++ "Expecting one fd, but got %d\n", ++ nfd)); + + for (i = 0; i < nfd; i++) + close (fds[i]); +@@ -592,13 +590,12 @@ g_unix_connection_receive_credentials (GUnixConnection *connection, + { + if (nscm != 1) + { +- g_set_error (error, +- G_IO_ERROR, +- G_IO_ERROR_FAILED, +- ngettext("Expecting 1 control message, got %d", +- "Expecting 1 control message, got %d", +- nscm), +- nscm); ++ g_set_error_literal (error, ++ G_IO_ERROR, ++ G_IO_ERROR_FAILED, ++ ngettext ("Expecting 1 control message, got %d", ++ "Expecting 1 control message, got %d", ++ nscm)); + goto out; + } + +-- +2.39.1.windows.1 + diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch deleted file mode 100644 index 84511dea324e..000000000000 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ /dev/null @@ -1,87 +0,0 @@ -From dd65a8cfdeafeb18b72d8d1eb676c7ca43ae505f Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Mon, 16 Sep 2019 10:12:38 -0700 -Subject: [PATCH] remove cpp requirement - -The c++ test is necessary to ensure libglib doesn't accidentally use C++ -reserved keywords in public headers. Because this is just a test, it isn't -necessary to have a C++ compiler to build libglib2. - -Signed-off-by: Adam Duskett -Upstream status: Denied (Buildroot specific) -https://gitlab.gnome.org/GNOME/glib/issues/1748 ---- - glib/glibconfig.h.in | 1 - - meson.build | 19 +------------------ - 2 files changed, 1 insertion(+), 19 deletions(-) - -diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in -index e66748d95..2173d8be6 100644 ---- a/glib/glibconfig.h.in -+++ b/glib/glibconfig.h.in -@@ -119,7 +119,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; - @glib_vacopy@ - - @g_have_iso_c_varargs@ --@g_have_iso_cxx_varargs@ - - /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi - * is passed ISO vararg support is turned off, and there is no work -diff --git a/meson.build b/meson.build -index 48fdfe864..5df242e39 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('glib', 'c', 'cpp', -+project('glib', 'c', - version : '2.72.3', - # NOTE: We keep this pinned at 0.52 because that's what Debian Stable ships - meson_version : '>= 0.52.0', -@@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', - ) - - cc = meson.get_compiler('c') --cxx = meson.get_compiler('cpp') - - cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() - -@@ -495,7 +494,6 @@ else - endif - - add_project_arguments(cc.get_supported_arguments(warning_c_args), language: 'c') --add_project_arguments(cxx.get_supported_arguments(warning_cxx_args), language: 'cpp') - - # FIXME: We cannot build some of the GResource tests with -z nodelete, which - # means we cannot use that flag in add_project_link_arguments(), and must add -@@ -1734,20 +1732,6 @@ if g_have_iso_c_varargs - #endif''') - endif - --g_have_iso_cxx_varargs = cxx.compiles(''' -- void some_func (void) { -- int a(int p1, int p2, int p3); -- #define call_a(...) a(1,__VA_ARGS__) -- call_a(2,3); -- }''', name : 'ISO C99 varargs macros in C++') -- --if g_have_iso_cxx_varargs -- glibconfig_conf.set('g_have_iso_cxx_varargs', ''' --#ifdef __cplusplus --# define G_HAVE_ISO_VARARGS 1 --#endif''') --endif -- - g_have_gnuc_varargs = cc.compiles(''' - void some_func (void) { - int a(int p1, int p2, int p3); -@@ -2381,7 +2365,6 @@ subdir('gobject') - subdir('gthread') - subdir('gmodule') - subdir('gio') --subdir('fuzzing') - if build_tests - subdir('tests') - endif --- -2.34.1 - diff --git a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch deleted file mode 100644 index e212393011ab..000000000000 --- a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9e0f11a4981737f98bac93a22b6f2ff1a3887b63 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Tue, 9 Apr 2019 13:03:51 -0400 -Subject: [PATCH] Add '-Wno-format-nonliteral' to compiler arguments. - -This warning is a false positive on older versions of gcc. -See https://gitlab.gnome.org/GNOME/glib/issues/1744 for more details. - -Signed-off-by: Adam Duskett -Refresh for 2.68.1 ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 3c615b7..7cae4e8 100644 ---- a/meson.build -+++ b/meson.build -@@ -435,6 +435,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' - # building with -Wbad-function-cast. - '-Wno-bad-function-cast', - '-Wno-cast-function-type', -+ '-Wno-format-nonliteral', - # Due to function casts through (void*) we cannot support -Wpedantic: - # https://wiki.gnome.org/Projects/GLib/CompilerRequirements#Function_pointer_conversions. - '-Wno-pedantic', --- -2.20.1 - diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index 31f3649c7578..077d7d66e8d5 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -5,8 +5,7 @@ config BR2_PACKAGE_LIBGLIB2 depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBFFI - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_PCRE_UCP + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_ZLIB help Low-level core library that forms the basis of GTK+ and GNOME. diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 0395ff234ad7..07ed7635a68f 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.72/glib-2.72.3.sha256sum -sha256 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 glib-2.72.3.tar.xz +# https://download.gnome.org/sources/glib/2.76/glib-2.76.1.sha256sum +sha256 43dc0f6a126958f5b454136c4398eab420249c16171a769784486e25f2fda19f glib-2.76.1.tar.xz # License files, locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 3084aa6cb8d9..ecd7d5dbfe2d 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.72 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3 +LIBGLIB2_VERSION_MAJOR = 2.76 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = https://download.gnome.org/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ @@ -24,7 +24,6 @@ endif HOST_LIBGLIB2_CONF_OPTS = \ -Ddtrace=false \ - -Dfam=false \ -Dglib_debug=disabled \ -Dlibelf=disabled \ -Dselinux=disabled \ @@ -35,12 +34,12 @@ HOST_LIBGLIB2_CONF_OPTS = \ LIBGLIB2_DEPENDENCIES = \ host-pkgconf host-libglib2 \ - libffi pcre zlib $(TARGET_NLS_DEPENDENCIES) + libffi pcre2 zlib $(TARGET_NLS_DEPENDENCIES) HOST_LIBGLIB2_DEPENDENCIES = \ host-gettext \ host-libffi \ - host-pcre \ + host-pcre2 \ host-pkgconf \ host-util-linux \ host-zlib @@ -69,6 +68,11 @@ ifeq ($(BR2_PACKAGE_ELFUTILS),y) LIBGLIB2_DEPENDENCIES += elfutils endif +# Uses __atomic_compare_exchange_4 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBGLIB2_LDFLAGS += -latomic +endif + ifeq ($(BR2_PACKAGE_LIBICONV),y) LIBGLIB2_CONF_OPTS += -Diconv=external LIBGLIB2_DEPENDENCIES += libiconv From b5b1d830b8713393d63227caa09064aa594e15cb Mon Sep 17 00:00:00 2001 From: James Knight Date: Fri, 21 Apr 2023 10:12:08 -0400 Subject: [PATCH 0274/2890] package/glib-networking: bump version to 2.76.0 - Drop "0001-meson-change-std-to-gnu99.patch" since change is available in this version. Signed-off-by: James Knight [yann.morin.1998@free.fr: regenerate .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - .../0001-meson-change-std-to-gnu99.patch | 30 ------------------- package/glib-networking/glib-networking.hash | 4 +-- package/glib-networking/glib-networking.mk | 4 +-- 4 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 package/glib-networking/0001-meson-change-std-to-gnu99.patch diff --git a/.checkpackageignore b/.checkpackageignore index 2758ad93778a..5f6538ea7457 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -606,7 +606,6 @@ package/giblib/0001-fix-imlib2-detection.patch Upstream package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch Upstream package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch Upstream package/gli/0001-Optional-building-tests.patch Upstream -package/glib-networking/0001-meson-change-std-to-gnu99.patch Upstream package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch Upstream package/glmark2/0002-libmatrix-Add-missing-utility-include.patch Upstream package/glog/0001-added-emscripten-support.patch Upstream diff --git a/package/glib-networking/0001-meson-change-std-to-gnu99.patch b/package/glib-networking/0001-meson-change-std-to-gnu99.patch deleted file mode 100644 index 9f266bc2c8d2..000000000000 --- a/package/glib-networking/0001-meson-change-std-to-gnu99.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cdfa726bae1d82b7bd3735475fc2b2c6a31c1d2f Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Fri, 12 Nov 2021 11:51:33 +0100 -Subject: [PATCH] meson: change std to gnu99 - -This is the same as glib and should fix issues with old -compilers - -(cherry picked from commit b192086b9936602a40a14d00a6883b339b9d7955) -Signed-off-by: Thomas Devoogdt ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index b018ca7b..130a2bf0 100644 ---- a/meson.build -+++ b/meson.build -@@ -3,7 +3,7 @@ project( - version: '2.70.0', - license: 'LGPL2.1+', - meson_version: '>= 0.50.0', -- default_options: ['c_std=c99'] -+ default_options: ['c_std=gnu99'] - ) - - prefix = get_option('prefix') --- -2.17.1 - diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 766efd0ced4e..72e70ff0edad 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.1.sha256sum -sha256 2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc glib-networking-2.70.1.tar.xz +# From https://download.gnome.org/sources/glib-networking/2.76/glib-networking-2.76.0.sha256sum +sha256 149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a glib-networking-2.76.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index b6d29110ed53..24811716582c 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -4,8 +4,8 @@ # ################################################################################ -GLIB_NETWORKING_VERSION_MAJOR = 2.70 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1 +GLIB_NETWORKING_VERSION_MAJOR = 2.76 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 GLIB_NETWORKING_SITE = https://download.gnome.org/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES From e538824692822cab06c44e6b70e9ae3b92d4c920 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 22 Apr 2023 02:34:58 -0700 Subject: [PATCH 0275/2890] DEVELOPERS: update email address This patch updates my email address in the DEVELOPERS file. Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 5cd882b5791c..d9e95a3d0531 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -538,7 +538,7 @@ F: package/syslog-ng/ N: Christian Kellermann F: package/python-pylibftdi/ -N: Christian Stewart +N: Christian Stewart F: package/balena-engine/ F: package/batman-adv/ F: package/catatonit/ From 6104b62d95e87e5cb4f4815b78841541de4301e8 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Mon, 13 Mar 2023 09:13:23 +0300 Subject: [PATCH 0276/2890] package/postgresql: ignore CVE-2017-8806 CVE-2017-8806 is related to postgresql-common package, as present in Debian and its derivatives; Buildroot does not have that package. It is false positive for postgresql, so ignore it. To be noted, is that a similar CVE [0] applied to postgresql itself, as stated in [1], but that was fixed a while ago [2], and we need not ignore it. [0] https://nvd.nist.gov/vuln/detail/CVE-2017-12172 [1] https://ubuntu.com/security/CVE-2017-8806 [2] https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=dfc015dcf46c1996bd7ed5866e9e045d258604b3 Signed-off-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN --- package/postgresql/postgresql.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index a2aed9a2eb79..e46622c0e7a9 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -19,6 +19,10 @@ POSTGRESQL_CONF_ENV = \ POSTGRESQL_CONF_OPTS = --disable-rpath POSTGRESQL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +# CVE-2017-8806 is related to postgresql-common package +# It is false positive for postgresql +POSTGRESQL_IGNORE_CVES += CVE-2017-8806 + # https://www.postgresql.org/docs/11/static/install-procedure.html: # "If you want to invoke the build from another makefile rather than # manually, you must unset MAKELEVEL or set it to zero" From 3d8212c4b29d00caf20a3036ced885a3260678ec Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Apr 2023 21:43:41 +0200 Subject: [PATCH 0277/2890] utils/docker-run: allow running without a tty Currently, utils/docker-run spawns a container with a tty, so that he user can interact properly in the container. However, that requires a tty when calling docker-run, which is not always guaranteed, e.g. if called from a git hook. Since the script is a bash script already, we can use an array to store options passed to docker, and only add the -t option when there is actually a tty available. Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski --- utils/docker-run | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/utils/docker-run b/utils/docker-run index 164e11c0e6f1..135a1451b624 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -6,8 +6,15 @@ MAIN_DIR=$(readlink -f "${DIR}/..") IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') -exec docker run -it --rm \ - --user "$(id -u):$(id -g)" \ - --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ - --workdir "${MAIN_DIR}" \ - "${IMAGE}" "${@}" +declare -a docker_opts=( + -i + --rm + --user "$(id -u):$(id -g)" + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" + --workdir "${MAIN_DIR}" +) +if tty -s; then + docker_opts+=( -t ) +fi + +exec docker run "${docker_opts[@]}" "${IMAGE}" "${@}" From a3e796b74e98171518cdf72920875264eb685988 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 23 Apr 2023 21:47:51 +0200 Subject: [PATCH 0278/2890] utils/check-package: fix grammar The past participle for "to fix" is "fix". The "did you forget" got eluded into "forget", so again a past participle. Signed-off-by: Yann E. MORIN --- support/testing/tests/utils/test_check_package.py | 4 ++-- utils/check-package | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 87382e07b0b5..0bea0902c87d 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -228,9 +228,9 @@ def test_run(self): self.WITH_UTILS_IN_PATH, subdir_path) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:0: Indent was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + self.assertIn("{}:0: Indent was expected to fail, did you fix the file and forgot to update .checkpackageignore_outdated?" .format(subdir_file), w) - self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update " + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fix the file and forgot to update " ".checkpackageignore_outdated?" .format(subdir_file), w) diff --git a/utils/check-package b/utils/check-package index 9a345522b43a..83b9750f5a9c 100755 --- a/utils/check-package +++ b/utils/check-package @@ -256,7 +256,7 @@ def check_file_using_lib(fname): for should_fail in xfail: if should_fail not in failed: - print("{}:0: {} was expected to fail, did you fixed the file and forgot to update {}?" + print("{}:0: {} was expected to fail, did you fix the file and forget to update {}?" .format(fname, should_fail, flags.ignore_filename)) nwarnings += 1 From 4f38b5dcbd09ae8eb73ff64741c1df0be3b1c0f7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 23 Apr 2023 21:53:02 +0200 Subject: [PATCH 0279/2890] support/testing: complete the grammar fix Commit a3e796b74e98 (utils/check-package: fix grammar) only partially fixed the test-case (git commit --amend missed the test-case...) Signed-off-by: Yann E. MORIN --- support/testing/tests/utils/test_check_package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 0bea0902c87d..9aa117d21121 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -228,9 +228,9 @@ def test_run(self): self.WITH_UTILS_IN_PATH, subdir_path) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:0: Indent was expected to fail, did you fix the file and forgot to update .checkpackageignore_outdated?" + self.assertIn("{}:0: Indent was expected to fail, did you fix the file and forget to update .checkpackageignore_outdated?" .format(subdir_file), w) - self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fix the file and forgot to update " + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fix the file and forget to update " ".checkpackageignore_outdated?" .format(subdir_file), w) From 2dff6e93ca2a675cebe5cfb6d864ff5da78a4ef4 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 22 Mar 2023 17:25:38 +0100 Subject: [PATCH 0280/2890] package/readline: add upstream patch to fix crash with invalid locale specification Add upstream patch to fix crash with invalid locale specification (see [1] for details). Fixes: - https://bugs.busybox.net/show_bug.cgi?id=15456 [1] https://lists.gnu.org/archive/html/bug-readline/2022-10/msg00002.html Signed-off-by: Peter Seiderer Tested-by: Stefan Agner Signed-off-by: Yann E. MORIN --- ...ch-1-fix-crash-when-readline-is-star.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch diff --git a/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch new file mode 100644 index 000000000000..b0f784b8ba32 --- /dev/null +++ b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch @@ -0,0 +1,41 @@ +From b8d91eab12603fa88e095248855f5f772d182d05 Mon Sep 17 00:00:00 2001 +From: Chet Ramey +Date: Wed, 5 Oct 2022 10:41:16 -0400 +Subject: [PATCH] Readline-8.2 patch 1: fix crash when readline is started with + an invalid locale specification + +[Upstream: https://git.savannah.gnu.org/cgit/readline.git/patch/?id=7274faabe97ce53d6b464272d7e6ab6c1392837b + Stripped unrelated ._.gitignore change] +Signed-off-by: Peter Seiderer +--- + nls.c | 4 ++++ + patchlevel | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/nls.c b/nls.c +index 5c6a13b..8c027d6 100644 +--- a/nls.c ++++ b/nls.c +@@ -141,6 +141,10 @@ _rl_init_locale (void) + if (lspec == 0) + lspec = ""; + ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ ++ if (ret == 0 || *ret == 0) ++ ret = setlocale (LC_CTYPE, (char *)NULL); ++ if (ret == 0 || *ret == 0) ++ ret = RL_DEFAULT_LOCALE; + #else + ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec; + #endif +diff --git a/patchlevel b/patchlevel +index d8c9df7..fdf4740 100644 +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-0 ++1 +-- +2.39.2 + From d89fdaea2b795ea0e06c3b7ed092d50950559fa8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 24 Apr 2023 21:01:08 +0200 Subject: [PATCH 0281/2890] package/readline: fix "Upstream:" tag The test chckes that the "Upstream:" tag be on the first column, without any leading character (no space, no bracket of any kind). Signed-off-by: Yann E. MORIN --- ...Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch index b0f784b8ba32..c2c2d812600e 100644 --- a/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch +++ b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch @@ -4,8 +4,8 @@ Date: Wed, 5 Oct 2022 10:41:16 -0400 Subject: [PATCH] Readline-8.2 patch 1: fix crash when readline is started with an invalid locale specification -[Upstream: https://git.savannah.gnu.org/cgit/readline.git/patch/?id=7274faabe97ce53d6b464272d7e6ab6c1392837b - Stripped unrelated ._.gitignore change] +Upstream: https://git.savannah.gnu.org/cgit/readline.git/patch/?id=7274faabe97ce53d6b464272d7e6ab6c1392837b +[peter: stripped unrelated ._.gitignore change] Signed-off-by: Peter Seiderer --- nls.c | 4 ++++ From d79fce3edd69f0a92495042ca8ed2f777006f2f6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 20:07:46 +0200 Subject: [PATCH 0282/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 5cbef197abbb..690ee9c3392e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index f45b244e6bc4..43c9314a23f8 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d linux-6.1.14.tar.xz +sha256 dfdcc143a879d64a5ee99213b2b4b05b5dccd566c144df93bca1e204df64c110 linux-6.1.26.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98 linux-5.15.96.tar.xz -sha256 a2b51876befb8cc35724ed62820845f2b387d471a6cf46e8eedd0b6cb595825f linux-5.10.170.tar.xz -sha256 5a1e5754b4f2a4fe73b119d810ecda2ce07ecfb6f6cbbd16547c9ecd30b97627 linux-5.4.233.tar.xz +sha256 066c4bbcbe3c480068a2e302f52b1708f340ecaaf633ec43d7f791bbeac5771a linux-5.15.109.tar.xz +sha256 1bbd445c154b053eea46acc883be548a98179988a9ed3a0b81bddfbf30a37e29 linux-5.10.179.tar.xz +sha256 142f9aed1c9f2e409dd72c5c490ad824dddf31f955ed2097d5989c4b5074fc28 linux-5.4.242.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 4e1c1555c306874e0477d1af282d04a4efb285121456ab3f79519c92e406b701 linux-4.14.307.tar.xz -sha256 64a265a193c9e3e14d1397278e2348386ef6d6043af76d693c0fbbafed345ca8 linux-4.19.274.tar.xz +sha256 43a514997d3a9052b765a9e1c8fbf7f5a810771937f8754a529ed09e0e02e20b linux-4.19.282.tar.xz +sha256 876c01f0d12ad0147b5c9ee2de919bedc7ffb7c2714dbfb7ccf44426f6f49153 linux-4.14.314.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ae40520c51f4..e102369395fe 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.307" if BR2_KERNEL_HEADERS_4_14 - default "4.19.274" if BR2_KERNEL_HEADERS_4_19 - default "5.4.233" if BR2_KERNEL_HEADERS_5_4 - default "5.10.170" if BR2_KERNEL_HEADERS_5_10 - default "5.15.96" if BR2_KERNEL_HEADERS_5_15 - default "6.1.14" if BR2_KERNEL_HEADERS_6_1 + default "4.14.314" if BR2_KERNEL_HEADERS_4_14 + default "4.19.282" if BR2_KERNEL_HEADERS_4_19 + default "5.4.242" if BR2_KERNEL_HEADERS_5_4 + default "5.10.179" if BR2_KERNEL_HEADERS_5_10 + default "5.15.109" if BR2_KERNEL_HEADERS_5_15 + default "6.1.26" if BR2_KERNEL_HEADERS_6_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From b73d16cdcf8a6a835c13d1e589b67f1b28acd311 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 20:07:47 +0200 Subject: [PATCH 0283/2890] {toolchain, linux-headers}: add support for 6.2 headers Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 43c9314a23f8..cab7b303856e 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c7dded14e368834b18bb2ad64af65560d8bcb9d2d6597e0f6ef151fded01e577 linux-6.2.13.tar.xz sha256 dfdcc143a879d64a5ee99213b2b4b05b5dccd566c144df93bca1e204df64c110 linux-6.1.26.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 066c4bbcbe3c480068a2e302f52b1708f340ecaaf633ec43d7f791bbeac5771a linux-5.15.109.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e102369395fe..cb614d0eefbf 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_1 + default BR2_KERNEL_HEADERS_6_2 help Select the kernel version to get headers from. @@ -48,6 +48,10 @@ config BR2_KERNEL_HEADERS_5_15 config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + +config BR2_KERNEL_HEADERS_6_2 + bool "Linux 6.2.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -125,8 +129,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_2 + bool "6.2.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1 - bool "6.1.x or later" + bool "6.1.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0 @@ -390,6 +398,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.179" if BR2_KERNEL_HEADERS_5_10 default "5.15.109" if BR2_KERNEL_HEADERS_5_15 default "6.1.26" if BR2_KERNEL_HEADERS_6_1 + default "6.2.13" if BR2_KERNEL_HEADERS_6_2 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 08e4ccad9ead..80b2dbde4d34 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -600,6 +600,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -613,6 +617,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1c39334ddd67..8f3905b8d79c 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -127,8 +127,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_2 + bool "6.2.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_1 - bool "6.1.x or later" + bool "6.1.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_0 From eadff4efe9d4c4209b328d7da9dc1b2e6849ca80 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 20:07:48 +0200 Subject: [PATCH 0284/2890] {toolchain, linux-headers}: add support for 6.3 headers Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index cab7b303856e..e3047886c594 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e linux-6.3.tar.xz sha256 c7dded14e368834b18bb2ad64af65560d8bcb9d2d6597e0f6ef151fded01e577 linux-6.2.13.tar.xz sha256 dfdcc143a879d64a5ee99213b2b4b05b5dccd566c144df93bca1e204df64c110 linux-6.1.26.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index cb614d0eefbf..4a4f1308cb72 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_2 + default BR2_KERNEL_HEADERS_6_3 help Select the kernel version to get headers from. @@ -52,6 +52,10 @@ config BR2_KERNEL_HEADERS_6_1 config BR2_KERNEL_HEADERS_6_2 bool "Linux 6.2.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + +config BR2_KERNEL_HEADERS_6_3 + bool "Linux 6.3.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -129,8 +133,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_3 + bool "6.3.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_2 - bool "6.2.x or later" + bool "6.2.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1 @@ -399,6 +407,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.109" if BR2_KERNEL_HEADERS_5_15 default "6.1.26" if BR2_KERNEL_HEADERS_6_1 default "6.2.13" if BR2_KERNEL_HEADERS_6_2 + default "6.3" if BR2_KERNEL_HEADERS_6_3 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 80b2dbde4d34..ff0eb93017f6 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -604,6 +604,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -617,6 +621,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 default "6.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 8f3905b8d79c..0fd8841e5b6c 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -127,8 +127,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_3 + bool "6.3.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_2 - bool "6.2.x or later" + bool "6.2.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_1 From 1fb66e2852cb004ed31b54d28b5e12181d6d2df5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 14:57:15 +0200 Subject: [PATCH 0285/2890] package/php: bump version to 8.2.5 Changelog: https://www.php.net/ChangeLog-8.php#8.2.4 https://www.php.net/ChangeLog-8.php#8.2.5 Release notes: https://news-web.php.net/php.announce/351 https://news-web.php.net/php.announce/352 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 41aa32615620..6b1549958f83 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 php-8.2.3.tar.xz +sha256 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 php-8.2.5.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 49f02d7f2045..7cebc178fe2c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.3 +PHP_VERSION = 8.2.5 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 987a80f8f44659d206ab564bbf6f51271b0bb2d8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 15:01:52 +0200 Subject: [PATCH 0286/2890] package/{mesa3d, mesa3d-headers}: bump version to 23.0.3 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-March/000713.html https://lists.freedesktop.org/archives/mesa-announce/2023-April/000714.html https://lists.freedesktop.org/archives/mesa-announce/2023-April/000717.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index a9ab1de8ea9c..4685ad6695c6 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.0.0 +MESA3D_HEADERS_VERSION = 23.0.3 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 17dc2e7c0029..0de11663f44d 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-February/000706.html -sha256 01f3cff3763f09e0adabcb8011e4aebc6ad48f6a4dd4bae904fe918707d253e4 mesa-23.0.0.tar.xz -sha512 127e2759a2a31cacd65a0891719ab7bb4a9188844022b4bccaebbedce9c550b9ccb160ad519178ea0d851c4bcb8f0f56febda248ed2ba82b5ddf804855e4694b mesa-23.0.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-April/000717.html +sha256 386362a5d80df3b096636b67f340e1ce67b705b44767d5bdd11d2ed1037192d5 mesa-23.0.3.tar.xz +sha512 52c778de61daa406c6a1e96a657e9b6fdcc71c8cfda80b7f53acc6470556c7d502c057b9481bb0c3d57ef0263263413fd0d25d53ebf5aa0246fbcc3309de64ae mesa-23.0.3.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index a09c157b33b4..09a12b4b7e44 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.0.0 +MESA3D_VERSION = 23.0.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 839c0c7d7ce5d197dce1bb281a401e843fcb1a3a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 15:11:15 +0200 Subject: [PATCH 0287/2890] package/apache: security bump version to 2.4.57 Release notes: https://lists.apache.org/thread/lp9t6w2t0qsbbo14lylk2yvfj8hgfoh9 Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.57 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 36144917fba1..1f0020f65a21 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.56.tar.bz2.{sha256,sha512} -sha256 d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c httpd-2.4.56.tar.bz2 -sha512 5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b2389264387971268145cccc6a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12 httpd-2.4.56.tar.bz2 +# From https://archive.apache.org/dist/httpd/httpd-2.4.57.tar.bz2.{sha256,sha512} +sha256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a httpd-2.4.57.tar.bz2 +sha512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155 httpd-2.4.57.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 80205a63620c..320a6ad20ed9 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.56 +APACHE_VERSION = 2.4.57 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 From 83f6a498718dbb00684e3f954d96695557c3885f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 15:13:31 +0200 Subject: [PATCH 0288/2890] package/x11r7/xserver_xorg-server: security bump version to 21.1.8 Release notes: https://lists.x.org/archives/xorg-announce/2023-March/003377.html Fixes CVE-2023-1393: https://lists.x.org/archives/xorg-announce/2023-March/003374.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index e2a2a251c337..092a640f04ed 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html -sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz -sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-March/003377.html +sha256 38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152 xorg-server-21.1.8.tar.xz +sha512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937 xorg-server-21.1.8.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 33b35b79797c..593bbd427681 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.7 +XSERVER_XORG_SERVER_VERSION = 21.1.8 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From 162053090f891036106a5c70f423eb7fbdb8ca4a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 15:36:17 +0200 Subject: [PATCH 0289/2890] package/libxml2: security bump to version 2.10.4 - [CVE-2023-29469] Hashing of empty dict strings isn't deterministic - [CVE-2023-28484] Fix null deref in xmlSchemaFixupComplexType - schemas: Fix null-pointer-deref in xmlSchemaCheckCOSSTDerivedOK https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.10.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 6957e2ed872a..37030bdfaa73 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.3.sha256sum -sha256 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c libxml2-2.10.3.tar.xz +# From https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.4.sha256sum +sha256 ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45 libxml2-2.10.4.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 7a01dc4259ca..cf26a36cc4b6 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.10 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).3 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).4 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From cbeca8c04297b03b64b482a6d687a5ec4009d9e8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 15:41:50 +0200 Subject: [PATCH 0290/2890] package/libva: bump version to 2.18.0 Release notes: https://github.com/intel/libva/blob/v2.18-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libva/libva.hash | 2 +- package/libva/libva.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 780c186069cd..8173876bbd98 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8940541980ef998a36cd8f6ad905e81838ea4ddf56dc479ed2bebd12711e6001 libva-2.17.0.tar.gz +sha256 9d666c70c12dfefcdd27ae7dea771557f75e24961d0ed4cb050d96fb6136f438 libva-2.18.0.tar.gz sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index f50010d9fc4e..dbb0b8f6e442 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.17.0 +LIBVA_VERSION = 2.18.0 LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING From 01ddf437e2bb9ebe5a48a76d1f08957febf646ec Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 15:41:51 +0200 Subject: [PATCH 0291/2890] package/libva-utils: bump version to 2.18.1 Release notes: https://github.com/intel/libva-utils/blob/v2.18-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libva-utils/libva-utils.hash | 2 +- package/libva-utils/libva-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 41374a2ff6f2..9b1d9cb21086 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6ea5993c3eba230a979fa9d35b4cad8df06d4474a773dc0918033bf50353f966 libva-utils-2.17.1.tar.gz +sha256 724a54524d9156967d3508f294ce5c45d94cb8f7326537c24ee7fcf59e70de91 libva-utils-2.18.1.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 3dc8cdacde96..9e6ee3c87800 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.17.1 +LIBVA_UTILS_VERSION = 2.18.1 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From e2ad585bc539fffe56609d027687eb3e7c8f5302 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 16:07:26 +0200 Subject: [PATCH 0292/2890] package/xmrig: bump version to 6.19.2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 781e089de89c..665a710c7096 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 772f947058e5b89ca9bf34128487def47796870b547439a9b0524ddd1899420c xmrig-6.19.0.tar.gz +sha256 84b7d1cc0bb818d471d47a5e663839ae8ba8b8a3b641e227b03903125446e12c xmrig-6.19.2.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index f345ba9cf9f0..ee2d5f595929 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.19.0 +XMRIG_VERSION = 6.19.2 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From 0022cde5300c01a90480fa26c4d5632d57a02086 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 14:51:40 +0200 Subject: [PATCH 0293/2890] package/tvheadend: bump version Rebased patch. Upstream removed the dependency to libavresample: https://github.com/tvheadend/tvheadend/commit/17a357fee8bccacd931476411200b05f2b06f47c Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tvheadend/0001-no-check_config.patch | 2 +- package/tvheadend/Config.in | 1 - package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/tvheadend/0001-no-check_config.patch b/package/tvheadend/0001-no-check_config.patch index 9261e5fff6d3..45c862d30076 100644 --- a/package/tvheadend/0001-no-check_config.patch +++ b/package/tvheadend/0001-no-check_config.patch @@ -12,7 +12,7 @@ Signed-off-by: "Yann E. MORIN" diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile --- tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile 2014-03-09 14:47:43.780025330 +0100 +++ tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile 2014-03-09 14:48:40.836539093 +0100 -@@ -708,7 +708,7 @@ +@@ -710,7 +710,7 @@ $(ROOTDIR)/configure $(CONFIGURE_ARGS) # Binary diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in index 99a24ec01103..3d21897c6d7f 100644 --- a/package/tvheadend/Config.in +++ b/package/tvheadend/Config.in @@ -63,7 +63,6 @@ config BR2_PACKAGE_TVHEADEND_TRANSCODING bool "transcoding support" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FFMPEG_AVRESAMPLE select BR2_PACKAGE_FFMPEG_GPL # needed for x264 support select BR2_PACKAGE_FFMPEG_SWSCALE # vp8 encoder needs c++ diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 45c8bd62b0fd..004619f4f43f 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 06c6d33a8e9d1d645cea9c63a06f6bddb309e5546177966d7b9285f68313bf5b tvheadend-c9a156a25a07f1f84c2f48a1b03b481430c8257d.tar.gz +sha256 a4ce9ef9299901ebbb5849aba9bb9de3e8f0ab4d1166f1f06ea25997d10d06f6 tvheadend-18effa8ad93e901f3cdaa534123d910f14453d1f.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 0ca8f46dc542..c0fa83be8abc 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = c9a156a25a07f1f84c2f48a1b03b481430c8257d +TVHEADEND_VERSION = 18effa8ad93e901f3cdaa534123d910f14453d1f TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From ffc50351b7dcb0539ff8364c578a5de96d9c4573 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Fri, 28 Apr 2023 16:01:16 +0700 Subject: [PATCH 0294/2890] package/git: security bump to version 2.40.1 Fix three CVEs (CVE-2023-25652, CVE-2023-25815, and CVE-2023-29007). For details on these, see release announcement at [1]. [1]: https://lore.kernel.org/git/xmqqa5yv3n93.fsf@gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index edb15955205a..1efa95ed44b3 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 b17a598fbf58729ef13b577465eb93b2d484df1201518b708b5044ff623bf46d git-2.40.0.tar.xz +sha256 4893b8b98eefc9fdc4b0e7ca249e340004faa7804a433d17429e311e1fef21d2 git-2.40.1.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 46ffc861512f..ba86915b369b 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.40.0 +GIT_VERSION = 2.40.1 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From d2fd83bac7dfaacf49a7c2452211ca5b968ba2c9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 12:29:46 +0200 Subject: [PATCH 0295/2890] package/hwdata: bump version to 0.369 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/hwdata/hwdata.hash | 2 +- package/hwdata/hwdata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 4f56b0c12f8b..16ab48654c04 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d6ae2436a69c6f5e04d926f5d753a99d90deb864065a2e2f8a8eda87b70dcdd5 hwdata-0.365.tar.gz +sha256 b17f3b81b887b9027fe5efa1ab1099afb472c843f89a9f5cc9ca4030b75bbdb2 hwdata-0.369.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 00fe6c145520..755a9c93f1cd 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.365 +HWDATA_VERSION = 0.369 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE From 492c803117c1348a6ead83ae0e02e57f95318711 Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Fri, 28 Apr 2023 11:44:03 +0100 Subject: [PATCH 0296/2890] package/tbb: bump to version 2021.8.0. - Remove upstream patches as they are no more needed. Signed-off-by: Francis Laniel Signed-off-by: Peter Korsgaard --- ...Musl-linux-can-not-use-RTLD_DEEPBIND.patch | 33 --------------- ...is-only-defined-on-glibc-and-android.patch | 42 ------------------- ...-Define-ITT_ARCH_IA64-when-undefiend.patch | 27 ------------ package/tbb/tbb.hash | 2 +- package/tbb/tbb.mk | 2 +- 5 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch delete mode 100644 package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch delete mode 100644 package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch diff --git a/package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch b/package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch deleted file mode 100644 index 82182ce10900..000000000000 --- a/package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 883c2e5245c39624b3b5d6d56d5b203cf09eac38 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 15 Dec 2021 08:08:07 -0800 -Subject: [PATCH] Musl/linux can not use RTLD_DEEPBIND (#684) - -Exclude non-glibc linux systems along with android -Fixes -src/tbb/dynamic_link.cpp:417:29: error: use - of undeclared identifier 'RTLD_DEEPBIND' | flags = flags | RTLD_DEEPBIND; -| ^ - -Signed-off-by: Khem Raj - -[Retrieved from: -https://github.com/oneapi-src/oneTBB/commit/883c2e5245c39624b3b5d6d56d5b203cf09eac38] -Signed-off-by: Fabrice Fontaine ---- - src/tbb/dynamic_link.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp -index 3f1342503..5330d7107 100644 ---- a/src/tbb/dynamic_link.cpp -+++ b/src/tbb/dynamic_link.cpp -@@ -413,7 +413,7 @@ namespace r1 { - int flags = RTLD_NOW; - if (local_binding) { - flags = flags | RTLD_LOCAL; --#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS -+#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS - flags = flags | RTLD_DEEPBIND; - #endif - } else { diff --git a/package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch b/package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch deleted file mode 100644 index 9b397cac4167..000000000000 --- a/package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3a7f96db56cc9821055cbc769d3065db86b8b4c9 Mon Sep 17 00:00:00 2001 -From: Julien Voisin -Date: Mon, 7 Feb 2022 07:56:15 +0100 -Subject: [PATCH] mallinfo is only defined on glibc and android (#764) - -It currently prevents compilation under musl: - -``` -[ 90%] Building CXX object src/tbbmalloc_proxy/CMakeFiles/tbbmalloc_proxy.dir/proxy.cpp.o -/__w/mimalloc-bench/mimalloc-bench/extern/tbb/src/tbbmalloc_proxy/proxy.cpp:263:26: error: return type 'struct mallinfo' is incomplete - 263 | struct mallinfo mallinfo() __THROW - | ^ -compilation terminated due to -Wfatal-errors. -`` - -[Retrieved from: -https://github.com/oneapi-src/oneTBB/commit/3a7f96db56cc9821055cbc769d3065db86b8b4c9] -Signed-off-by: Fabrice Fontaine ---- - src/tbbmalloc_proxy/proxy.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp -index e58e55e0b..23b9c19c1 100644 ---- a/src/tbbmalloc_proxy/proxy.cpp -+++ b/src/tbbmalloc_proxy/proxy.cpp -@@ -260,6 +260,7 @@ int mallopt(int /*param*/, int /*value*/) __THROW - return 1; - } - -+#if defined(__GLIBC__) || defined(__ANDROID__) - struct mallinfo mallinfo() __THROW - { - struct mallinfo m; -@@ -267,6 +268,7 @@ struct mallinfo mallinfo() __THROW - - return m; - } -+#endif - - #if __ANDROID__ - // Android doesn't have malloc_usable_size, provide it to be compatible diff --git a/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch b/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch deleted file mode 100644 index 5b7f0024995c..000000000000 --- a/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6fad69889da67bc4d4baff4afa94f77da45e006d Mon Sep 17 00:00:00 2001 -From: Felix Yan -Date: Thu, 7 Oct 2021 14:16:16 +0800 -Subject: [PATCH] Define ITT_ARCH_IA64 when undefiend (#550) - -[Retrieved from: -https://github.com/oneapi-src/oneTBB/commit/6fad69889da67bc4d4baff4afa94f77da45e006d] -Signed-off-by: Fabrice Fontaine ---- - src/tbb/tools_api/ittnotify_config.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/tbb/tools_api/ittnotify_config.h b/src/tbb/tools_api/ittnotify_config.h -index 8ecc23781..f904a8e9d 100644 ---- a/src/tbb/tools_api/ittnotify_config.h -+++ b/src/tbb/tools_api/ittnotify_config.h -@@ -147,6 +147,10 @@ - # define ITT_ARCH_IA32E 2 - #endif /* ITT_ARCH_IA32E */ - -+#ifndef ITT_ARCH_IA64 -+# define ITT_ARCH_IA64 3 -+#endif /* ITT_ARCH_IA64 */ -+ - #ifndef ITT_ARCH_ARM - # define ITT_ARCH_ARM 4 - #endif /* ITT_ARCH_ARM */ diff --git a/package/tbb/tbb.hash b/package/tbb/tbb.hash index 9992fb3c4f74..579581cfe403 100644 --- a/package/tbb/tbb.hash +++ b/package/tbb/tbb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a tbb-2021.5.0.tar.gz +sha256 eee380323bb7ce864355ed9431f85c43955faaae9e9bce35c62b372d7ffd9f8b tbb-2021.8.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt diff --git a/package/tbb/tbb.mk b/package/tbb/tbb.mk index fc720fd2f5c3..c3e06a4e6d6f 100644 --- a/package/tbb/tbb.mk +++ b/package/tbb/tbb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TBB_VERSION = 2021.5.0 +TBB_VERSION = 2021.8.0 TBB_SITE = $(call github,01org,tbb,v$(TBB_VERSION)) TBB_INSTALL_STAGING = YES TBB_LICENSE = Apache-2.0 From f32673ff8defabd50ec6f59fdb77152161d6afc3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 12:55:11 +0200 Subject: [PATCH 0297/2890] package/intel-microcode: security bump version to 20230214 Release notes: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/blob/main/releasenote.md CVE-2022-21216 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00700.html CVE-2022-33196 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00738.html CVE-2022-38090 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00767.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-microcode/intel-microcode.hash | 2 +- package/intel-microcode/intel-microcode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 56f023727722..acec71000fb9 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8d14a914815f56c27b1f41be0fd699d1afcfdbc05432056427e455100798975e intel-microcode-20221108.tar.gz +sha256 3a3cfe2c7642339af9f4c2ad69f5f367dfa4cd1f7f9fd4124dedefb7803591d4 intel-microcode-20230214.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 787537da785b..6e7d66f48207 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20221108 +INTEL_MICROCODE_VERSION = 20230214 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license From 3ed1653bfb4f90a7dce5c463a1d76d007d46e7c6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 14:14:35 +0200 Subject: [PATCH 0298/2890] package/dav1d: bump version to 1.1.0 Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Switched _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index 35d753fc27e5..cbeebc579db9 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/dav1d/1.0.0/dav1d-1.0.0.tar.xz.sha256 -sha256 51737db7e4897e599684f873a4725176dd3c779e639411d7c4fce134bb5ebb82 dav1d-1.0.0.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.1.0/dav1d-1.1.0.tar.xz.sha256 +sha256 fb57aae7875f28c30fb3dbae4a3683d27e2f91dde09ce5c60c22cef9bc58dfd1 dav1d-1.1.0.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 2d42cdcb6778..5fe603fc1cac 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,9 +4,9 @@ # ################################################################################ -DAV1D_VERSION = 1.0.0 +DAV1D_VERSION = 1.1.0 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz -DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) +DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause DAV1D_LICENSE_FILES = COPYING DAV1D_INSTALL_STAGING = YES From 72edd5633ef65a7b26844770345e57918b278573 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 14:24:20 +0200 Subject: [PATCH 0299/2890] package/ffmpeg: bump version to 4.4.4 Changelog: https://git.videolan.org/?p=ffmpeg.git;a=blob;f=Changelog;hb=refs/heads/release/4.4 Rebased all patches, switched _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch | 4 ++-- package/ffmpeg/0003-libavutil-Fix-mips-build.patch | 4 ++-- .../0004-configure-add-extralibs-to-extralibs_xxx.patch | 2 +- package/ffmpeg/Config.in | 2 +- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch index 951ce4186d66..9c1baaa651d2 100644 --- a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch +++ b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch @@ -22,7 +22,7 @@ diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index c12e88cbb5..4791e5b93a 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c -@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) +@@ -71,6 +71,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) #if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); @@ -30,7 +30,7 @@ index c12e88cbb5..4791e5b93a 100644 if (EXTERNAL_SSSE3(cpu_flags)) { switch (c->dstFormat) { case AV_PIX_FMT_RGB32: -@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) +@@ -99,6 +100,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) return yuv420_rgb15_ssse3; } } diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch index 8b81e66981be..8dd689f5d0dc 100644 --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch @@ -20,7 +20,7 @@ diff --git a/configure b/configure index 6bfd98b384..773a7d516c 100755 --- a/configure +++ b/configure -@@ -2161,6 +2161,7 @@ HEADERS_LIST=" +@@ -2135,6 +2135,7 @@ HEADERS_LIST=" opencv2_core_core_c_h OpenGL_gl3_h poll_h @@ -28,7 +28,7 @@ index 6bfd98b384..773a7d516c 100755 sys_param_h sys_resource_h sys_select_h -@@ -6218,6 +6219,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa +@@ -6182,6 +6183,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa check_headers windows.h check_headers X11/extensions/XvMClib.h check_headers asm/types.h diff --git a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch index dbc19c1cecb2..3247ab08fe43 100644 --- a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch +++ b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch @@ -17,7 +17,7 @@ diff --git a/configure b/configure index 0bb3a7cf2b..3bda99e415 100755 --- a/configure +++ b/configure -@@ -7602,15 +7602,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}") +@@ -7715,15 +7715,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}") source_path=${source_path} LIBPREF=${LIBPREF} LIBSUF=${LIBSUF} diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index 2efef7dd86e6..52029c2adeb5 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_FFMPEG FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. - http://www.ffmpeg.org + https://www.ffmpeg.org if BR2_PACKAGE_FFMPEG diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index c9d7ea7c41dd..b18218cb48fe 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6c5b6c195e61534766a0b5fe16acc919170c883362612816d0a1c7f4f947006e ffmpeg-4.4.3.tar.xz +sha256 e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309 ffmpeg-4.4.4.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 136e3e24cafd..59e13b503e82 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,9 +4,9 @@ # ################################################################################ -FFMPEG_VERSION = 4.4.3 +FFMPEG_VERSION = 4.4.4 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz -FFMPEG_SITE = http://ffmpeg.org/releases +FFMPEG_SITE = https://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES FFMPEG_LICENSE = LGPL-2.1+, libjpeg license From a1e0e7276ca246385d7f31d2db8331f52ce34228 Mon Sep 17 00:00:00 2001 From: Frank Vanbever Date: Fri, 28 Apr 2023 21:23:51 +0200 Subject: [PATCH 0300/2890] package/libmodsecurity: bump to version 3.0.9 - Drop 0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch, handling of libmaxminddb was fixed upstream in d2b700d - Drop 0004-build-pcre.m4-fix-build-without-pcre.patch, handling of PCRE was fixed upstream in 791964a Signed-off-by: Frank Vanbever Signed-off-by: Peter Korsgaard --- ...Revert-Fix-maxminddb-link-on-FreeBSD.patch | 28 ------------------ ...build-pcre.m4-fix-build-without-pcre.patch | 29 ------------------- package/libmodsecurity/libmodsecurity.hash | 4 +-- package/libmodsecurity/libmodsecurity.mk | 4 +-- 4 files changed, 4 insertions(+), 61 deletions(-) delete mode 100644 package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch delete mode 100644 package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch diff --git a/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch b/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch deleted file mode 100644 index 9608e3d9350c..000000000000 --- a/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6737dc133cb4811a000c02b4e0a92b72f0b220ee Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 16 Jul 2021 19:12:51 +0200 -Subject: [PATCH] Revert "Fix maxminddb link on FreeBSD" - -This reverts commit 785958f9b5089b918c7d054cbcc2fe4a3c7b3788. - -Signed-off-by: Fabrice Fontaine ---- - build/libmaxmind.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/libmaxmind.m4 b/build/libmaxmind.m4 -index 656fc250..02820b5a 100644 ---- a/build/libmaxmind.m4 -+++ b/build/libmaxmind.m4 -@@ -10,7 +10,7 @@ dnl MAXMIND_VERSION - AC_DEFUN([PROG_MAXMIND], [ - - # Possible names for the maxmind library/package (pkg-config) --MAXMIND_POSSIBLE_LIB_NAMES="maxminddb maxmind" -+MAXMIND_POSSIBLE_LIB_NAMES="libmaxminddb maxminddb maxmind" - - # Possible extensions for the library - MAXMIND_POSSIBLE_EXTENSIONS="so la sl dll dylib" --- -2.30.2 - diff --git a/package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch b/package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch deleted file mode 100644 index 5a5baeacee9c..000000000000 --- a/package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch +++ /dev/null @@ -1,29 +0,0 @@ -From af96f4fe916adc7dc6d649a07c10b45c978d31a1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 27 Jul 2022 14:17:20 +0200 -Subject: [PATCH] build/pcre.m4: fix build without pcre - -Don't raise an error if pcre is disabled now that pcre2 is supported - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent (no feedback on -https://github.com/SpiderLabs/ModSecurity/pull/2596)] ---- - build/pcre.m4 | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/build/pcre.m4 b/build/pcre.m4 -index f6c9ae18..3e40f5c9 100644 ---- a/build/pcre.m4 -+++ b/build/pcre.m4 -@@ -99,7 +99,6 @@ AC_SUBST(PCRE_LD_PATH) - - if test -z "${PCRE_VERSION}"; then - AC_MSG_NOTICE([*** pcre library not found.]) -- ifelse([$2], , AC_MSG_ERROR([pcre library is required]), $2) - else - AC_MSG_NOTICE([using pcre v${PCRE_VERSION}]) - ifelse([$1], , , $1) --- -2.35.1 - diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index 7ba0ef7f1813..c79ae1cf45d0 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.8/modsecurity-v3.0.8.tar.gz.sha256 -sha256 e241c89b3cd7e58a863d0d0d6b9b8ba4d33ffb0f51171044c258c62e3e7956c7 modsecurity-v3.0.8.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.9/modsecurity-v3.0.9.tar.gz.sha256 +sha256 a5111ecd23e332a1d7c9652dbdb18517a96b21573315cb887a8e86761b95d3d8 modsecurity-v3.0.9.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index e83fda895f1c..335f3a41e549 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.8 +LIBMODSECURITY_VERSION = 3.0.9 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES @@ -12,7 +12,7 @@ LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE LIBMODSECURITY_CPE_ID_VENDOR = trustwave LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity -# We're patching build/libmaxmind.m4 and build/pcre.m4 +# We're patching configure.ac LIBMODSECURITY_AUTORECONF = YES LIBMODSECURITY_DEPENDENCIES = pcre2 From 272bfb4cabe70e4251650f9fa27124c189eb835e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 29 Apr 2023 01:06:17 +0200 Subject: [PATCH 0301/2890] Config.in.legacy: add missing binutils 2.36.x entry Commit [1] removed binutils 2.36.1 but forgot to add the legacy entry. [1] d08639e6b9e5b687c21c35041bb60a941fc7edb4 Signed-off-by: Romain Naour Cc: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Config.in.legacy b/Config.in.legacy index 366b9d69494e..bce780e26e25 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -334,6 +334,12 @@ config BR2_PACKAGE_USBREDIR_SERVER comment "Legacy options removed in 2022.11" +config BR2_BINUTILS_VERSION_2_36_X + bool "binutils 2.36.x has been removed" + select BR2_LEGACY + help + binutils 2.36 has been removed, use a newer version. + config BR2_PACKAGE_RABBITMQ_SERVER bool "rabbitmq-server removed" select BR2_LEGACY From 60d8e5257608098bd1d66c44282b04d02c733f75 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 29 Apr 2023 22:01:33 +0200 Subject: [PATCH 0302/2890] package/lua: bump to version 5.4.5 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lua/5.4.4/lua.hash | 6 ------ package/lua/{5.4.4 => 5.4.5}/0001-root-path.patch | 2 +- package/lua/{5.4.4 => 5.4.5}/0002-shared-libs-for-lua.patch | 2 +- package/lua/{5.4.4 => 5.4.5}/0011-linenoise.patch | 2 +- package/lua/5.4.5/lua.hash | 5 +++++ package/lua/lua.mk | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 package/lua/5.4.4/lua.hash rename package/lua/{5.4.4 => 5.4.5}/0001-root-path.patch (95%) rename package/lua/{5.4.4 => 5.4.5}/0002-shared-libs-for-lua.patch (96%) rename package/lua/{5.4.4 => 5.4.5}/0011-linenoise.patch (97%) create mode 100644 package/lua/5.4.5/lua.hash diff --git a/package/lua/5.4.4/lua.hash b/package/lua/5.4.4/lua.hash deleted file mode 100644 index b55b17f2586c..000000000000 --- a/package/lua/5.4.4/lua.hash +++ /dev/null @@ -1,6 +0,0 @@ -# Hashes from: https://www.lua.org/ftp/ -md5 bd8ce7069ff99a400efd14cf339a727b lua-5.4.4.tar.gz -sha1 03c27684b9d5d9783fb79a7c836ba1cdc5f309cd lua-5.4.4.tar.gz - -# Locally computed -sha256 2556ac7198243f9f83130b9c81016e1904f7b30351481f1c28e02475dbd237fb doc/readme.html diff --git a/package/lua/5.4.4/0001-root-path.patch b/package/lua/5.4.5/0001-root-path.patch similarity index 95% rename from package/lua/5.4.4/0001-root-path.patch rename to package/lua/5.4.5/0001-root-path.patch index c4f6e312eb0c..5e3037b78653 100644 --- a/package/lua/5.4.4/0001-root-path.patch +++ b/package/lua/5.4.5/0001-root-path.patch @@ -6,7 +6,7 @@ Index: b/src/luaconf.h =================================================================== --- a/src/luaconf.h +++ b/src/luaconf.h -@@ -217,7 +217,7 @@ +@@ -223,7 +223,7 @@ #else /* }{ */ diff --git a/package/lua/5.4.4/0002-shared-libs-for-lua.patch b/package/lua/5.4.5/0002-shared-libs-for-lua.patch similarity index 96% rename from package/lua/5.4.4/0002-shared-libs-for-lua.patch rename to package/lua/5.4.5/0002-shared-libs-for-lua.patch index 4ff204429827..388aa9966a8e 100644 --- a/package/lua/5.4.4/0002-shared-libs-for-lua.patch +++ b/package/lua/5.4.5/0002-shared-libs-for-lua.patch @@ -31,7 +31,7 @@ Index: b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -33,6 +33,7 @@ - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris LUA_A= liblua.a +LUA_SO= liblua.so diff --git a/package/lua/5.4.4/0011-linenoise.patch b/package/lua/5.4.5/0011-linenoise.patch similarity index 97% rename from package/lua/5.4.4/0011-linenoise.patch rename to package/lua/5.4.5/0011-linenoise.patch index 68316e108f5f..5054ae19e245 100644 --- a/package/lua/5.4.4/0011-linenoise.patch +++ b/package/lua/5.4.5/0011-linenoise.patch @@ -8,7 +8,7 @@ Index: b/src/lua.c =================================================================== --- a/src/lua.c +++ b/src/lua.c -@@ -428,6 +428,14 @@ +@@ -438,6 +438,14 @@ #define lua_saveline(L,line) ((void)L, add_history(line)) #define lua_freeline(L,b) ((void)L, free(b)) diff --git a/package/lua/5.4.5/lua.hash b/package/lua/5.4.5/lua.hash new file mode 100644 index 000000000000..5526cd51255f --- /dev/null +++ b/package/lua/5.4.5/lua.hash @@ -0,0 +1,5 @@ +# Hashes from: https://www.lua.org/ftp/ +sha256 59df426a3d50ea535a460a452315c4c0d4e1121ba72ff0bdde58c2ef31d6f444 lua-5.4.5.tar.gz + +# Locally computed +sha256 0d4ee721cf740f9cd878ef82ef75f4f2724dcf0403e56cd0b5643ad88f9de337 doc/readme.html diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 16086e7bf4cf..ecb86c11ed37 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_4),y) -LUA_VERSION = 5.4.4 +LUA_VERSION = 5.4.5 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else From b9c6684fa37f20d48645868a1e15bb831ca1ba85 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 24 Apr 2023 15:49:15 +0300 Subject: [PATCH 0303/2890] package/wpewebkit: security bump to version 2.38.6 Bugfix release with many security fixes, including (but not limited to) patches for CVE-2023-25358, CVE-2022-0108, CVE-2022-32885, CVE-2023-27932, CVE-2023-27954, and CVE-2023-28205. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.6.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0003.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 0fa1018721be..d5f628e1ee17 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.5.tar.xz.sums -md5 73f7abd0c1cc808032869f72602166e3 wpewebkit-2.38.5.tar.xz -sha1 3f10a04758eeb349f63f841aff765dae25bcde1b wpewebkit-2.38.5.tar.xz -sha256 ff00fd3d0a4c6d551850a78a7dfe4883b6b7ebd93c5549e1121b2f43d3ac1661 wpewebkit-2.38.5.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.6.tar.xz.sums +md5 eb44d3132208218f3752170cae3220b8 wpewebkit-2.38.6.tar.xz +sha1 5c541a10e216d8d9ca48572b3dc0f82bfb2236c5 wpewebkit-2.38.6.tar.xz +sha256 dcb6591456393c5366ad9abc62a808137d4fea039cbc7ef4c8d64ead506d035b wpewebkit-2.38.6.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 48e5c2f8cdb1..7b8ac67d924c 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.5 +WPEWEBKIT_VERSION = 2.38.6 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From d6b871e137f758466b0c24d1551144e8a4ef8822 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 24 Apr 2023 15:50:33 +0300 Subject: [PATCH 0304/2890] package/webkitgtk: security bump to version 2.38.6 Bugfix release with many security fixes, including (but not limited to) patches for CVE-2023-25358, CVE-2022-0108, CVE-2022-32885, CVE-2023-27932, CVE-2023-27954, and CVE-2023-28205. Release notes: https://webkitgtk.org/2023/04/20/webkitgtk2.38.6-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0003.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index c771297b5a16..3bc521e44505 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums -md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz -sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz -sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.6.tar.xz.sums +md5 a50290fdc80842b1ae8be1e1147b5679 webkitgtk-2.38.6.tar.xz +sha1 4dfb3d96f621fc633ff347e083e429893551fb26 webkitgtk-2.38.6.tar.xz +sha256 1c614c9589389db1a79ea9ba4293bbe8ac3ab0a2234cac700935fae0724ad48b webkitgtk-2.38.6.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 3263f7fea041..dd17b46e6762 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.5 +WEBKITGTK_VERSION = 2.38.6 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From 4ed0608c8882a33f031d90b1278118be7d9d76d2 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Tue, 25 Apr 2023 09:33:41 +0200 Subject: [PATCH 0305/2890] package/sdl2: bump version to 2.26.5 Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 4 ++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index e26dcee30160..0c7bdf7fa109 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.3.tar.gz.sig -sha256 c661205a553b7d252425f4b751ff13209e5e020b876bbfa1598494af61790057 SDL2-2.26.3.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.5.tar.gz.sig +sha256 ad8fea3da1be64c83c45b1d363a6b4ba8fd60f5bde3b23ec73855709ec5eabf7 SDL2-2.26.5.tar.gz # Locally calculated sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index c01f12d12cf7..5f2e1e0ed18d 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.26.3 +SDL2_VERSION = 2.26.5 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From 19a35e72363e42b68d7a7a988d3baf747e7b8874 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Mon, 17 Apr 2023 21:20:47 +0200 Subject: [PATCH 0306/2890] package/tcpdump: security bump to version 4.99.4 Fixes CVE-2023-1801 Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- package/tcpdump/tcpdump.hash | 2 +- package/tcpdump/tcpdump.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index e548e3262698..1a22889851c3 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at # https://www.tcpdump.org/release/tcpdump-4.99.3.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3 tcpdump-4.99.3.tar.gz +sha256 0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea tcpdump-4.99.4.tar.gz sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 7a679ce4bfd6..91643e7beaa6 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.99.3 +TCPDUMP_VERSION = 4.99.4 TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE From 42b9277479b3c0aeea927e919b5f55cb4041ed6a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:33 -0600 Subject: [PATCH 0307/2890] package/gstreamer1: bump to version 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index db0ed5bede2a..f74832ce6a3e 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.0.tar.xz.sha256sum -sha256 78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09 gstreamer-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.2.tar.xz.sha256sum +sha256 b2afe73603921c608ba48969dbb7d743776744bfe5d8059ece241137b7f88e21 gstreamer-1.22.2.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 09d1a10ce756..8584735129e9 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.0 +GSTREAMER1_VERSION = 1.22.2 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From 7812b591252652d35903cfc36b767a6339dbf343 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:34 -0600 Subject: [PATCH 0308/2890] package/gst1-plugins-base: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index bac4f8398ac5..173f359afcde 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.0.tar.xz.sha256sum -sha256 f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d gst-plugins-base-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.2.tar.xz.sha256sum +sha256 eb65120c4ee79b7a153c3c1972d5c0158c2151877cc51ec7725bba5749679d49 gst-plugins-base-1.22.2.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 7d509331fe4a..153187f743d0 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.22.0 +GST1_PLUGINS_BASE_VERSION = 1.22.2 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From 9b279b66991bcdcfca3d1fed6cd1865c244a558a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:35 -0600 Subject: [PATCH 0309/2890] package/gst1-plugins-good: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 3e219faad867..604e74b57d98 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.0.tar.xz.sha256sum -sha256 582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0 gst-plugins-good-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.2.tar.xz.sha256sum +sha256 7c8cc59425f2b232f60ca7d13e56edd615da4f711e73dd01a7cffa46e6bc0cdd gst-plugins-good-1.22.2.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 93c2328bdace..bbcd3aecabd1 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.22.0 +GST1_PLUGINS_GOOD_VERSION = 1.22.2 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From aab52c395e12119c233f60fea1e6e9a6a64eec9e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:36 -0600 Subject: [PATCH 0310/2890] package/gst1-plugins-bad: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 90b3a18982b7..2bbb8af90474 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.0.tar.xz.sha256sum -sha256 3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1 gst-plugins-bad-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.2.tar.xz.sha256sum +sha256 3d8faf1ce3402c8535ce3a8c4e1a6c960e4b5655dbda6b55943db9ac79022d0f gst-plugins-bad-1.22.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index edac81898592..1713f0b4b84b 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.22.0 +GST1_PLUGINS_BAD_VERSION = 1.22.2 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From 1155c854dcc942dbe9e943760d58fd0240105770 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:37 -0600 Subject: [PATCH 0311/2890] package/gst1-plugins-ugly: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 21579216df06..ed781df686f5 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz.sha256sum -sha256 a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c gst-plugins-ugly-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.2.tar.xz.sha256sum +sha256 8f30f44db0bd063709bf6fbe55138e3a98af0abcb61c360f35582bbe10e80691 gst-plugins-ugly-1.22.2.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 9f16fa3da8fc..f1566b058e62 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.22.0 +GST1_PLUGINS_UGLY_VERSION = 1.22.2 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From e375104371314ea90ee01771a1a2511eeb301c47 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:38 -0600 Subject: [PATCH 0312/2890] package/gst1-devtools: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 46480445abb1..4abdd6ece4b8 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.0.tar.xz.sha256sum -sha256 4d21fee5c15f2877c0b1f6c2da0cdba67ce7caab2c199ab27e91a1394d5ba195 gst-devtools-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.2.tar.xz.sha256sum +sha256 eb62726d3e27a8782369a24fd6364a8885ed2462b3bbdab091dffc8139ee06d8 gst-devtools-1.22.2.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 8fd3321d9e80..7801f9b62c77 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.22.0 +GST1_DEVTOOLS_VERSION = 1.22.2 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From d34c0b3df4b8ccec9cc95502254a6e48f4797bec Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:39 -0600 Subject: [PATCH 0313/2890] package/gst1-libav: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index c2c58ab2fe90..c3e84a17d21c 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.0.tar.xz.sha256sum -sha256 0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1 gst-libav-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.2.tar.xz.sha256sum +sha256 fcaaf9878fe8f3bc82317ef13a1558824cb68df1f8968c6797f556c5e33bcffd gst-libav-1.22.2.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index d4b3873af119..0306db42c0ab 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.22.0 +GST1_LIBAV_VERSION = 1.22.2 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ From 2231878df246a81b885e3c49108fde53d7e2bf99 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:40 -0600 Subject: [PATCH 0314/2890] package/gst1-vaapi: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 6dec625c9358..2fdec4e83fa4 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.0.tar.xz.sha256sum -sha256 593ccad19f88e5fa29f40f98356c007806bd535828707b1406944d16a90bdff5 gstreamer-vaapi-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.2.tar.xz.sha256sum +sha256 d2e642f9745f97d9f73a7f5085e7659a9a31fe209b774e6e45dae041b435df06 gstreamer-vaapi-1.22.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 9533cdf2b60d..cae239094a3b 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.22.0 +GST1_VAAPI_VERSION = 1.22.2 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From e796e5a70be0a78c1a4cf70582f006f05bf33712 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:41 -0600 Subject: [PATCH 0315/2890] package/gst1-rtsp-server: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index f37e7bb292b6..c98d10d79c08 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.0.tar.xz.sha256sum -sha256 aea24eeb59ee5fadfac355de2f7cecb51966c3e147e5ad7cfb4c314f1a4086ed gst-rtsp-server-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.2.tar.xz.sha256sum +sha256 2be4aecfb88710100ea7115ed0216403e8094344ebf146094271b8d4d73828bf gst-rtsp-server-1.22.2.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 6b4bd49fded3..6f5fc4f7aada 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.22.0 +GST1_RTSP_SERVER_VERSION = 1.22.2 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ From e4fb09f95f8dbac5c21026392ae0bcc91f17585f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:42 -0600 Subject: [PATCH 0316/2890] package/gstreamer1-editing-services: bump version to 1.22.2 Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...treamer-validate-1.0-dependency-name.patch | 35 ------------------- .../gstreamer1-editing-services.hash | 4 +-- .../gstreamer1-editing-services.mk | 2 +- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch diff --git a/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch b/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch deleted file mode 100644 index 6c190d37273d..000000000000 --- a/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c3edd999195445319ea619b6d719d7743f5b560d Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 31 Jan 2023 21:38:09 -0700 -Subject: [PATCH] Fix gstreamer-validate-1.0 dependency name - -The gst-devtools project generates gstreamer-validate-1.0.pc, this -must match the dependency in gst-editing-services for detection -to work properly. - -Fixes: -Run-time dependency gst-validate-1.0 found: NO (tried pkgconfig and cmake) - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3859] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index bdc47f5d8b..b949f55317 100644 ---- a/meson.build -+++ b/meson.build -@@ -110,7 +110,7 @@ if host_machine.system() != 'windows' - endif - gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, - fallback : ['gstreamer', 'gst_controller_dep']) --gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : get_option('validate'), -+gstvalidate_dep = dependency('gstreamer-validate-1.0', version : gst_req, required : get_option('validate'), - fallback : ['gst-devtools', 'validate_dep']) - - gio_dep = dependency('gio-2.0', version: glib_req) --- -2.34.1 - diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index bd5dcfdbafb6..0cdb18ea5d13 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.0.tar.xz.sha256sum -sha256 2a23856379af03586b66c193910fa8bb963024580bc2337c7405578dc077aa79 gst-editing-services-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.2.tar.xz.sha256sum +sha256 453b1464fc3857de269a7cb0ebd966afe02171d97bef672a0b8a0a6d43e0cebf gst-editing-services-1.22.2.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 0ae9205c3b45..9fdc877db046 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.0 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.2 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From e29fff83887063240485e14c1e690a2eb458cf1f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:43 -0600 Subject: [PATCH 0317/2890] package/gst-omx: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 51ea74a0cb65..d4a95c631a79 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.0.tar.xz.sha256sum -sha256 dbc951a99af532380e599aa8acd9e1385fdb299b46b5868cd2be4230ad888341 gst-omx-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.2.tar.xz.sha256sum +sha256 1b0c57f2cc4ddeec5e7f0c436e502f06665c4e93c73261855b94e04fc94337b2 gst-omx-1.22.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 6f7168279b37..87f162f71500 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.22.0 +GST_OMX_VERSION = 1.22.2 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From 8fb9e8ca6bea3f99e167911ae1e79da314614ae3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:44 -0600 Subject: [PATCH 0318/2890] package/gst1-python: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 128a739c2cad..006d4985efb4 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.0.tar.xz.sha256sum -sha256 6c63ad364ca4617eb2cbb3975ab26c66760eb3c7a6adf5be69f99c11e21ef3a5 gst-python-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.2.tar.xz.sha256sum +sha256 bef2b3d82ce4be46b775b1bb56305c1003ee01b535a53a82f9fe8924972153ad gst-python-1.22.2.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 2fc268b0aca7..527d1017868b 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.22.0 +GST1_PYTHON_VERSION = 1.22.2 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From 1740a066e9e6c29c9e91d9206195f5ce5360c07c Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Mon, 17 Apr 2023 21:41:30 +0200 Subject: [PATCH 0319/2890] package/iproute2: bump version to 6.2.0 Backport 2 fixes from upcoming release (memory leak and incorrect JSON output). Signed-off-by: Petr Vorel Signed-off-by: Peter Korsgaard --- .../0001-tc-add-missing-separator.patch | 32 +++++ .../0002-tc-f_u32-fix-json-object-leak.patch | 134 ++++++++++++++++++ package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 4 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 package/iproute2/0001-tc-add-missing-separator.patch create mode 100644 package/iproute2/0002-tc-f_u32-fix-json-object-leak.patch diff --git a/package/iproute2/0001-tc-add-missing-separator.patch b/package/iproute2/0001-tc-add-missing-separator.patch new file mode 100644 index 000000000000..534b2c8f6b2c --- /dev/null +++ b/package/iproute2/0001-tc-add-missing-separator.patch @@ -0,0 +1,32 @@ +From 4e0e56e0ef05387f7f5d8ab41fe6ec6a1897b26d Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Thu, 23 Feb 2023 11:15:03 +0100 +Subject: [PATCH] tc: add missing separator +Upstream: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=4e0e56e0ef05387f7f5d8ab41fe6ec6a1897b26d + +This is missing a separator, that was accidently removed +when JSON was added. + +Fixes: 010a8388aea1 ("tc: Add JSON output to tc-class") +Signed-off-by: Christian Hesse +Signed-off-by: Stephen Hemminger +--- + tc/tc_class.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tc/tc_class.c b/tc/tc_class.c +index c1feb009..096fa2ec 100644 +--- a/tc/tc_class.c ++++ b/tc/tc_class.c +@@ -356,7 +356,7 @@ int print_class(struct nlmsghdr *n, void *arg) + print_string(PRINT_ANY, "parent", "parent %s ", abuf); + } + if (t->tcm_info) +- print_0xhex(PRINT_ANY, "leaf", "leaf %x", t->tcm_info>>16); ++ print_0xhex(PRINT_ANY, "leaf", "leaf %x: ", t->tcm_info>>16); + + q = get_qdisc_kind(RTA_DATA(tb[TCA_KIND])); + if (tb[TCA_OPTIONS]) { +-- +2.40.0 + diff --git a/package/iproute2/0002-tc-f_u32-fix-json-object-leak.patch b/package/iproute2/0002-tc-f_u32-fix-json-object-leak.patch new file mode 100644 index 000000000000..3d90fee56c18 --- /dev/null +++ b/package/iproute2/0002-tc-f_u32-fix-json-object-leak.patch @@ -0,0 +1,134 @@ +From 6637a6d512a940c3d9c101f4eaca3c1c7a36517c Mon Sep 17 00:00:00 2001 +From: Hangbin Liu +Date: Tue, 28 Feb 2023 15:31:46 +0800 +Subject: [PATCH] tc: f_u32: fix json object leak +Upstream: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=6637a6d512a940c3d9c101f4eaca3c1c7a36517c + +Previously, the code returned directly within the switch statement in +the functions print_{ipv4, ipv6}. While this approach was functional, +after the commit 721435dc, we can no longer return directly because we +need to close the match object. To resolve this issue, replace the return +statement with break. + +Fixes: 721435dcfd92 ("tc: u32: add json support in `print_raw`, `print_ipv4`, `print_ipv6`") +Signed-off-by: Hangbin Liu +Signed-off-by: Stephen Hemminger +--- + tc/f_u32.c | 24 ++++++++++-------------- + 1 file changed, 10 insertions(+), 14 deletions(-) + +diff --git a/tc/f_u32.c b/tc/f_u32.c +index de2d0c9e..936dbd65 100644 +--- a/tc/f_u32.c ++++ b/tc/f_u32.c +@@ -828,12 +828,12 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key) + print_nl(); + print_uint(PRINT_ANY, "ip_ihl", " match IP ihl %u", + ntohl(key->val) >> 24); +- return; ++ break; + case 0x00ff0000: + print_nl(); + print_0xhex(PRINT_ANY, "ip_dsfield", " match IP dsfield %#x", + ntohl(key->val) >> 16); +- return; ++ break; + } + break; + case 8: +@@ -841,7 +841,6 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key) + print_nl(); + print_int(PRINT_ANY, "ip_protocol", " match IP protocol %d", + ntohl(key->val) >> 16); +- return; + } + break; + case 12: +@@ -864,7 +863,6 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key) + print_string(PRINT_ANY, "address", "%s", addr); + print_int(PRINT_ANY, "prefixlen", "/%d", bits); + close_json_object(); +- return; + } + } + break; +@@ -874,19 +872,19 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key) + case 0x0000ffff: + print_uint(PRINT_ANY, "dport", "match dport %u", + ntohl(key->val) & 0xffff); +- return; ++ break; + case 0xffff0000: + print_nl(); + print_uint(PRINT_ANY, "sport", " match sport %u", + ntohl(key->val) >> 16); +- return; ++ break; + case 0xffffffff: + print_nl(); + print_uint(PRINT_ANY, "dport", " match dport %u, ", + ntohl(key->val) & 0xffff); + print_uint(PRINT_ANY, "sport", "match sport %u", + ntohl(key->val) >> 16); +- return; ++ break; + } + /* XXX: Default print_raw */ + } +@@ -905,12 +903,12 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key) + print_nl(); + print_uint(PRINT_ANY, "ip_ihl", " match IP ihl %u", + ntohl(key->val) >> 24); +- return; ++ break; + case 0x00ff0000: + print_nl(); + print_0xhex(PRINT_ANY, "ip_dsfield", " match IP dsfield %#x", + ntohl(key->val) >> 16); +- return; ++ break; + } + break; + case 8: +@@ -918,7 +916,6 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key) + print_nl(); + print_int(PRINT_ANY, "ip_protocol", " match IP protocol %d", + ntohl(key->val) >> 16); +- return; + } + break; + case 12: +@@ -941,7 +938,6 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key) + print_string(PRINT_ANY, "address", "%s", addr); + print_int(PRINT_ANY, "prefixlen", "/%d", bits); + close_json_object(); +- return; + } + } + break; +@@ -952,11 +948,11 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key) + print_nl(); + print_uint(PRINT_ANY, "sport", " match sport %u", + ntohl(key->val) & 0xffff); +- return; ++ break; + case 0xffff0000: + print_uint(PRINT_ANY, "dport", "match dport %u", + ntohl(key->val) >> 16); +- return; ++ break; + case 0xffffffff: + print_nl(); + print_uint(PRINT_ANY, "sport", " match sport %u, ", +@@ -964,7 +960,7 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key) + print_uint(PRINT_ANY, "dport", "match dport %u", + ntohl(key->val) >> 16); + +- return; ++ break; + } + /* XXX: Default print_raw */ + } +-- +2.40.0 + diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 9e8be43f2b02..d1ab936181a3 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab iproute2-6.1.0.tar.xz +sha256 4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62 iproute2-6.2.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 9792630f1518..15af076db9c9 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.1.0 +IPROUTE2_VERSION = 6.2.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From 460c9fa33880397a9a7c16393ac26552a9adc5c3 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 28 Mar 2023 18:27:14 +0200 Subject: [PATCH 0320/2890] package/pciutils: bump to version 3.9.0 remove patch, see commit 0478e1f3928bf "Avoid adding multiple version tags to the same symbol": https://github.com/pciutils/pciutils/commit/0478e1f3928bf Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- ...nd-build-failure-with-older-binutils.patch | 57 ------------------- package/pciutils/Config.in | 2 +- package/pciutils/pciutils.hash | 2 +- package/pciutils/pciutils.mk | 2 +- 4 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 package/pciutils/0001-Workaround-build-failure-with-older-binutils.patch diff --git a/package/pciutils/0001-Workaround-build-failure-with-older-binutils.patch b/package/pciutils/0001-Workaround-build-failure-with-older-binutils.patch deleted file mode 100644 index 1590bc19c56f..000000000000 --- a/package/pciutils/0001-Workaround-build-failure-with-older-binutils.patch +++ /dev/null @@ -1,57 +0,0 @@ -From fda20d4bcb91f0f9d0db294b4813264de2d88866 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 12 May 2022 16:16:21 +0300 -Subject: [PATCH] Workaround build failure with older binutils - -binutils releases older than 2.35 are affected by bug gas/23840[1] that -breaks the link of shared library: - -cc -O2 -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -fPIC -fvisibility=hidden -c -o filter.o filter.c -/tmp/ccLtucRG.s: Assembler messages: -/tmp/ccLtucRG.s:6: Error: multiple versions [`pci_filter_init@@LIBPCI_3.8'|`pci_filter_init@LIBPCI_3.3'] for symbol `pci_filter_init_v38' -/tmp/ccLtucRG.s:8: Error: multiple versions [`pci_filter_parse_slot@@LIBPCI_3.8'|`pci_filter_parse_slot@LIBPCI_3.3'] for symbol `pci_filter_parse_slot_v38' -/tmp/ccLtucRG.s:10: Error: multiple versions [`pci_filter_parse_id@@LIBPCI_3.8'|`pci_filter_parse_id@LIBPCI_3.3'] for symbol `pci_filter_parse_id_v38' -/tmp/ccLtucRG.s:12: Error: multiple versions [`pci_filter_match@@LIBPCI_3.8'|`pci_filter_match@LIBPCI_3.3'] for symbol `pci_filter_match_v38' - -The symbol versioning feature has little value in the context of -Buildroot. As a workaround remove one of each duplicated symbol. - -[1] https://sourceware.org/bugzilla/show_bug.cgi?id=23840 - -Signed-off-by: Baruch Siach ---- -Upstream status: not upstreamable - -Upstream bug report: https://lore.kernel.org/linux-pci/87mtfm7v58.fsf@tarshish/ ---- - lib/filter.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/lib/filter.c b/lib/filter.c -index b881b6bc9083..bc34e8c2bab9 100644 ---- a/lib/filter.c -+++ b/lib/filter.c -@@ -304,20 +304,16 @@ pci_filter_match_v30(struct pci_filter_v30 *f, struct pci_dev *d) - - STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38(a, f)); - SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@@LIBPCI_3.8); - - STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v38(f, str)); - SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@@LIBPCI_3.8); - - STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v38(f, str)); - SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@@LIBPCI_3.8); - - STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38(f, d)); - SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@@LIBPCI_3.8); --- -2.35.1 - diff --git a/package/pciutils/Config.in b/package/pciutils/Config.in index a082f239977d..d16c36340f44 100644 --- a/package/pciutils/Config.in +++ b/package/pciutils/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PCIUTILS Various utilities dealing with the PCI bus. Provides things like setpci and lspci. - http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html + https://mj.ucw.cz/sw/pciutils/ diff --git a/package/pciutils/pciutils.hash b/package/pciutils/pciutils.hash index 0b66b825891e..93df1558ffd6 100644 --- a/package/pciutils/pciutils.hash +++ b/package/pciutils/pciutils.hash @@ -1,3 +1,3 @@ # From https://www.kernel.org/pub/software/utils/pciutils/sha256sums.asc -sha256 91edbd0429a84705c9ad156d4ff38ccc724d41ea54c4c5b88e38e996f8a34f05 pciutils-3.8.0.tar.xz +sha256 cdea7ae97239dee23249a09c68a19a287a3f109fbeb2c232ebb616cb38599012 pciutils-3.9.0.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 140276dbc47e..95b377d844fc 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCIUTILS_VERSION = 3.8.0 +PCIUTILS_VERSION = 3.9.0 PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz PCIUTILS_INSTALL_STAGING = YES From 7cccb966963142d2849c38ba80f17aba511f7bea Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 11 Apr 2023 23:23:54 +0200 Subject: [PATCH 0321/2890] package/libressl: bump to version 3.7.2 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 907b9cdd068d..03ec1e10c1f6 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 4be80fff073746cf50b4a8e5babe2795acae98c6b132a9e02519b445dfbfd033 libressl-3.6.2.tar.gz +sha256 b06aa538fefc9c6b33c4db4931a09a5f52d9d2357219afcbff7d93fe12ebf6f7 libressl-3.7.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index b5fae7e26e00..ae3a2499690d 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.6.2 +LIBRESSL_VERSION = 3.7.2 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From 7c30ba90ce581b3cb8ac9b0ba304fddab20d4ba6 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 27 Mar 2023 23:07:20 +0200 Subject: [PATCH 0322/2890] package/rtl8723ds: fix typo CLAGS renaming with CFLAGS Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/rtl8723ds/rtl8723ds.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 1bb164fa86d7..f62ce2bf6c77 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -9,7 +9,7 @@ RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 RTL8723DS_LICENSE_FILES = COPYING -RTL8723DS_USER_EXTRA_CLAGS = \ +RTL8723DS_USER_EXTRA_CFLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ -DCONFIG_IOCTL_CFG80211 \ -DRTW_USE_CFG80211_STA_EVENT \ @@ -20,7 +20,7 @@ RTL8723DS_MODULE_MAKE_OPTS = \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) \ - USER_EXTRA_CFLAGS="$(RTL8723DS_USER_EXTRA_CLAGS)" + USER_EXTRA_CFLAGS="$(RTL8723DS_USER_EXTRA_CFLAGS)" define RTL8723DS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) From 0bd9dabec58eb0d1208333eea7412a6703524fee Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 27 Mar 2023 20:27:21 +0200 Subject: [PATCH 0323/2890] package/rtl8189fs: bump to version 2023-03-27 on rtl8189fs branch Fixes: http://autobuild.buildroot.net/results/a1c/a1c4c386e60a082d30cae686b9e1d27d01046266/ Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index 018e5b8a7785..95a031b6f298 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 20382dbb1ac33425e6b3198cc9be269b79cd1423ea656e0ccd16dedafa3e2a2a rtl8189fs-ed6741b52bc998875298117b55d18b0d557c37a6.tar.gz +sha256 5d8aad48b8d124a313e5b8182c5dba2b94ecdbac2a9f1861a50c081b9034a543 rtl8189fs-c223a25b1000d64432eca4201a8f012414dfc7ce.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 2dd9e6097c59..dd35a166e539 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = ed6741b52bc998875298117b55d18b0d557c37a6 +RTL8189FS_VERSION = c223a25b1000d64432eca4201a8f012414dfc7ce RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 From 244fe62cafb428e2bce303010b4f7699640bcafe Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 20 Apr 2023 19:00:05 +0200 Subject: [PATCH 0324/2890] package/coreutils: bump version to 9.3 Bugfix release, fixing regressions introduced by 9.2. For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2023-04/msg00006.html Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.hash | 2 +- package/coreutils/coreutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/coreutils/coreutils.hash b/package/coreutils/coreutils.hash index 72f63b242d26..7df1048afac9 100644 --- a/package/coreutils/coreutils.hash +++ b/package/coreutils/coreutils.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 6885ff47b9cdb211de47d368c17853f406daaf98b148aaecdf10de29cc04b0b3 coreutils-9.2.tar.xz +sha256 adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa coreutils-9.3.tar.xz # Locally computed sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 9b07bb31d266..2c12e8ef2f6a 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -COREUTILS_VERSION = 9.2 +COREUTILS_VERSION = 9.3 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPL-3.0+ From 6e863bdef45c3f4ffabcc8d007f658ea04cb9908 Mon Sep 17 00:00:00 2001 From: Maksim Kiselev Date: Thu, 27 Apr 2023 23:28:02 +0300 Subject: [PATCH 0325/2890] package/sunxi-tools: fix build dependencies This patch fixes the dependency on libfdt for host-sunxi-tools. Also it fixes the dependency on zlib for sunxi-tools. Fix the following host build failure raised since commit 2e330dff6a7ce7965ceb0dccdc9dcbcb329167bb fit_image.c:19:10: fatal error: libfdt.h: No such file or directory 19 | #include | ^~~~~~~~~~ compilation terminated. Fixes: http://autobuild.buildroot.net/results/2677c69ac34642a7a501230e1dd22b193db0899d/ Signed-off-by: Maksim Kiselev Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/sunxi-tools/Config.in | 1 + package/sunxi-tools/Config.in.host | 1 + package/sunxi-tools/sunxi-tools.mk | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/sunxi-tools/Config.in b/package/sunxi-tools/Config.in index e748637c7202..14f7da5bf207 100644 --- a/package/sunxi-tools/Config.in +++ b/package/sunxi-tools/Config.in @@ -27,6 +27,7 @@ config BR2_PACKAGE_SUNXI_TOOLS_FEL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_DTC select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_ZLIB help The sunxi-fel command can interact with a sunxi device in fel mode. This allows do download code to memory and execute diff --git a/package/sunxi-tools/Config.in.host b/package/sunxi-tools/Config.in.host index 51f13cf623d5..f7c60b37a9c4 100644 --- a/package/sunxi-tools/Config.in.host +++ b/package/sunxi-tools/Config.in.host @@ -2,6 +2,7 @@ config BR2_PACKAGE_HOST_SUNXI_TOOLS bool "host sunxi-tools" depends on BR2_arm depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb + select BR2_PACKAGE_HOST_DTC help Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i) based devices. This includes fex2bin which can be used to diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk index a9569f291096..97863efc13e1 100644 --- a/package/sunxi-tools/sunxi-tools.mk +++ b/package/sunxi-tools/sunxi-tools.mk @@ -8,7 +8,7 @@ SUNXI_TOOLS_VERSION = 1.4.2-168-ged3039cdbeeb28fc0011c3585d8f7dfb91038292 SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,v$(SUNXI_TOOLS_VERSION)) SUNXI_TOOLS_LICENSE = GPL-2.0+ SUNXI_TOOLS_LICENSE_FILES = LICENSE.md -HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf +HOST_SUNXI_TOOLS_DEPENDENCIES = host-dtc host-libzlib host-libusb host-pkgconf FEX2BIN = $(HOST_DIR)/bin/fex2bin SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_FEXC) += sunxi-fexc @@ -26,13 +26,14 @@ SUNXI_TOOLS_FEXC_LINKS += fex2bin bin2fex endif ifeq ($(BR2_PACKAGE_SUNXI_TOOLS_FEL),y) -SUNXI_TOOLS_DEPENDENCIES += dtc libusb host-pkgconf +SUNXI_TOOLS_DEPENDENCIES += dtc libusb zlib host-pkgconf endif define HOST_SUNXI_TOOLS_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) CROSS_COMPILE="" CC="$(HOSTCC)" \ PREFIX=$(HOST_DIR) EXTRA_CFLAGS="$(HOST_CFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) tools misc + LDFLAGS="$(HOST_LDFLAGS) -I$(HOST_DIR)/include/libfdt" \ + -C $(@D) tools misc endef define HOST_SUNXI_TOOLS_INSTALL_CMDS From 0f1d33b6c8666d765f25d81b777aa666a9b492a8 Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Fri, 28 Apr 2023 15:16:18 +0800 Subject: [PATCH 0326/2890] package/crun: bump to version 1.8.4 Changes: https://github.com/containers/crun/releases/tag/1.8.4 Also emoved 0001-src-crun.c-fix-build-without-dlfcn.h.patch, this commit has already existed in the latest version release. Signed-off-by: Xiangyu Chen Signed-off-by: Peter Korsgaard --- ...src-crun.c-fix-build-without-dlfcn.h.patch | 39 ------------------- package/crun/crun.hash | 2 +- package/crun/crun.mk | 2 +- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch diff --git a/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch b/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch deleted file mode 100644 index 104c19a40ffc..000000000000 --- a/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 278b9b447bec3fb81bf252eb2fe2c856892ec802 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 30 Dec 2022 18:40:15 +0100 -Subject: [PATCH] src/crun.c: fix build without dlfcn.h - -Fix the following build failure without dlfcn.h raised since version 1.7 -and -https://github.com/containers/crun/commit/5837234e9840cd067edd9f6cd2ed9cae9a0e6570: - -src/crun.c:26:10: fatal error: dlfcn.h: No such file or directory - 26 | #include - | ^~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/a5f52a7ee757c92c9571261c0ed884d05caeaf2f - -[fontaine.fabrice@gmail.com: backport upstream commit] -Signed-off-by: Fabrice Fontaine ---- - src/crun.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/crun.c b/src/crun.c -index cbfe900..af0cc97 100644 ---- a/src/crun.c -+++ b/src/crun.c -@@ -23,7 +23,9 @@ - #include - #include - -+#ifdef HAVE_DLOPEN - #include -+#endif - - #include "crun.h" - #include "libcrun/utils.h" --- -2.25.1 - diff --git a/package/crun/crun.hash b/package/crun/crun.hash index 2b21800f022e..bdffb0c6aabb 100644 --- a/package/crun/crun.hash +++ b/package/crun/crun.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 f669ecd3d1895dcaa8425eabb707c06eb3bdb5ae5201a50a423c3cace36c4a05 crun-1.7.2.tar.gz +sha256 5b8b5adb1dff7af768b69d2b0b4f2cd785ec931e7aa10138aa29812c46ee09ff crun-1.8.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.libcrun diff --git a/package/crun/crun.mk b/package/crun/crun.mk index ddb96a0b336f..15438a44b32a 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRUN_VERSION = 1.7.2 +CRUN_VERSION = 1.8.4 CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION) CRUN_DEPENDENCIES = host-pkgconf yajl From 5b63325e86a034b63075f01a2ddbb7c5b1f67dc1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 2 Apr 2023 11:05:00 +0200 Subject: [PATCH 0327/2890] package/zeek: disable with libressl Disable building with libressl to avoid the following build failure raised since the addition of the package in commit ea36681572255ec906167308c07adc42ed2ac9f9: In file included from /home/thomas/autobuild/instance-2/output-1/build/zeek-4.1.1/src/analyzer/protocol/mime/MIME.cc:7: /home/thomas/autobuild/instance-2/output-1/build/zeek-4.1.1/src/zeek/digest.h: In function 'void* EVP_MD_CTX_md_data(const EVP_MD_CTX*)': /home/thomas/autobuild/instance-2/output-1/build/zeek-4.1.1/src/zeek/digest.h:22:12: error: invalid use of incomplete type 'const EVP_MD_CTX' {aka 'const struct env_md_ctx_st'} 22 | return ctx->md_data; | ^~ Fixes: - http://autobuild.buildroot.org/results/2db2988d495f9d06d058fb532a2dcfa9ef6e207c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/zeek/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zeek/Config.in b/package/zeek/Config.in index 114ec4235de6..730388ded753 100644 --- a/package/zeek/Config.in +++ b/package/zeek/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_ZEEK select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_ZLIB help The Zeek Network Security Monitor From 20026dd4d7ea17ada0d99a1fbd18b62af0f2ea40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Wed, 19 Apr 2023 13:27:25 +0300 Subject: [PATCH 0328/2890] package/libmdbx: bump version to 0.12.5 "Dynamo" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is stable release of frontward _libmdbx_ branch with new superior features on the day of 100 anniversary of USSR' «Dynamo» sports and fitness society. The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: Леонид Юрьев (Leonid Yuriev) Signed-off-by: Peter Korsgaard --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index b1a2891b9155..7a5b19952ea8 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 97b03965b5b61727dc4232c50ccb174c632470a3d24438b3c52315bef6fb4033 libmdbx-amalgamated-0.11.14.tar.xz +sha256 9c3abaaf9079a9518bb7155734817a2e286fffea46f7cc0825dfbd1cf9174075 libmdbx-amalgamated-0.12.5.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index 5e7995f8c8ac..0c6c9bcb9f0a 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.14 +LIBMDBX_VERSION = 0.12.5 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From 64d7856924d88ea06886cbb79872b353b6a1899b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 14:23:41 +0200 Subject: [PATCH 0329/2890] package/intel-gmmlib: bump version to 22.3.5 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index d959f968e0ec..00a4654b125d 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c42b5fa1f5f7c165621099b3787de4c052688cd93c6ef986589ab24fff09b659 intel-gmmlib-22.3.4.tar.gz +sha256 24200744a185d446329402e671555e7cd18be7a09374445f9b337c6d3a4f4c52 intel-gmmlib-22.3.5.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 0308ab6a2801..74ba6e360317 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.4 +INTEL_GMMLIB_VERSION = 22.3.5 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 9678576c5247474b2f1025c1bb31b3a625143a3c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 14:23:42 +0200 Subject: [PATCH 0330/2890] package/intel-mediadriver: bump version to 23.2.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 0ec128f9fd71..7425c388c26b 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3b9a809f618cfd0a7835060dfec777a7bdd76f85d170c83116078bf7d4e3d427 intel-media-23.1.3.tar.gz +sha256 c7f79f0534e9832d22faf0ab7efedac75fb8726698f49877ca965d8255a9c38d intel-media-23.2.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 51083af1440b..c0d30143fa26 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 23.1.3 +INTEL_MEDIADRIVER_VERSION = 23.2.0 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From e48887be5a17fc3e6621d0be98f6e91b1a799c33 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 14:23:43 +0200 Subject: [PATCH 0331/2890] package/intel-mediasdk: bump version to 23.2.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index bdd4c7f3a6d0..4b5779169b62 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f1bb11ddaa44d5827562600e0a989ca20550e1b021314bce32bc4957352da110 intel-mediasdk-23.1.3.tar.gz +sha256 6b33ec917ef0c6395fb66c7b93aae4ae31b3d1dedb5d7d39e0c69f45acb7c4fb intel-mediasdk-23.2.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 9843ec350295..c09d81aa2d51 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 23.1.3 +INTEL_MEDIASDK_VERSION = 23.2.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From 734cc8e951e899a88867feb83b0bf087a7d6b542 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 1 May 2023 19:12:33 +0200 Subject: [PATCH 0332/2890] package/samba4: security bump version to 4.15.13 Release notes: https://www.samba.org/samba/history/samba-4.15.13.html Fixes CVE-2022-37966, CVE-2022-37967, CVE-2022-38023 & CVE-2022-45141. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 81cbab45527d..18ec63e07a57 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.12.tar.asc -sha256 5889493d69dc7723be6c3154387fbed38c1cddf93a16da8670d99b7cca33b15e samba-4.15.12.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.13.tar.asc +sha256 c412e3536a5265d04e52983e643bae9e047bcc3eac08683a945b1057ecdf4968 samba-4.15.13.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 31f692e03d7a..b979aaf09f6e 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.12 +SAMBA4_VERSION = 4.15.13 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 082244179dcbdfbbf60f8cbf3e24ee7c3c736ae1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 30 Apr 2023 09:57:35 +0200 Subject: [PATCH 0333/2890] package/moarvm: bump to version 2023.02 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/moarvm/moarvm.hash | 2 +- package/moarvm/moarvm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index 624988215e3e..e56ecfe656ec 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 51c3e9c9a7a191c148f213b65ae1f4fcfe5d4b7c16c86300e9ee8e18eaa8becb MoarVM-2022.12.tar.gz +sha256 67e214d44d5f626787ca7f04424043a639308a43a7777b6fa41926b7240e0dc5 MoarVM-2023.02.tar.gz sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index ef9d29d5af7e..6ac2468f51cd 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2022.12 +MOARVM_VERSION = 2023.02 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 From 8520da532b5ce366c10eb22dbbe65bf2f85ff072 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sat, 29 Apr 2023 15:05:50 -0400 Subject: [PATCH 0334/2890] package/systemd: update help links When browsing the help references for various systemd features, it was observed that the `systemd-rfkill` link was dead (originally pointing to `systemd-rfkill@.service.html`; now `systemd-rfkill.service.html`). This commit corrects this link, as well as updates all other links to https (since freedesktop.org now force redirects to https). Signed-off-by: James Knight Signed-off-by: Peter Korsgaard --- package/systemd/Config.in | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 9f4d933779e8..bea717a4560f 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -100,7 +100,7 @@ menuconfig BR2_PACKAGE_SYSTEMD the apropriate ones (e.g. e2fsck, from the e2fsprogs package) according to the system configuration. - http://freedesktop.org/wiki/Software/systemd + https://freedesktop.org/wiki/Software/systemd/ if BR2_PACKAGE_SYSTEMD @@ -185,7 +185,7 @@ config BR2_PACKAGE_SYSTEMD_BACKLIGHT systemd-backlight is a service that restores the display backlight brightness at early boot and saves it at shutdown. - http://www.freedesktop.org/software/systemd/man/systemd-backlight@.service.html + https://www.freedesktop.org/software/systemd/man/systemd-backlight@.service.html config BR2_PACKAGE_SYSTEMD_BINFMT bool "enable binfmt tool" @@ -202,7 +202,7 @@ config BR2_PACKAGE_SYSTEMD_COREDUMP kernel when a user space program receives a fatal signal and dumps core. - http://www.freedesktop.org/software/systemd/man/systemd-coredump.html + https://www.freedesktop.org/software/systemd/man/systemd-coredump.html config BR2_PACKAGE_SYSTEMD_PSTORE bool "enable pstore support" @@ -220,7 +220,7 @@ config BR2_PACKAGE_SYSTEMD_FIRSTBOOT systemd-firstboot initializes the most basic system settings interactively on the first boot. - http://www.freedesktop.org/software/systemd/man/systemd-firstboot.html + https://www.freedesktop.org/software/systemd/man/systemd-firstboot.html config BR2_PACKAGE_SYSTEMD_HIBERNATE bool "enable hibernation support" @@ -229,7 +229,7 @@ config BR2_PACKAGE_SYSTEMD_HIBERNATE When this features is enabled, additional tools and services are built to support suspending and resuming the system. - http://www.freedesktop.org/software/systemd/man/systemd-sleep.html + https://www.freedesktop.org/software/systemd/man/systemd-sleep.html config BR2_PACKAGE_SYSTEMD_HOMED bool "enable home daemon" @@ -261,7 +261,7 @@ config BR2_PACKAGE_SYSTEMD_HOSTNAMED systemd-hostnamed is a system service that may be used as a mechanism to change the system's hostname. - http://www.freedesktop.org/software/systemd/man/systemd-hostnamed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-hostnamed.service.html config BR2_PACKAGE_SYSTEMD_HWDB bool "enable hwdb installation" @@ -286,7 +286,7 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD machine and container images for systemd-machined and machinectl. - http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands + https://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands config BR2_PACKAGE_SYSTEMD_CATALOGDB bool "enable journal catalog database installation" @@ -309,14 +309,14 @@ config BR2_PACKAGE_SYSTEMD_LOCALED mechanism to change the system locale settings, as well as the console key mapping and default X11 key mapping. - http://www.freedesktop.org/software/systemd/man/systemd-localed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-localed.service.html config BR2_PACKAGE_SYSTEMD_LOGIND bool "enable login daemon" help systemd-logind is a system service that manages user logins. - http://www.freedesktop.org/software/systemd/man/systemd-logind.service.html + https://www.freedesktop.org/software/systemd/man/systemd-logind.service.html config BR2_PACKAGE_SYSTEMD_MACHINED bool "enable machine daemon" @@ -325,7 +325,7 @@ config BR2_PACKAGE_SYSTEMD_MACHINED virtual machines and containers, and processes belonging to them. - http://www.freedesktop.org/software/systemd/man/systemd-machined.service.html + https://www.freedesktop.org/software/systemd/man/systemd-machined.service.html config BR2_PACKAGE_SYSTEMD_MYHOSTNAME bool "enable myhostname NSS plugin" @@ -336,7 +336,7 @@ config BR2_PACKAGE_SYSTEMD_MYHOSTNAME primarily providing hostname resolution for the locally configured system hostname as returned by gethostname(2). - http://www.freedesktop.org/software/systemd/man/nss-myhostname.html + https://www.freedesktop.org/software/systemd/man/nss-myhostname.html config BR2_PACKAGE_SYSTEMD_NETWORKD bool "enable network manager" @@ -349,7 +349,7 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD This simple network configuration solution is an alternative to dhcpcd or ISC dhcp. - http://www.freedesktop.org/software/systemd/man/systemd-networkd.html + https://www.freedesktop.org/software/systemd/man/systemd-networkd.html config BR2_PACKAGE_SYSTEMD_OOMD bool "enable out-of-memory killer" @@ -373,7 +373,7 @@ config BR2_PACKAGE_SYSTEMD_POLKIT useful for allowing unprivileged processes to speak to systemd's many privileged processes. - http://wiki.freedesktop.org/www/Software/polkit/ + https://wiki.freedesktop.org/www/Software/polkit/ comment "polkit support needs a toolchain with threads, wchar, gcc >= 7" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ @@ -408,7 +408,7 @@ config BR2_PACKAGE_SYSTEMD_QUOTACHECK file systems are mounted. It is pulled in only if at least one file system has quotas enabled. - http://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html + https://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html config BR2_PACKAGE_SYSTEMD_RANDOMSEED bool "enable random-seed support" @@ -418,7 +418,7 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED shutdown. Saving/restoring the random seed across boots increases the amount of available entropy early at boot. - http://www.freedesktop.org/software/systemd/man/systemd-random-seed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-random-seed.service.html config BR2_PACKAGE_SYSTEMD_REPART bool "enable repart support" @@ -440,7 +440,7 @@ config BR2_PACKAGE_SYSTEMD_RESOLVED caching and validating DNS/DNSSEC stub resolver, as well as an LLMNR resolver and responder. - http://www.freedesktop.org/software/systemd/man/systemd-resolved.html + https://www.freedesktop.org/software/systemd/man/systemd-resolved.html config BR2_PACKAGE_SYSTEMD_RFKILL bool "enable rfkill tools" @@ -448,7 +448,7 @@ config BR2_PACKAGE_SYSTEMD_RFKILL systemd-rfkill is a service that restores the RF kill switch state at early boot and saves it at shutdown. - http://www.freedesktop.org/software/systemd/man/systemd-rfkill@.service.html + https://www.freedesktop.org/software/systemd/man/systemd-rfkill.service.html config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT bool "enable SMACK support" @@ -503,7 +503,7 @@ config BR2_PACKAGE_SYSTEMD_SYSUSERS systemd-sysusers creates system users and groups, based on the file format and location specified in sysusers.d(5). - http://www.freedesktop.org/software/systemd/man/systemd-sysusers.html + https://www.freedesktop.org/software/systemd/man/systemd-sysusers.html config BR2_PACKAGE_SYSTEMD_TIMEDATED bool "enable timedate daemon" @@ -513,7 +513,7 @@ config BR2_PACKAGE_SYSTEMD_TIMEDATED mechanism to change the system clock and timezone, as well as to enable/disable NTP time synchronization. - http://www.freedesktop.org/software/systemd/man/systemd-timedated.service.html + https://www.freedesktop.org/software/systemd/man/systemd-timedated.service.html config BR2_PACKAGE_SYSTEMD_TIMESYNCD bool "enable timesync daemon" @@ -526,7 +526,7 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD This simple NTP solution is an alternative to sntp/ntpd from the ntp package. - http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html + https://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html config BR2_PACKAGE_SYSTEMD_USERDB bool "enable userdb daemon" @@ -567,6 +567,6 @@ config BR2_PACKAGE_SYSTEMD_VCONSOLE systemd-vconsole-setup is an early boot service that configures the virtual console font and console keymap. - http://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html + https://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html endif From 6b6814f149cccfb4ae7f34fbfd317560b6cd98ca Mon Sep 17 00:00:00 2001 From: James Knight Date: Tue, 25 Apr 2023 00:33:52 -0400 Subject: [PATCH 0335/2890] package/libcurl: drop override of LD_LIBRARY_PATH A previous commit [1] (libcurl 7.19.2) configured `LD_LIBRARY_PATH` to prevent cross-compiling errors when target == host; however, such an override is no longer needed [2][3] (libcurl 7.37, 7.74) and causes build errors in some environments. Dropping the override. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=15181 [1]: a51ce3194923430fc229fc2ad98b12795b5a1876 [2]: https://github.com/curl/curl/commit/e48a821ed580cd2897b3e1b0bc88ca9245ac234c [3]: https://github.com/curl/curl/commit/6f3369bbcf9d0ebdaa5d141f8ca446448c24494c Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/libcurl/libcurl.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 1a1594a45e23..dd715c1bb672 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -56,11 +56,6 @@ endif ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) LIBCURL_DEPENDENCIES += openssl -# configure adds the cross openssl dir to LD_LIBRARY_PATH which screws up -# native stuff during the rest of configure when target == host. -# Fix it by setting LD_LIBRARY_PATH to something sensible so those libs -# are found first. -LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)/lib:/usr/lib LIBCURL_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr \ --with-ca-path=/etc/ssl/certs else From 66d3e74d94f8ac2f8f20302275ee944d24cbc074 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 1 May 2023 21:51:50 +0200 Subject: [PATCH 0336/2890] .checkpackageignore: regenerate list Some patches were removed in recent version bumps: - 492c803117c1 package/tbb: bump to version 2021.8.0. - a1e0e7276ca2 package/libmodsecurity: bump to version 3.0.9 - e4fb09f95f8d package/gstreamer1-editing-services: bump version to 1.22.2 - 460c9fa33880 package/pciutils: bump to version 3.9.0 - 0f1d33b6c866 package/crun: bump to version 1.8.4 And some were renamed with a version bump: - 60d8e5257608 package/lua: bump to version 5.4.5 But the ignore list was not updated in any of those commits, the latter causing issues because the patches are no longer ignored; package/lua/5.4.5/0001-root-path.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation) package/lua/5.4.5/0002-shared-libs-for-lua.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation) package/lua/5.4.5/0011-linenoise.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation) 384140 lines processed 3 warnings generated Update the ignore list accordingly. Signed-off-by: Yann E. MORIN --- .checkpackageignore | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 5f6538ea7457..d1626326a80a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -328,7 +328,6 @@ package/cpulimit/0004-Remove-procfs.h-inclusion.patch Upstream package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch Upstream package/crda/0002-drop-ldconfig-call.patch Upstream package/crda/0003-drop-werror.patch Upstream -package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch Upstream package/ctorrent/0001-fix-musl-build.patch Upstream package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch Upstream package/cups/0002-Do-not-use-genstrings.patch Upstream @@ -640,7 +639,6 @@ package/grpc/0003-host-grpc-only-cpp-plugin.patch Upstream package/grpc/0004-disable-unconditionally-downloading-api-repos.patch Upstream package/gsl/0001-configure.ac-fix-build-on-powerpc.patch Upstream package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch Upstream -package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch Upstream package/guile/0001-calculate-csqrt_manually.patch Upstream package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch Upstream package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch Upstream @@ -842,8 +840,6 @@ package/libmemcached/0005-fix-pointer-comparaison.patch Upstream package/libmng/0001-jpeg-9a.patch Upstream package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch Upstream package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch Upstream -package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch Upstream -package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch Upstream package/libmpd/0001-Fix-build-on-archlinux-missing-include.patch Upstream package/libmpeg2/0001-altivec.patch Upstream package/libmpeg2/0002-armv4l.patch Upstream @@ -993,9 +989,9 @@ package/lua/5.1.5/0012-fix-reader-at-eoz.patch Upstream package/lua/5.3.6/0001-root-path.patch Upstream package/lua/5.3.6/0002-shared-libs-for-lua.patch Upstream package/lua/5.3.6/0003-linenoise.patch Upstream -package/lua/5.4.4/0001-root-path.patch Upstream -package/lua/5.4.4/0002-shared-libs-for-lua.patch Upstream -package/lua/5.4.4/0011-linenoise.patch Upstream +package/lua/5.4.5/0001-root-path.patch Upstream +package/lua/5.4.5/0002-shared-libs-for-lua.patch Upstream +package/lua/5.4.5/0011-linenoise.patch Upstream package/luajit/0001-no-bin-symlink.patch Upstream package/luajit/0002-install-inc.patch Upstream package/luasyslog/0001-remove-AX_LUA_LIBS.patch Upstream @@ -1249,7 +1245,6 @@ package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch Upstream package/paxtest/0001-genpaxtest-move-log-location.patch Upstream package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch Upstream -package/pciutils/0001-Workaround-build-failure-with-older-binutils.patch Upstream package/pcm-tools/0001-pmu-query.py-fix-python3-errors-add-linux-platform-s.patch Upstream package/pcmanfm/0001-po-de-po-fix-build-with-gettext-tiny.patch Upstream package/pcre/0001-Kill-compatibility-bits.patch Upstream @@ -1573,9 +1568,6 @@ package/targetcli-fb/S50target Shellcheck Variables package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch Upstream package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch Upstream package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch Upstream -package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch Upstream -package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch Upstream -package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch Upstream package/tcf-agent/S55tcf-agent Shellcheck Variables package/tcl/0001-dont-build-compat.patch Upstream package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch Upstream From 9a0857d734c5fca74915b1cd85b92555fe15fb93 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Fri, 28 Apr 2023 21:02:00 +0200 Subject: [PATCH 0337/2890] package/libgtk3: fix cups backend When explicitly specifying printing backends libgtk3 requires file to be one of them on linux. Fixes: - output/build/libgtk3-3.24.37/modules/printbackends/meson.build:39:4: ERROR: Problem encountered: 'file' print backed needs to be enabled Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/libgtk3/libgtk3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 18a8a9fa428e..b41049b0eeac 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -68,7 +68,7 @@ LIBGTK3_DEPENDENCIES += xlib_libXdamage endif ifeq ($(BR2_PACKAGE_CUPS),y) -LIBGTK3_CONF_OPTS += -Dprint_backends=cups +LIBGTK3_CONF_OPTS += -Dprint_backends=file,cups LIBGTK3_DEPENDENCIES += cups else LIBGTK3_CONF_OPTS += -Dprint_backends=auto From 2c5ee71c4897eecf0d01b9fa6749640838eadb7e Mon Sep 17 00:00:00 2001 From: James Knight Date: Wed, 3 May 2023 10:55:54 -0400 Subject: [PATCH 0338/2890] package/libpqxx: bump version to 7.7.5 Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/libpqxx/libpqxx.hash | 4 ++-- package/libpqxx/libpqxx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpqxx/libpqxx.hash b/package/libpqxx/libpqxx.hash index 167b5edc9d6b..1c0e4c185ded 100644 --- a/package/libpqxx/libpqxx.hash +++ b/package/libpqxx/libpqxx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 86921fdb0fe54495a79d5af2c96f2c771098c31e9b352d0834230fd2799ad362 libpqxx-6.4.5.tar.gz -sha256 36c48c1ca1b0a68639d919196b5d92c971858ad8e24da24385ba1c65cc5eac38 COPYING +sha256 c7dc3e8fa2eee656f2b6a8179d72f15db10e97a80dc4f173f806e615ea990973 libpqxx-7.7.5.tar.gz +sha256 91718581edafc9f722915133d75f74c82d7c2e41a1831c1e042206423e5a63b0 COPYING diff --git a/package/libpqxx/libpqxx.mk b/package/libpqxx/libpqxx.mk index 9de7df3ed28b..b280f5a52a15 100644 --- a/package/libpqxx/libpqxx.mk +++ b/package/libpqxx/libpqxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPQXX_VERSION = 6.4.5 +LIBPQXX_VERSION = 7.7.5 LIBPQXX_SITE = $(call github,jtv,libpqxx,$(LIBPQXX_VERSION)) LIBPQXX_INSTALL_STAGING = YES LIBPQXX_DEPENDENCIES = postgresql From 509a5d66c4672ce2e8418c3fe1aa5834ab4acb53 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 2 May 2023 16:23:08 -0700 Subject: [PATCH 0339/2890] package/go: security bump to version 1.19.9 go1.19.9 (released 2023-05-02) includes three security fixes to the html/template package, as well as bug fixes to the compiler, the runtime, and the crypto/subtle, crypto/tls, net/http, and syscall packages. CVE-2023-24539: html/template: improper sanitization of CSS values CVE-2023-24540: html/template: improper handling of JavaScript whitespace CVE-2023-29400: html/template: improper handling of empty HTML attributes https://go.dev/doc/devel/release#go1.19.9 https://github.com/golang/go/issues?q=milestone%3AGo1.19.9+label%3ACherryPickApproved Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 5488ed9710e1..ffe42bf3959b 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 1d7a67929dccafeaf8a29e55985bc2b789e0499cb1a17100039f084e3238da2f go1.19.8.src.tar.gz +sha256 131190a4697a70c5b1d232df5d3f55a3f9ec0e78e40516196ffb3f09ae6a5744 go1.19.9.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 37554ddf864a..89c3577982c6 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.8 +GO_VERSION = 1.19.9 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 3816471496036661b2032d5424d0496231b04ca7 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Thu, 4 May 2023 10:33:32 +0200 Subject: [PATCH 0340/2890] package/dnsmasq: fix CVE-2023-28450 Adds the upstream patch that fixes the CVE. No new release so far. Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- ...default-maximum-dns-udp-package-size.patch | 64 +++++++++++++++++++ package/dnsmasq/dnsmasq.mk | 3 + 2 files changed, 67 insertions(+) create mode 100644 package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch diff --git a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch new file mode 100644 index 000000000000..4dd17ec069be --- /dev/null +++ b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch @@ -0,0 +1,64 @@ +From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Tue, 7 Mar 2023 22:07:46 +0000 +Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. +Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 + +http://www.dnsflagday.net/2020/ refers. + +Thanks to Xiang Li for the prompt. + +[dalang@gmx.at: backport from upstream] +Signed-off-by: Daniel Lang +--- + CHANGELOG | 9 ++++++++ + man/dnsmasq.8 | 3 ++- + src/config.h | 2 +- + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 3af20cf..52d8678 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,12 @@ version 2.90 ++version 2.90 ++ Set the default maximum DNS UDP packet sice to 1232. This ++ has been the recommended value since 2020 because it's the ++ largest value that avoid fragmentation, and fragmentation ++ is just not reliable on the modern internet, especially ++ for IPv6. It's still possible to override this with ++ --edns-packet-max for special circumstances. ++ ++ + version 2.89 + Fix bug introduced in 2.88 (commit fe91134b) which can result + in corruption of the DNS cache internal data structures and +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index 41e2e04..5acb935 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. + .TP + .B \-P, --edns-packet-max= + Specify the largest EDNS.0 UDP packet which is supported by the DNS +-forwarder. Defaults to 4096, which is the RFC5625-recommended size. ++forwarder. Defaults to 1232, which is the recommended size following the ++DNS flag day in 2020. Only increase if you know what you are doing. + .TP + .B \-Q, --query-port= + Send outbound DNS queries from, and listen for their replies on, the +diff --git a/src/config.h b/src/config.h +index 1e7b30f..37b374e 100644 +--- a/src/config.h ++++ b/src/config.h +@@ -19,7 +19,7 @@ + #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ + #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ + #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ +-#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ ++#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ + #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ + #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ + #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ +-- +2.20.1 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 58c53904334a..9c05857f224b 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -17,6 +17,9 @@ DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 DNSMASQ_CPE_ID_VENDOR = thekelleys DNSMASQ_SELINUX_MODULES = dnsmasq +# 0001-set-default-maximum-dns-udp-package-size.patch +DNSMASQ_IGNORE_CVES += CVE-2023-28450 + DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y) From a4233a59494b5af4b4cca41f11a14ed64fc7cf43 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 1 May 2023 08:47:34 +0200 Subject: [PATCH 0341/2890] linux: bump latest version to 6.3 We do not need to add a hash for 6.3, as it was already added in eadff4efe9d4 ({toolchain, linux-headers}: add support for 6.3 headers). Signed-off-by: Bernd Kuhls [yann.morin.1998@free.fr: explain why no hash update] Signed-off-by: Yann E. MORIN --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 690ee9c3392e..f6b50a4b58ca 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.1)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.3)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.162-cip24)" @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.26" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.3" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From 773a6fb1b21caa01b209a81abe531d23e53e7b58 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 4 May 2023 18:40:52 +0200 Subject: [PATCH 0342/2890] {linux, linux-headers}: 5.15.x / 6.{1, 2, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- linux/Config.in | 2 +- linux/linux.hash | 8 ++++---- package/linux-headers/Config.in.host | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index f6b50a4b58ca..65d3dc53c637 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.3" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.3.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index e3047886c594..75158437c7c7 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,9 +1,9 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e linux-6.3.tar.xz -sha256 c7dded14e368834b18bb2ad64af65560d8bcb9d2d6597e0f6ef151fded01e577 linux-6.2.13.tar.xz -sha256 dfdcc143a879d64a5ee99213b2b4b05b5dccd566c144df93bca1e204df64c110 linux-6.1.26.tar.xz +sha256 78620fb4a7d5e0db1d4eb8d5b1c6e207ba5d19564efa63967a59b6daf89b3f2a linux-6.3.1.tar.xz +sha256 0ebc9fa309d496d474b06682578c5f7b42f0cf330365102b2feaab65ba296729 linux-6.2.14.tar.xz +sha256 c2b74b96dd3d0cc9f300914ef7c4eef76d5fac9de6047961f49e69447ce9f905 linux-6.1.27.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 066c4bbcbe3c480068a2e302f52b1708f340ecaaf633ec43d7f791bbeac5771a linux-5.15.109.tar.xz +sha256 9829fcc77b9978dce97a26980dec445caf2410024696625dbb2314ead4830b5b linux-5.15.110.tar.xz sha256 1bbd445c154b053eea46acc883be548a98179988a9ed3a0b81bddfbf30a37e29 linux-5.10.179.tar.xz sha256 142f9aed1c9f2e409dd72c5c490ad824dddf31f955ed2097d5989c4b5074fc28 linux-5.4.242.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 4a4f1308cb72..e2934b0f6458 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -404,10 +404,10 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.282" if BR2_KERNEL_HEADERS_4_19 default "5.4.242" if BR2_KERNEL_HEADERS_5_4 default "5.10.179" if BR2_KERNEL_HEADERS_5_10 - default "5.15.109" if BR2_KERNEL_HEADERS_5_15 - default "6.1.26" if BR2_KERNEL_HEADERS_6_1 - default "6.2.13" if BR2_KERNEL_HEADERS_6_2 - default "6.3" if BR2_KERNEL_HEADERS_6_3 + default "5.15.110" if BR2_KERNEL_HEADERS_5_15 + default "6.1.27" if BR2_KERNEL_HEADERS_6_1 + default "6.2.14" if BR2_KERNEL_HEADERS_6_2 + default "6.3.1" if BR2_KERNEL_HEADERS_6_3 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From cd57580729e4d5ac1fe1ed67fdfb7723a9fddece Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 3 May 2023 20:51:43 +0200 Subject: [PATCH 0343/2890] package/coreutils: fix cross-compile (add gl_cv_macro_MB_CUR_MAX_good=yes) - add 'gl_cv_macro_MB_CUR_MAX_good=yes' to COREUTILS_CONF_ENV to fix cross-compile failure since bump to 9.3 Fixes: checking whether MB_CUR_MAX is correct... configure: error: in '.../build/coreutils-9.3': configure: error: cannot run test program while cross compiling See 'config.log' for more details Reported-by: Christian Stewart Link: https://lore.kernel.org/buildroot/CA+h8R2qSe6OepJMJr+KOUOAOqCRD9EX690Y+Yq4kx-M6x4uQBw@mail.gmail.com/ Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/coreutils/coreutils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 2c12e8ef2f6a..cf42a8aff890 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -51,6 +51,7 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ gl_cv_func_tzset_clobber=no \ gl_cv_func_working_mkstemp=yes \ gl_cv_func_working_utimes=yes \ + gl_cv_macro_MB_CUR_MAX_good=yes \ gl_getline_needs_run_time_check=no \ gl_cv_have_proc_uptime=yes \ utils_cv_localtime_cache=no \ From 0ee49d6272b7046c0d961da0b3950e0f78b89a0b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 4 May 2023 22:21:36 +0200 Subject: [PATCH 0344/2890] package/edid-decode: fix typo in Config.in for comment selection Fix typo ('!!' vs. '!') Config.in for dependencies comment selection (introduced by commit 'package/edid-decode: bump version to 1889504', see [1]). [1] https://git.buildroot.net/buildroot/commit/?id=d498088fe7e1e664d4ee8d9bc54262d40227d6e5 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/edid-decode/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/edid-decode/Config.in b/package/edid-decode/Config.in index ddf1942c68a9..5ebecd73304a 100644 --- a/package/edid-decode/Config.in +++ b/package/edid-decode/Config.in @@ -8,5 +8,5 @@ config BR2_PACKAGE_EDID_DECODE https://git.linuxtv.org/edid-decode.git/ comment "edid-decode needs a toolchain w/ C++, gcc >= 4.7" - depends on !!BR2_INSTALL_LIBSTDCPP || \ + depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 From 689ce0eb80842135c7834434784b89935d93ed8d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 4 May 2023 22:21:37 +0200 Subject: [PATCH 0345/2890] package/edid-decode: bump version to 2d44e1b Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/edid-decode/edid-decode.hash | 2 +- package/edid-decode/edid-decode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/edid-decode/edid-decode.hash b/package/edid-decode/edid-decode.hash index 65d6c7107936..8bece9491190 100644 --- a/package/edid-decode/edid-decode.hash +++ b/package/edid-decode/edid-decode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c1a6222083c59f0499b3e43c159aee7e4c6c07d33b790d490a13fd62942fa9b5 edid-decode-188950472c19492547e298b27f9da0d72cf826df-br1.tar.gz +sha256 a8774f1d3eb031ffa4ecb85135b47ad28afeeaa7cf9e8410c5b51a29b83bbfdd edid-decode-2d44e1b01c7ed7d65b20ecdce62d354841832201-br1.tar.gz sha256 9bc7ab961e9a07dc84eaa0210af388def56d024357e79671fb89fe27d073eed7 LICENSE diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk index 7e463c02b1f4..cd0bdfa0f037 100644 --- a/package/edid-decode/edid-decode.mk +++ b/package/edid-decode/edid-decode.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDID_DECODE_VERSION = 188950472c19492547e298b27f9da0d72cf826df +EDID_DECODE_VERSION = 2d44e1b01c7ed7d65b20ecdce62d354841832201 EDID_DECODE_SITE = git://linuxtv.org/edid-decode.git EDID_DECODE_LICENSE = MIT EDID_DECODE_LICENSE_FILES = LICENSE From c9a2015b65c555290710c61492f9896980879060 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 4 May 2023 22:21:55 +0200 Subject: [PATCH 0346/2890] Update for 2022.02.12 Signed-off-by: Peter Korsgaard (cherry picked from commit 8e117464920f2aa2ab7bfc288934c6af4e3504bb) [Peter: drop Makefile / Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGES b/CHANGES index e184f3f3be12..c4bf9d0ad948 100644 --- a/CHANGES +++ b/CHANGES @@ -775,6 +775,18 @@ #14731: BR2_PACKAGE_IOSTAT #14751: LVM2 Outdated Link +2022.02.12, released May 5th, 2023 + + Important / security related fixes. + + Updated/fixed packages: agentpp, apache, ca-certificates, + containerd, coremark, dcron, eudev, ffmpeg, git, + intel-microcode, kexec, lcdproc, libmicrohttpd, libosmium, + libxml2, linux-tools, matio, osm2pgsql, poppler, postgresql, + protozero, python-web2py, runc, s390-tools, samba4, snmppp, + sudo, tcpdump, uclibc, vim, webkitgtk, wpewebkit, + xserver_xorg-server + 2022.02.11, released March 19th, 2023 Important / security related fixes. From e320dd681c6b517c83060c173169defd18345e6f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 4 May 2023 22:52:34 +0200 Subject: [PATCH 0347/2890] docs/website: update for 2022.02.12 Signed-off-by: Peter Korsgaard --- docs/website/news.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 257678465ab3..4e8a7080148a 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

      News

        +
      • +
        +
        +
        +

        2022.02.12 released, 2022.02.x series EOL

        +

        4 May 2023

        +
        +
        +

        The 2022.02.12 bugfix release is out, fixing a number of important / + security related issues discovered since the 2022.02.11 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2022.02.12 release.

        + +

        Notice that the 2022.02.x series is now end of life. Please migrate to + the 2023.02 series instead which will be supported until April 2024.

        +
        +
        +
        • +
      • From 9507e5a4b495716aa8e91211691f62223b883276 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 4 May 2023 22:45:22 +0200 Subject: [PATCH 0348/2890] package/edid-decode: change download from git URL to https - change download from git URL to https (and SITE_METHOD git) Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/edid-decode/edid-decode.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk index cd0bdfa0f037..247ed207d36a 100644 --- a/package/edid-decode/edid-decode.mk +++ b/package/edid-decode/edid-decode.mk @@ -5,7 +5,8 @@ ################################################################################ EDID_DECODE_VERSION = 2d44e1b01c7ed7d65b20ecdce62d354841832201 -EDID_DECODE_SITE = git://linuxtv.org/edid-decode.git +EDID_DECODE_SITE = https://git.linuxtv.org/edid-decode.git +EDID_DECODE_SITE_METHOD = git EDID_DECODE_LICENSE = MIT EDID_DECODE_LICENSE_FILES = LICENSE From 2d7cfd49ba9f5e009f694692cb21077e208e7d55 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 29 Mar 2023 22:56:59 +0200 Subject: [PATCH 0349/2890] package/valgrind: bump version to 3.20.0 - remove 0003-coregrind-fix-compilation-for-uclibc.patch (from upstream [1]) and drop AUTORECONF For details see [2]. [1] https://sourceware.org/git/?p=valgrind.git;a=commit;h=9c9fd9ae24b45f915f0759d32f662835c26d37c3 [2] https://www.valgrind.org/docs/manual/dist.news.html Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...coregrind-fix-compilation-for-uclibc.patch | 65 ------------------- package/valgrind/valgrind.hash | 4 +- package/valgrind/valgrind.mk | 4 +- 3 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch diff --git a/package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch b/package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch deleted file mode 100644 index ff8dc974d83a..000000000000 --- a/package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 9c9fd9ae24b45f915f0759d32f662835c26d37c3 Mon Sep 17 00:00:00 2001 -From: Dario Binacchi -Date: Fri, 8 Apr 2022 12:36:33 +0200 -Subject: [PATCH] coregrind: fix compilation for uclibc - -It fixes a known iusse whose details are described at [1] and more -generally it guarantees that Valgrind is properly compiled for ulibc. - -[1] https://www.mail-archive.com/valgrind-users@lists.sourceforge.net/msg05295.html - -Suggested-by Michael Trimarchi -Co-developed-by: Michael Trimarchi -Signed-off-by: Dario Binacchi ---- - configure.ac | 2 ++ - coregrind/m_debuginfo/minilzo-inl.c | 4 ++++ - coregrind/vg_preloaded.c | 4 ++++ - 3 files changed, 10 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 6f51dfd9f8fb..c627a9c17a4a 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -1204,6 +1204,8 @@ AC_SUBST(DEFAULT_SUPP) - AC_CHECK_HEADER([features.h]) - - if test x$ac_cv_header_features_h = xyes; then -+ AC_DEFINE([HAVE_HEADER_FEATURES_H], 1, -+ [Define to 1 if you have the `features.h' header.]) - rm -f conftest.$ac_ext - cat <<_ACEOF >conftest.$ac_ext - #include -diff --git a/coregrind/m_debuginfo/minilzo-inl.c b/coregrind/m_debuginfo/minilzo-inl.c -index 153d008fd44f..b45ec92eaa85 100644 ---- a/coregrind/m_debuginfo/minilzo-inl.c -+++ b/coregrind/m_debuginfo/minilzo-inl.c -@@ -1875,6 +1875,10 @@ extern "C" { - - #endif - -+#ifdef HAVE_HEADER_FEATURES_H -+#include -+#endif -+ - #undef LZO_HAVE_CONFIG_H - #include "minilzo.h" - -diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c -index 5e2098390847..3809811aede7 100644 ---- a/coregrind/vg_preloaded.c -+++ b/coregrind/vg_preloaded.c -@@ -45,6 +45,10 @@ - #include "pub_core_debuginfo.h" // Needed for pub_core_redir.h - #include "pub_core_redir.h" // For VG_NOTIFY_ON_LOAD - -+#ifdef HAVE_HEADER_FEATURES_H -+#include -+#endif -+ - #if defined(VGO_linux) || defined(VGO_solaris) || defined(VGO_freebsd) - - /* --------------------------------------------------------------------- --- -2.32.0 - diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash index 8487c07e42cd..83717f26f3de 100644 --- a/package/valgrind/valgrind.hash +++ b/package/valgrind/valgrind.hash @@ -1,7 +1,7 @@ # From https://valgrind.org/downloads/current.html -md5 4687a4990585a038c52f842448ef4e63 valgrind-3.19.0.tar.bz2 +md5 e3ca8e03c6c527e80e7da5135a1b6beb valgrind-3.20.0.tar.bz2 # locally computed -sha256 dd5e34486f1a483ff7be7300cc16b4d6b24690987877c3278d797534d6738f02 valgrind-3.19.0.tar.bz2 +sha256 8536c031dbe078d342f121fa881a9ecd205cb5a78e639005ad570011bdb9f3c6 valgrind-3.20.0.tar.bz2 # License files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 17b131c3ec66..98beb7ffef28 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALGRIND_VERSION = 3.19.0 +VALGRIND_VERSION = 3.20.0 VALGRIND_SITE = https://sourceware.org/pub/valgrind VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2 @@ -14,8 +14,6 @@ VALGRIND_CONF_OPTS = \ --disable-ubsan \ --without-mpicc VALGRIND_INSTALL_STAGING = YES -# 0003-coregrind-fix-compilation-for-uclibc.patch -VALGRIND_AUTORECONF=YES # Valgrind must be compiled with no stack protection, so forcefully # pass -fno-stack-protector to override what Buildroot may have in From 90ffab4011fa42492e12335a93ce749d60d8190c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 29 Mar 2023 21:13:22 +0200 Subject: [PATCH 0350/2890] DEVELOPERS: add Julien Olivain for package/openblas The package has been orphan since commit ee58353 (2018-12-22). Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d9e95a3d0531..57b67e091e1c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1712,6 +1712,7 @@ F: package/kexec/ F: package/libjxl/ F: package/octave/ F: package/ola/ +F: package/openblas/ F: package/openmpi/ F: package/perftest/ F: package/ptm2human/ From 378fea2d23a404dd93c9db05b293094ff4dee4ba Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 29 Mar 2023 21:13:23 +0200 Subject: [PATCH 0351/2890] package/openblas: bump to version v0.3.22 For change log since v0.3.21, see: - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.22 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/openblas/openblas.hash | 2 +- package/openblas/openblas.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index 3a52600056c8..a8b5527e81cd 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f36ba3d7a60e7c8bcc54cd9aaa9b1223dd42eaf02c811791c37e8ca707c241ca openblas-0.3.21.tar.gz +sha256 7fa9685926ba4f27cfe513adbf9af64d6b6b63f9dcabb37baefad6a65ff347a7 openblas-0.3.22.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index ac40c57afb31..27f20654e73d 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.21 +OPENBLAS_VERSION = 0.3.22 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE From 4aef53575bdb9d1e74ca5600eb93079964d2e8fd Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Fri, 5 May 2023 16:49:17 +0200 Subject: [PATCH 0352/2890] package/libgit2: bump version to 1.6.4 * Remove patch applied upstream. * Upstream fixed building inside the source tree, but still does not recommend it, so keep LIBGIT2_SUPPORTS_IN_SOURCE_BUILD = NO Signed-off-by: Nicolas Cavallari Signed-off-by: Yann E. MORIN --- ...clare-win32-functions-on-non-win32-p.patch | 35 ------------------- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch diff --git a/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch b/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch deleted file mode 100644 index 6be66ffee3a4..000000000000 --- a/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 20811c5aa9c528405eaa3f88ff22a9adebafa9e6 Mon Sep 17 00:00:00 2001 -From: Nicolas Cavallari -Date: Wed, 8 Mar 2023 14:00:52 +0100 -Subject: [PATCH] sysdir: Do not declare win32 functions on non-win32 platforms - -These declaration poses problems on some embedded or retro Linux systems -that deliberately disable support for wchar_t from their libc. - -Signed-off-by: Nicolas Cavallari -[Retrieved from: -https://github.com/libgit2/libgit2/commit/20811c5aa9c528405eaa3f88ff22a9adebafa9e6] ---- - src/libgit2/sysdir.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/libgit2/sysdir.h b/src/libgit2/sysdir.h -index 1d15bbf43..03f59e1de 100644 ---- a/src/libgit2/sysdir.h -+++ b/src/libgit2/sysdir.h -@@ -134,10 +134,12 @@ extern int git_sysdir_set(git_sysdir_t which, const char *paths); - */ - extern int git_sysdir_reset(void); - -+#ifdef GIT_WIN32 - /** Sets the registry system dir to a mock; for testing. */ - extern int git_win32__set_registry_system_dir(const wchar_t *mock_sysdir); - - /** Find the given system dir; for testing. */ - extern int git_win32__find_system_dirs(git_str *out, const char *subdir); -+#endif - - #endif --- -2.39.2 - diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index baf43c66f744..4dd6519ca39b 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d557fbf35557bb5df53cbf38ae0081edb4a36494ec0d19741fa673e509245f8f libgit2-1.6.2.tar.gz +sha256 d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d libgit2-1.6.4.tar.gz sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index b31f5199e1c8..9ddf2374bbb7 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.6.2 +LIBGIT2_VERSION = 1.6.4 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From 5da710de97c33c3f06d1b27338ef67f44b1c55ad Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Thu, 4 May 2023 09:38:20 +0200 Subject: [PATCH 0353/2890] package/libostree: bump to version 2023.2 Signed-off-by: Marcus Folkesson Signed-off-by: Yann E. MORIN --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 63dfe98d80f4..db99b4b07b3f 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 libostree-2023.1.tar.xz +sha256 ceb0788755a0bff5738d44543552fbf883cf71df481baa3ca7288da7a402bb85 libostree-2023.2.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 4b17fcf391dd..367a833ac984 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2023.1 +LIBOSTREE_VERSION = 2023.2 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From acb748ce3e4cf7cb8fc4b132f7095aaceaea6b9a Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 23 Mar 2023 22:49:01 +0100 Subject: [PATCH 0354/2890] package/grep: bump version to 3.10 For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2023-03/msg00007.html Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/grep/grep.hash | 4 ++-- package/grep/grep.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/grep/grep.hash b/package/grep/grep.hash index c83e4653c3d1..142d15644de2 100644 --- a/package/grep/grep.hash +++ b/package/grep/grep.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -# https://ftp.gnu.org/gnu/grep/grep-3.9.tar.xz.sig +# https://ftp.gnu.org/gnu/grep/grep-3.10.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 abcd11409ee23d4caf35feb422e53bbac867014cfeed313bb5f488aca170b599 grep-3.9.tar.xz +sha256 24efa5b595fb5a7100879b51b8868a0bb87a71c183d02c4c602633b88af6855b grep-3.10.tar.xz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 309987010f72..2f3b405f93c8 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ################################################################################ -GREP_VERSION = 3.9 +GREP_VERSION = 3.10 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPL-3.0+ From b613beef33dac6a3118172fd4c23f32af54ee5ba Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 15 Mar 2023 10:07:42 +0100 Subject: [PATCH 0355/2890] package/lualdap: bump to version 1.3.1 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lualdap/lualdap.hash | 2 +- package/lualdap/lualdap.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lualdap/lualdap.hash b/package/lualdap/lualdap.hash index 15ca840f1fa7..97aa3b570e28 100644 --- a/package/lualdap/lualdap.hash +++ b/package/lualdap/lualdap.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 49c253f540187c61850c856b8e70e45dca904b81720a760f6a94e4eb474958ad lualdap-1.3.0-1.src.rock +sha256 c1772077ebfd02e082e89583701ef27dd348dc76ae015247f21a2756f5fac0ae lualdap-1.3.1-1.src.rock sha256 b9b75da18d1e1147ec47bff508ffdce831da07dc371891b9057cf1c422660af4 lualdap/docs/license.md diff --git a/package/lualdap/lualdap.mk b/package/lualdap/lualdap.mk index 5dfba8b7a413..375754180f3a 100644 --- a/package/lualdap/lualdap.mk +++ b/package/lualdap/lualdap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUALDAP_VERSION = 1.3.0-1 +LUALDAP_VERSION = 1.3.1-1 LUALDAP_SUBDIR = lualdap LUALDAP_LICENSE = MIT LUALDAP_LICENSE_FILES = $(LUALDAP_SUBDIR)/docs/license.md From 7d8da5965b9b9474e4bdbe1d41204e3a88c48e18 Mon Sep 17 00:00:00 2001 From: Nicolas Serafini Date: Mon, 20 Mar 2023 13:01:01 +0100 Subject: [PATCH 0356/2890] package/exiv2: bump version to 0.27.6 Updated the link to the sources on github, the previous link no longer exists. Release notes: https://github.com/Exiv2/exiv2/releases/tag/v0.27.6 Signed-off-by: Nicolas Serafini Signed-off-by: Yann E. MORIN --- package/exiv2/exiv2.hash | 2 +- package/exiv2/exiv2.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/exiv2/exiv2.hash b/package/exiv2/exiv2.hash index a405d2611bcf..c87127780100 100644 --- a/package/exiv2/exiv2.hash +++ b/package/exiv2/exiv2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 35a58618ab236a901ca4928b0ad8b31007ebdc0386d904409d825024e45ea6e2 exiv2-0.27.5-Source.tar.gz +sha256 4c192483a1125dc59a3d70b30d30d32edace9e14adf52802d2f853abf72db8a6 exiv2-0.27.6-Source.tar.gz sha256 a7ba75cb966aca374711e2af49e5f3aea6a4443a803440f5d93e73a5a1222f66 COPYING diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk index 2a91c71c8f99..869f8e48dd12 100644 --- a/package/exiv2/exiv2.mk +++ b/package/exiv2/exiv2.mk @@ -4,9 +4,9 @@ # ################################################################################ -EXIV2_VERSION = 0.27.5 +EXIV2_VERSION = 0.27.6 EXIV2_SOURCE = exiv2-$(EXIV2_VERSION)-Source.tar.gz -EXIV2_SITE = https://exiv2.org/builds +EXIV2_SITE = https://github.com/Exiv2/exiv2/releases/download/v$(EXIV2_VERSION) EXIV2_INSTALL_STAGING = YES EXIV2_LICENSE = GPL-2.0+ EXIV2_LICENSE_FILES = COPYING From 1e735c48372a40c0c838baf4946022545ed531f1 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 22 Mar 2023 17:24:45 +0100 Subject: [PATCH 0357/2890] package/libcurl: bump version to 8.0.1 For details see [1] and [2]. [1] https://curl.se/changes.html#8_0_0 [1] https://curl.se/changes.html#8_0_1 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 32b3d0b5e2b9..8a29e7b977ca 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-7.88.1.tar.xz.asc +# https://curl.se/download/curl-8.0.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz +sha256 0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0 curl-8.0.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index dd715c1bb672..a5313e686fe0 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.88.1 +LIBCURL_VERSION = 8.0.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From a3c50b74275149f03447f311927500c4c5a0d0f5 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Wed, 22 Mar 2023 18:37:07 +0100 Subject: [PATCH 0358/2890] package/cups-filters: bump to version 1.28.17 Update also the release url because the OpenPrinting https archive page is out of sync with the current release archive on the main github project. Signed-off-by: Angelo Compagnucci Signed-off-by: Yann E. MORIN --- package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index b910cdce134e..7fb3badf46dc 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0ca77bb820719a040ff003ecb478d0c2ceffc94e8bd1cd03ddb5a199444127ba cups-filters-1.28.16.tar.gz +sha256 01a2acbd6bb78f09638047e4e9ce305d7e5ef4cb9ed6949672b5d901b7321dd4 cups-filters-1.28.17.tar.gz sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 3250649e0763..19c859e60242 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,8 +4,8 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.28.16 -CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters +CUPS_FILTERS_VERSION = 1.28.17 +CUPS_FILTERS_SITE = https://github.com/OpenPrinting/cups-filters/releases/download/$(CUPS_FILTERS_VERSION) CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING CUPS_FILTERS_CPE_ID_VENDOR = linuxfoundation From 341c6a58cef152dd1a6ab7e3e6153eaf3186e811 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 23 Mar 2023 10:15:36 -0300 Subject: [PATCH 0359/2890] configs/mx53loco: bump U-Boot and kernel versions Bump to U-Boot 2023.01 and kernel 6.1.20 versions. Signed-off-by: Fabio Estevam Signed-off-by: Yann E. MORIN --- configs/mx53loco_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index 18785aa0c8d8..212a032d84aa 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx53loco" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.20" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb" From fde7eeea4c0049afbfe167ddb358f57e68e38a23 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 23 Mar 2023 22:47:27 +0100 Subject: [PATCH 0360/2890] package/mtools: bump version to 4.0.43 For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2023-03/msg00006.html Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index b81830a7d2d0..412d67a328bf 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 40a98fd9bcc865997866015013c3c64a304d98c2892fe4ab892ffd6ac3dd9bae mtools-4.0.42.tar.lz +sha256 997ffe4125a19de1fd433ed63f128f7d54bc1a5915f3cdb36da6491ef917f217 mtools-4.0.43.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 407ac1a2c6f8..96d8e43ea219 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.42 +MTOOLS_VERSION = 4.0.43 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ From 7b1a980465452af44636b06197abe1835da9ed9f Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 25 Mar 2023 19:19:58 +0100 Subject: [PATCH 0361/2890] package/libcurl: disable NTLM support definitely - do not only disable NTLM delegation to winbinds ntlm_auth but disable NTLM support overall (and drop enforced libopenssl DES dependency introduced by 'package/libcurl: make sure openssl supports DES' (commit f25c820a4f93ad0ca7eaf5e504667bd4099b878c) - change man page hint to https URL - rearrange configure options to one option per line Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libcurl/Config.in | 1 - package/libcurl/libcurl.mk | 21 ++++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index 218309ed56ff..adab1ca3e6d4 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -57,7 +57,6 @@ choice config BR2_PACKAGE_LIBCURL_OPENSSL bool "OpenSSL" depends on BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL config BR2_PACKAGE_LIBCURL_BEARSSL bool "BearSSL" diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a5313e686fe0..0f7ae640f64d 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -16,15 +16,22 @@ LIBCURL_CPE_ID_VENDOR = haxx LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES -# We disable NTLM support because it uses fork(), which doesn't work -# on non-MMU platforms. Moreover, this authentication method is -# probably almost never used. See -# http://curl.se/docs/manpage.html#--ntlm. +# We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') +# support because it uses fork(), which doesn't work on non-MMU platforms. +# Moreover, this authentication method is probably almost never used (see +# https://curl.se/docs/manpage.html#--ntlm), so disable NTLM support overall. +# # Likewise, there is no compiler on the target, so libcurl-option (to # generate C code) isn't very useful -LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \ - --with-random=/dev/urandom --disable-curldebug \ - --disable-libcurl-option --disable-ldap --disable-ldaps +LIBCURL_CONF_OPTS = \ + --disable-manual \ + --disable-ntlm \ + --disable-ntlm-wb \ + --with-random=/dev/urandom \ + --disable-curldebug \ + --disable-libcurl-option \ + --disable-ldap \ + --disable-ldaps ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBCURL_CONF_OPTS += --enable-threaded-resolver From 6d7e5e2b63d138ac902e21644256d9fcbae686ef Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Tue, 21 Mar 2023 07:01:20 +0100 Subject: [PATCH 0362/2890] package/atkmm: bump to version 2.36.2 Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/atkmm/atkmm.hash | 4 ++-- package/atkmm/atkmm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/atkmm/atkmm.hash b/package/atkmm/atkmm.hash index 9e2bb2830ca9..08cf86b3df9d 100644 --- a/package/atkmm/atkmm.hash +++ b/package/atkmm/atkmm.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.1.sha256sum -sha256 e11324bfed1b6e330a02db25cecc145dca03fb0dff47f0710c85e317687da458 atkmm-2.36.1.tar.xz +# From https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.2.sha256sum +sha256 6f62dd99f746985e573605937577ccfc944368f606a71ca46342d70e1cdae079 atkmm-2.36.2.tar.xz # locally computed sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 7ceb87b04706..8afd0586437b 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -5,7 +5,7 @@ ################################################################################ ATKMM_VERSION_MAJOR = 2.36 -ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).1 +ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).2 ATKMM_SOURCE = atkmm-$(ATKMM_VERSION).tar.xz ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) From f2a676dcfff886104e83170c274a2e97e9d32aba Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 29 Mar 2023 15:02:35 +0200 Subject: [PATCH 0363/2890] package/gptfdisk: fix another runtime failure with popt 1.19 Fix the following runtime failure raised since bump of popt to version 1.19 in commit 895bfba93f6e5535f2132aeea144d2cd87ebc71b: Segmentation fault (core dumped) Fix the issue by backporting a fix found in upstream git repository [0]. [0] https://sourceforge.net/p/gptfdisk/code/ci/f5de3401b974ce103ffd93af8f9d43505a04aaf9/ Signed-off-by: Stefan Agner Signed-off-by: Yann E. MORIN --- ...ence-when-duplicating-string-argumen.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch diff --git a/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch new file mode 100644 index 000000000000..1642343d0647 --- /dev/null +++ b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch @@ -0,0 +1,43 @@ +From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Damian Kurek +Date: Thu, 7 Jul 2022 03:39:16 +0000 +Subject: [PATCH] Fix NULL dereference when duplicating string argument + +poptGetArg can return NULL if there are no additional arguments, which +makes strdup dereference NULL on strlen + +Signed-off-by: Stefan Agner +--- + gptcl.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/gptcl.cc b/gptcl.cc +index 0d578eb..ab95239 100644 +--- a/gptcl.cc ++++ b/gptcl.cc +@@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + } // while + + // Assume first non-option argument is the device filename.... +- device = strdup((char*) poptGetArg(poptCon)); +- poptResetContext(poptCon); ++ device = (char*) poptGetArg(poptCon); + + if (device != NULL) { ++ device = strdup(device); ++ poptResetContext(poptCon); + JustLooking(); // reset as necessary + BeQuiet(); // Tell called functions to be less verbose & interactive + if (LoadPartitions((string) device)) { +@@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + cerr << "Error encountered; not saving changes.\n"; + retval = 4; + } // if ++ free(device); + } // if (device != NULL) + poptFreeContext(poptCon); + return retval; +-- +2.40.0 + From b4a82b0111ed67eacd91a2b9658e9b059444ab4a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 6 May 2023 17:09:53 +0200 Subject: [PATCH 0364/2890] package/gptfdisk: add upstrream tag info on new patch Signed-off-by: Yann E. MORIN --- ...03-Fix-NULL-dereference-when-duplicating-string-argumen.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch index 1642343d0647..250c0715823f 100644 --- a/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch +++ b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch @@ -8,6 +8,7 @@ poptGetArg can return NULL if there are no additional arguments, which makes strdup dereference NULL on strlen Signed-off-by: Stefan Agner +Upstream: https://sourceforge.net/p/gptfdisk/code/ci/f5de3401b974ce103ffd93af8f9d43505a04aaf9 --- gptcl.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) From f9c196598d58cecef769194df3c54466cf62459d Mon Sep 17 00:00:00 2001 From: Aaron Sierra Date: Wed, 29 Mar 2023 10:51:54 -0500 Subject: [PATCH 0365/2890] package/python-requests: bump to version 2.28.2 Get explicit compatibility with charset-normalizer 3.x Signed-off-by: Aaron Sierra Acked-by: Yann E. MORIN Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/python-requests/python-requests.hash | 4 ++-- package/python-requests/python-requests.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index 1383e680d52f..b6f696000b5a 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 796ea875cdae283529c03b9203d9c454 requests-2.28.1.tar.gz -sha256 7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 requests-2.28.1.tar.gz +md5 09b752e0b0a672d805ae54455c128d42 requests-2.28.2.tar.gz +sha256 98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf requests-2.28.2.tar.gz # Locally computed sha256 checksums sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 7a21cca52c35..8f9f4b2db4bd 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.28.1 +PYTHON_REQUESTS_VERSION = 2.28.2 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/a5/61/a867851fd5ab77277495a8709ddda0861b28163c4613b011bc00228cc724 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/9d/ee/391076f5937f0a8cdf5e53b701ffc91753e87b07d66bae4a09aa671897bf PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE From aee4f42ba07c603bbc7cf16b18f9706029ab5d74 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Fri, 5 May 2023 21:27:43 +0200 Subject: [PATCH 0366/2890] package/ncurses: security bump to 6.4.20230429 Update to 6.4 and use latest snapshot to fix CVE-2023-29491. COPYING has been changed in snapshot 20230107 to update the year [0]. Update CVE version to major.minor.snapshot, as NVD uses the snapshot date as patch version [1]. [0]: https://github.com/ThomasDickey/ncurses-snapshots/commit/eedb756850fdddcd2767d488ed5ea323d40b37ec [1]: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:gnu:ncurses Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/ncurses/ncurses.hash | 4 ++-- package/ncurses/ncurses.mk | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index c96bf77bce58..a5f83c8725d2 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 4057d800ee96623ae70d06b05b2dadb481a80c030e4968aa5d9bcea4439441da ncurses-6.3-20221224.tar.gz +sha256 004603a9b3ec51599ef0a0089482004ee3d33b0240d87ce17b6f77525b51fb4e ncurses-6.4-20230429.tar.gz # Locally computed -sha256 63de87399e9fc8860236082b6b0520e068e9eb1fad0ebd30202aa30bb6f690ac COPYING +sha256 0413b2f4ea863194c174673032f0fca84f1ea1ed4eed6476baea68c075a631ce COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 73e3c3feb855..4753da299c34 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -5,8 +5,8 @@ ################################################################################ # When there is no snapshost yet for a new version, set it to the empty string -NCURSES_VERSION_MAJOR = 6.3 -NCURSES_SNAPSHOT_DATE = 20221224 +NCURSES_VERSION_MAJOR = 6.4 +NCURSES_SNAPSHOT_DATE = 20230429 NCURSES_VERSION = $(NCURSES_VERSION_MAJOR)$(if $(NCURSES_SNAPSHOT_DATE),-$(NCURSES_SNAPSHOT_DATE)) NCURSES_VERSION_GIT = $(subst .,_,$(subst -,_,$(NCURSES_VERSION))) NCURSES_SITE = $(call github,ThomasDickey,ncurses-snapshots,v$(NCURSES_VERSION_GIT)) @@ -15,12 +15,9 @@ NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu -NCURSES_CPE_ID_VERSION = $(NCURSES_VERSION_MAJOR) +NCURSES_CPE_ID_VERSION = $(NCURSES_VERSION_MAJOR)$(if $(NCURSES_SNAPSHOT_DATE),.$(NCURSES_SNAPSHOT_DATE)) NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config -# Fixed since snapshot 20220416 -NCURSES_IGNORE_CVES += CVE-2022-29458 - NCURSES_CONF_OPTS = \ --without-cxx \ --without-cxx-binding \ From fd9278a6fc89dc2454ef7cc0b403b69c6e28c1b8 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 6 May 2023 00:30:25 +0200 Subject: [PATCH 0367/2890] package/libnss: bump version to 3.89.1 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 483320d95c24..63a35285d77c 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_89_RTM/src/SHA256SUMS -sha256 55c37a3f4da010d0574fb8b39264cb1e7b4ce9e6c2954c1c7ecf9f41ee00bed5 nss-3.89.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_89_1_RTM/src/SHA256SUMS +sha256 3adaedb9e70c3c5f40603bf60a01e336190a6dbe01929d395f16b01fe84a0156 nss-3.89.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 5daced718206..1253cc5d41a3 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.89 +LIBNSS_VERSION = 3.89.1 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From e1a5382182ea1a4d27dfed153a82050d3b53acce Mon Sep 17 00:00:00 2001 From: Uladzimir Bely Date: Sat, 6 May 2023 12:11:27 +0300 Subject: [PATCH 0368/2890] package/python-mpd2: bump to version 3.1.0 Signed-off-by: Uladzimir Bely Signed-off-by: Yann E. MORIN --- package/python-mpd2/python-mpd2.hash | 4 ++-- package/python-mpd2/python-mpd2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash index 88dcb2837751..cfe5a7c0c000 100644 --- a/package/python-mpd2/python-mpd2.hash +++ b/package/python-mpd2/python-mpd2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-mpd2/json -md5 594dff3e53c8eb6f583ba642bc2c1a27 python-mpd2-3.0.5.tar.gz -sha256 6f1bffd93b9a32fc018a9bbf3487505b52e0d757ec34066905c60a912d492384 python-mpd2-3.0.5.tar.gz +md5 f083c107b28525bb4c2580140861d86e python-mpd2-3.1.0.tar.gz +sha256 f33c2cdb0d6baa74a36724f38c1c4a099a7ce2c8ec4a2bb7192150a5855df476 python-mpd2-3.1.0.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk index bfe382b59e09..124ff57db02e 100644 --- a/package/python-mpd2/python-mpd2.mk +++ b/package/python-mpd2/python-mpd2.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_MPD2_VERSION = 3.0.5 -PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ed/c2/263621bdbbc37fa1a55fa1a7f66fd601bf08b3f87481e318a3509fb6c4bf +PYTHON_MPD2_VERSION = 3.1.0 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/59/32/e57725251ce3117d2ed2a7b76d9722ea9bea26f54b2cc8981d03350e4103 PYTHON_MPD2_SETUP_TYPE = setuptools PYTHON_MPD2_LICENSE = LGPL-3.0+ PYTHON_MPD2_LICENSE_FILES = LICENSE.txt From 3d1ee7d624b71009ff61d4fa5ed860c52eb89b47 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 15:47:44 +0200 Subject: [PATCH 0369/2890] package/flatbuffers: bump version to 23.3.3 Changelog: https://github.com/google/flatbuffers/blob/master/CHANGELOG.md Follow upstream rename of license file: https://github.com/google/flatbuffers/commit/7fb785fd898a5379944457a399176235fc80d337 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/flatbuffers/flatbuffers.hash | 4 ++-- package/flatbuffers/flatbuffers.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/flatbuffers/flatbuffers.hash b/package/flatbuffers/flatbuffers.hash index 6382b86f1b60..2ff56a8b7657 100644 --- a/package/flatbuffers/flatbuffers.hash +++ b/package/flatbuffers/flatbuffers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f97965a727d26386afaefff950badef2db3ab6af9afe23ed6d94bfb65f95f37e flatbuffers-2.0.8.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 8aff985da30aaab37edf8e5b02fda33ed4cbdd962699a8e2af98fdef306f4e4d flatbuffers-23.3.3.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk index 487d85ee1f17..58c0414533ad 100644 --- a/package/flatbuffers/flatbuffers.mk +++ b/package/flatbuffers/flatbuffers.mk @@ -4,10 +4,10 @@ # ################################################################################ -FLATBUFFERS_VERSION = 2.0.8 +FLATBUFFERS_VERSION = 23.3.3 FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) FLATBUFFERS_LICENSE = Apache-2.0 -FLATBUFFERS_LICENSE_FILES = LICENSE.txt +FLATBUFFERS_LICENSE_FILES = LICENSE FLATBUFFERS_CPE_ID_VENDOR = google FLATBUFFERS_INSTALL_STAGING = YES FLATBUFFERS_DEPENDENCIES = host-flatbuffers From a85f4b53466c609bb121e2a021b643283e1849c6 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 5 May 2023 12:08:10 +0200 Subject: [PATCH 0370/2890] package/coreutils: change/remove some of the configure environmental variables - remove ac_cv_func_euidaccess=no (no longer used) - rename ac_cv_func_lstat_dereferences_slashed_symlink=yes to gl_cv_func_lstat_dereferences_slashed_symlink=yes - remove ac_cv_func_lstat_empty_string_bug=no (no longer used) - remove ac_cv_func_strtod=yes (no longer used) - remove ac_cv_func_working_mktime=yes (no longer used) - remove gl_cv_func_gettimeofday_clobber=no (no longer used) - remove gl_cv_func_tzset_clobber=no (no longer used) - remove gl_getline_needs_run_time_check=no (no longer used) Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/coreutils/coreutils.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index cf42a8aff890..e9cb7b67cbf1 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -22,18 +22,13 @@ endif COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ ac_cv_func_chown_works=yes \ - ac_cv_func_euidaccess=no \ ac_cv_func_fstatat=yes \ ac_cv_func_getdelim=yes \ ac_cv_func_getgroups=yes \ ac_cv_func_getgroups_works=yes \ ac_cv_func_getloadavg=no \ - ac_cv_func_lstat_dereferences_slashed_symlink=yes \ - ac_cv_func_lstat_empty_string_bug=no \ ac_cv_func_strerror_r_char_p=no \ ac_cv_func_strnlen_working=yes \ - ac_cv_func_strtod=yes \ - ac_cv_func_working_mktime=yes \ ac_cv_have_decl_strerror_r=yes \ ac_cv_have_decl_strnlen=yes \ ac_cv_lib_getloadavg_getloadavg=no \ @@ -44,15 +39,13 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ fu_cv_sys_stat_statfs2_bsize=yes \ gl_cv_func_getcwd_null=yes \ gl_cv_func_getcwd_path_max=yes \ - gl_cv_func_gettimeofday_clobber=no \ gl_cv_func_link_follows_symlink=no \ + gl_cv_func_lstat_dereferences_slashed_symlink=yes \ gl_cv_func_re_compile_pattern_working=yes \ gl_cv_func_svid_putenv=yes \ - gl_cv_func_tzset_clobber=no \ gl_cv_func_working_mkstemp=yes \ gl_cv_func_working_utimes=yes \ gl_cv_macro_MB_CUR_MAX_good=yes \ - gl_getline_needs_run_time_check=no \ gl_cv_have_proc_uptime=yes \ utils_cv_localtime_cache=no \ PERL=missing \ From 87c2f04e7cd453d2e2f2752e812a7324f9963775 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 5 May 2023 07:13:10 +0300 Subject: [PATCH 0371/2890] package/libpcap: bump to version 1.10.4 Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- package/libpcap/libpcap.hash | 4 ++-- package/libpcap/libpcap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash index 270fd8869dac..34339c126196 100644 --- a/package/libpcap/libpcap.hash +++ b/package/libpcap/libpcap.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz.sig -sha256 2a8885c403516cf7b0933ed4b14d6caa30e02052489ebd414dc75ac52e7559e6 libpcap-1.10.3.tar.gz +# https://www.tcpdump.org/release/libpcap-1.10.4.tar.gz.sig +sha256 ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f libpcap-1.10.4.tar.gz # Hash for license file: sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index d4292ae9a3fb..a4523f22182b 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPCAP_VERSION = 1.10.3 +LIBPCAP_VERSION = 1.10.4 LIBPCAP_SITE = https://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE From a27cb09d9aaa4f6f1056c520f8d0c48912451734 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 3 May 2023 20:58:32 +0200 Subject: [PATCH 0372/2890] package/gnupg2: bump version to 2.4.1 For details see [1]. [1] https://lists.gnupg.org/pipermail/gnupg-announce/2023q2/000478.html Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gnupg2/gnupg2.hash | 8 ++++---- package/gnupg2/gnupg2.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index c642862fe2fd..baee8241045f 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html -sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2023q2/000478.html +sha1 d7d021101361a5e1166a6c0cc1731276e7134547 gnupg-2.4.1.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.1.tar.bz2.sig # using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 +sha256 76b71e5aeb443bfd910ce9cbc8281b617c8341687afb67bae455877972b59de8 gnupg-2.4.1.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 73de185ba7c1..f7c7ae847c16 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.0 +GNUPG2_VERSION = 2.4.1 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From b0306d94b29d6f5e08735db0448019f9f4e4234b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 3 May 2023 21:02:07 +0200 Subject: [PATCH 0373/2890] package/cpio: bump version to 2.14 - remove 0001-Minor-fix.patch (from upstream, see [1]) - remove 0002-Rewrite-dynamic-string-support.patch (from upstream, see [2]) - remove 0003-Fix-previous-commit.patch (from upstream, see [3]) For details see [4]. [1] https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=641d3f489cf6238bb916368d4ba0d9325a235afb [2] https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=dd96882877721703e19272fe25034560b794061b [3] https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=dfc801c44a93bed7b3951905b188823d6a0432c8 [4] https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00001.html Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/cpio/0001-Minor-fix.patch | 30 -- .../0002-Rewrite-dynamic-string-support.patch | 461 ------------------ package/cpio/0003-Fix-previous-commit.patch | 40 -- package/cpio/cpio.hash | 7 +- package/cpio/cpio.mk | 2 +- 5 files changed, 4 insertions(+), 536 deletions(-) delete mode 100644 package/cpio/0001-Minor-fix.patch delete mode 100644 package/cpio/0002-Rewrite-dynamic-string-support.patch delete mode 100644 package/cpio/0003-Fix-previous-commit.patch diff --git a/package/cpio/0001-Minor-fix.patch b/package/cpio/0001-Minor-fix.patch deleted file mode 100644 index 429df7d5f823..000000000000 --- a/package/cpio/0001-Minor-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 641d3f489cf6238bb916368d4ba0d9325a235afb Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Mon, 20 Jan 2020 07:45:39 +0200 -Subject: Minor fix * src/global.c: Remove superfluous declaration of - program_name - -[Retrieved from: -https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=641d3f489cf6238bb916368d4ba0d9325a235afb] -Signed-off-by: Fabrice Fontaine ---- - src/global.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/global.c b/src/global.c -index fb3abe9..acf92bc 100644 ---- a/src/global.c -+++ b/src/global.c -@@ -184,9 +184,6 @@ unsigned int warn_option = 0; - /* Extract to standard output? */ - bool to_stdout_option = false; - --/* The name this program was run with. */ --char *program_name; -- - /* A pointer to either lstat or stat, depending on whether - dereferencing of symlinks is done for input files. */ - int (*xstat) (); --- -cgit v1.2.1 - diff --git a/package/cpio/0002-Rewrite-dynamic-string-support.patch b/package/cpio/0002-Rewrite-dynamic-string-support.patch deleted file mode 100644 index 44282ae3f118..000000000000 --- a/package/cpio/0002-Rewrite-dynamic-string-support.patch +++ /dev/null @@ -1,461 +0,0 @@ -From dd96882877721703e19272fe25034560b794061b Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Sat, 7 Aug 2021 12:52:21 +0300 -Subject: Rewrite dynamic string support. - -* src/dstring.c (ds_init): Take a single argument. -(ds_free): New function. -(ds_resize): Take a single argument. Use x2nrealloc to expand -the storage. -(ds_reset,ds_append,ds_concat,ds_endswith): New function. -(ds_fgetstr): Rewrite. In particular, this fixes integer overflow. -* src/dstring.h (dynamic_string): Keep both the allocated length -(ds_size) and index of the next free byte in the string (ds_idx). -(ds_init,ds_resize): Change signature. -(ds_len): New macro. -(ds_free,ds_reset,ds_append,ds_concat,ds_endswith): New protos. -* src/copyin.c: Use new ds_ functions. -* src/copyout.c: Likewise. -* src/copypass.c: Likewise. -* src/util.c: Likewise. - -[Retrieved from: -https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=dd96882877721703e19272fe25034560b794061b] -Signed-off-by: Fabrice Fontaine ---- - src/copyin.c | 40 +++++++++++++------------- - src/copyout.c | 16 ++++------- - src/copypass.c | 34 +++++++++++------------ - src/dstring.c | 88 ++++++++++++++++++++++++++++++++++++++++++---------------- - src/dstring.h | 31 ++++++++++----------- - src/util.c | 6 ++-- - 6 files changed, 123 insertions(+), 92 deletions(-) - -diff --git a/src/copyin.c b/src/copyin.c -index a096048..4fb14af 100644 ---- a/src/copyin.c -+++ b/src/copyin.c -@@ -55,11 +55,12 @@ query_rename(struct cpio_file_stat* file_hdr, FILE *tty_in, FILE *tty_out, - char *str_res; /* Result for string function. */ - static dynamic_string new_name; /* New file name for rename option. */ - static int initialized_new_name = false; -+ - if (!initialized_new_name) -- { -- ds_init (&new_name, 128); -- initialized_new_name = true; -- } -+ { -+ ds_init (&new_name); -+ initialized_new_name = true; -+ } - - if (rename_flag) - { -@@ -780,37 +781,36 @@ long_format (struct cpio_file_stat *file_hdr, char const *link_name) - already in `save_patterns' (from the command line) are preserved. */ - - static void --read_pattern_file () -+read_pattern_file (void) - { -- int max_new_patterns; -- char **new_save_patterns; -- int new_num_patterns; -+ char **new_save_patterns = NULL; -+ size_t max_new_patterns; -+ size_t new_num_patterns; - int i; -- dynamic_string pattern_name; -+ dynamic_string pattern_name = DYNAMIC_STRING_INITIALIZER; - FILE *pattern_fp; - - if (num_patterns < 0) - num_patterns = 0; -- max_new_patterns = 1 + num_patterns; -- new_save_patterns = (char **) xmalloc (max_new_patterns * sizeof (char *)); - new_num_patterns = num_patterns; -- ds_init (&pattern_name, 128); -+ max_new_patterns = num_patterns; -+ new_save_patterns = xcalloc (max_new_patterns, sizeof (new_save_patterns[0])); - - pattern_fp = fopen (pattern_file_name, "r"); - if (pattern_fp == NULL) - open_fatal (pattern_file_name); - while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL) - { -- if (new_num_patterns >= max_new_patterns) -- { -- max_new_patterns += 1; -- new_save_patterns = (char **) -- xrealloc ((char *) new_save_patterns, -- max_new_patterns * sizeof (char *)); -- } -+ if (new_num_patterns == max_new_patterns) -+ new_save_patterns = x2nrealloc (new_save_patterns, -+ &max_new_patterns, -+ sizeof (new_save_patterns[0])); - new_save_patterns[new_num_patterns] = xstrdup (pattern_name.ds_string); - ++new_num_patterns; - } -+ -+ ds_free (&pattern_name); -+ - if (ferror (pattern_fp) || fclose (pattern_fp) == EOF) - close_error (pattern_file_name); - -@@ -1210,7 +1210,7 @@ swab_array (char *ptr, int count) - in the file system. */ - - void --process_copy_in () -+process_copy_in (void) - { - FILE *tty_in = NULL; /* Interactive file for rename option. */ - FILE *tty_out = NULL; /* Interactive file for rename option. */ -diff --git a/src/copyout.c b/src/copyout.c -index 5ca587f..ca6798c 100644 ---- a/src/copyout.c -+++ b/src/copyout.c -@@ -594,9 +594,10 @@ assign_string (char **pvar, char *value) - The format of the header depends on the compatibility (-c) flag. */ - - void --process_copy_out () -+process_copy_out (void) - { -- dynamic_string input_name; /* Name of file read from stdin. */ -+ dynamic_string input_name = DYNAMIC_STRING_INITIALIZER; -+ /* Name of file read from stdin. */ - struct stat file_stat; /* Stat record for file. */ - struct cpio_file_stat file_hdr = CPIO_FILE_STAT_INITIALIZER; - /* Output header information. */ -@@ -605,7 +606,6 @@ process_copy_out () - char *orig_file_name = NULL; - - /* Initialize the copy out. */ -- ds_init (&input_name, 128); - file_hdr.c_magic = 070707; - - /* Check whether the output file might be a tape. */ -@@ -657,14 +657,9 @@ process_copy_out () - { - if (file_hdr.c_mode & CP_IFDIR) - { -- int len = strlen (input_name.ds_string); - /* Make sure the name ends with a slash */ -- if (input_name.ds_string[len-1] != '/') -- { -- ds_resize (&input_name, len + 2); -- input_name.ds_string[len] = '/'; -- input_name.ds_string[len+1] = 0; -- } -+ if (!ds_endswith (&input_name, '/')) -+ ds_append (&input_name, '/'); - } - } - -@@ -875,6 +870,7 @@ process_copy_out () - (unsigned long) blocks), (unsigned long) blocks); - } - cpio_file_stat_free (&file_hdr); -+ ds_free (&input_name); - } - - -diff --git a/src/copypass.c b/src/copypass.c -index 5d5e939..23ee687 100644 ---- a/src/copypass.c -+++ b/src/copypass.c -@@ -48,10 +48,12 @@ set_copypass_perms (int fd, const char *name, struct stat *st) - If `link_flag', link instead of copying. */ - - void --process_copy_pass () -+process_copy_pass (void) - { -- dynamic_string input_name; /* Name of file from stdin. */ -- dynamic_string output_name; /* Name of new file. */ -+ dynamic_string input_name = DYNAMIC_STRING_INITIALIZER; -+ /* Name of file from stdin. */ -+ dynamic_string output_name = DYNAMIC_STRING_INITIALIZER; -+ /* Name of new file. */ - size_t dirname_len; /* Length of `directory_name'. */ - int res; /* Result of functions. */ - char *slash; /* For moving past slashes in input name. */ -@@ -65,25 +67,18 @@ process_copy_pass () - created files */ - - /* Initialize the copy pass. */ -- ds_init (&input_name, 128); - - dirname_len = strlen (directory_name); - if (change_directory_option && !ISSLASH (directory_name[0])) - { - char *pwd = xgetcwd (); -- -- dirname_len += strlen (pwd) + 1; -- ds_init (&output_name, dirname_len + 2); -- strcpy (output_name.ds_string, pwd); -- strcat (output_name.ds_string, "/"); -- strcat (output_name.ds_string, directory_name); -+ -+ ds_concat (&output_name, pwd); -+ ds_append (&output_name, '/'); - } -- else -- { -- ds_init (&output_name, dirname_len + 2); -- strcpy (output_name.ds_string, directory_name); -- } -- output_name.ds_string[dirname_len] = '/'; -+ ds_concat (&output_name, directory_name); -+ ds_append (&output_name, '/'); -+ dirname_len = ds_len (&output_name); - output_is_seekable = true; - - change_dir (); -@@ -116,8 +111,8 @@ process_copy_pass () - /* Make the name of the new file. */ - for (slash = input_name.ds_string; *slash == '/'; ++slash) - ; -- ds_resize (&output_name, dirname_len + strlen (slash) + 2); -- strcpy (output_name.ds_string + dirname_len + 1, slash); -+ ds_reset (&output_name, dirname_len); -+ ds_concat (&output_name, slash); - - existing_dir = false; - if (lstat (output_name.ds_string, &out_file_stat) == 0) -@@ -333,6 +328,9 @@ process_copy_pass () - (unsigned long) blocks), - (unsigned long) blocks); - } -+ -+ ds_free (&input_name); -+ ds_free (&output_name); - } - - /* Try and create a hard link from FILE_NAME to another file -diff --git a/src/dstring.c b/src/dstring.c -index b261d5a..692d3e7 100644 ---- a/src/dstring.c -+++ b/src/dstring.c -@@ -20,8 +20,8 @@ - #if defined(HAVE_CONFIG_H) - # include - #endif -- - #include -+#include - #if defined(HAVE_STRING_H) || defined(STDC_HEADERS) - #include - #else -@@ -33,24 +33,41 @@ - /* Initialiaze dynamic string STRING with space for SIZE characters. */ - - void --ds_init (dynamic_string *string, int size) -+ds_init (dynamic_string *string) -+{ -+ memset (string, 0, sizeof *string); -+} -+ -+/* Free the dynamic string storage. */ -+ -+void -+ds_free (dynamic_string *string) - { -- string->ds_length = size; -- string->ds_string = (char *) xmalloc (size); -+ free (string->ds_string); - } - --/* Expand dynamic string STRING, if necessary, to hold SIZE characters. */ -+/* Expand dynamic string STRING, if necessary. */ - - void --ds_resize (dynamic_string *string, int size) -+ds_resize (dynamic_string *string) - { -- if (size > string->ds_length) -+ if (string->ds_idx == string->ds_size) - { -- string->ds_length = size; -- string->ds_string = (char *) xrealloc ((char *) string->ds_string, size); -+ string->ds_string = x2nrealloc (string->ds_string, &string->ds_size, -+ 1); - } - } - -+/* Reset the index of the dynamic string S to LEN. */ -+ -+void -+ds_reset (dynamic_string *s, size_t len) -+{ -+ while (len > s->ds_size) -+ ds_resize (s); -+ s->ds_idx = len; -+} -+ - /* Dynamic string S gets a string terminated by the EOS character - (which is removed) from file F. S will increase - in size during the function if the string from F is longer than -@@ -61,34 +78,50 @@ ds_resize (dynamic_string *string, int size) - char * - ds_fgetstr (FILE *f, dynamic_string *s, char eos) - { -- int insize; /* Amount needed for line. */ -- int strsize; /* Amount allocated for S. */ - int next_ch; - - /* Initialize. */ -- insize = 0; -- strsize = s->ds_length; -+ s->ds_idx = 0; - - /* Read the input string. */ -- next_ch = getc (f); -- while (next_ch != eos && next_ch != EOF) -+ while ((next_ch = getc (f)) != eos && next_ch != EOF) - { -- if (insize >= strsize - 1) -- { -- ds_resize (s, strsize * 2 + 2); -- strsize = s->ds_length; -- } -- s->ds_string[insize++] = next_ch; -- next_ch = getc (f); -+ ds_resize (s); -+ s->ds_string[s->ds_idx++] = next_ch; - } -- s->ds_string[insize++] = '\0'; -+ ds_resize (s); -+ s->ds_string[s->ds_idx] = '\0'; - -- if (insize == 1 && next_ch == EOF) -+ if (s->ds_idx == 0 && next_ch == EOF) - return NULL; - else - return s->ds_string; - } - -+void -+ds_append (dynamic_string *s, int c) -+{ -+ ds_resize (s); -+ s->ds_string[s->ds_idx] = c; -+ if (c) -+ { -+ s->ds_idx++; -+ ds_resize (s); -+ s->ds_string[s->ds_idx] = 0; -+ } -+} -+ -+void -+ds_concat (dynamic_string *s, char const *str) -+{ -+ size_t len = strlen (str); -+ while (len + 1 > s->ds_size) -+ ds_resize (s); -+ memcpy (s->ds_string + s->ds_idx, str, len); -+ s->ds_idx += len; -+ s->ds_string[s->ds_idx] = 0; -+} -+ - char * - ds_fgets (FILE *f, dynamic_string *s) - { -@@ -100,3 +133,10 @@ ds_fgetname (FILE *f, dynamic_string *s) - { - return ds_fgetstr (f, s, '\0'); - } -+ -+/* Return true if the dynamic string S ends with character C. */ -+int -+ds_endswith (dynamic_string *s, int c) -+{ -+ return (s->ds_idx > 0 && s->ds_string[s->ds_idx - 1] == c); -+} -diff --git a/src/dstring.h b/src/dstring.h -index 5d24181..ca7a5f1 100644 ---- a/src/dstring.h -+++ b/src/dstring.h -@@ -17,10 +17,6 @@ - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. */ - --#ifndef NULL --#define NULL 0 --#endif -- - /* A dynamic string consists of record that records the size of an - allocated string and the pointer to that string. The actual string - is a normal zero byte terminated string that can be used with the -@@ -30,22 +26,25 @@ - - typedef struct - { -- int ds_length; /* Actual amount of storage allocated. */ -- char *ds_string; /* String. */ -+ size_t ds_size; /* Actual amount of storage allocated. */ -+ size_t ds_idx; /* Index of the next free byte in the string. */ -+ char *ds_string; /* String storage. */ - } dynamic_string; - -+#define DYNAMIC_STRING_INITIALIZER { 0, 0, NULL } - --/* Macros that look similar to the original string functions. -- WARNING: These macros work only on pointers to dynamic string records. -- If used with a real record, an "&" must be used to get the pointer. */ --#define ds_strlen(s) strlen ((s)->ds_string) --#define ds_strcmp(s1, s2) strcmp ((s1)->ds_string, (s2)->ds_string) --#define ds_strncmp(s1, s2, n) strncmp ((s1)->ds_string, (s2)->ds_string, n) --#define ds_index(s, c) index ((s)->ds_string, c) --#define ds_rindex(s, c) rindex ((s)->ds_string, c) -+void ds_init (dynamic_string *string); -+void ds_free (dynamic_string *string); -+void ds_reset (dynamic_string *s, size_t len); - --void ds_init (dynamic_string *string, int size); --void ds_resize (dynamic_string *string, int size); -+/* All functions below guarantee that s->ds_string[s->ds_idx] == '\0' */ - char *ds_fgetname (FILE *f, dynamic_string *s); - char *ds_fgets (FILE *f, dynamic_string *s); - char *ds_fgetstr (FILE *f, dynamic_string *s, char eos); -+void ds_append (dynamic_string *s, int c); -+void ds_concat (dynamic_string *s, char const *str); -+ -+#define ds_len(s) ((s)->ds_idx) -+ -+int ds_endswith (dynamic_string *s, int c); -+ -diff --git a/src/util.c b/src/util.c -index 996d4fa..ff2746d 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -846,11 +846,9 @@ get_next_reel (int tape_des) - FILE *tty_out; /* File for interacting with user. */ - int old_tape_des; - char *next_archive_name; -- dynamic_string new_name; -+ dynamic_string new_name = DYNAMIC_STRING_INITIALIZER; - char *str_res; - -- ds_init (&new_name, 128); -- - /* Open files for interactive communication. */ - tty_in = fopen (TTY_NAME, "r"); - if (tty_in == NULL) -@@ -925,7 +923,7 @@ get_next_reel (int tape_des) - error (PAXEXIT_FAILURE, 0, _("internal error: tape descriptor changed from %d to %d"), - old_tape_des, tape_des); - -- free (new_name.ds_string); -+ ds_free (&new_name); - fclose (tty_in); - fclose (tty_out); - } --- -cgit v1.2.1 - diff --git a/package/cpio/0003-Fix-previous-commit.patch b/package/cpio/0003-Fix-previous-commit.patch deleted file mode 100644 index e33a8523d86a..000000000000 --- a/package/cpio/0003-Fix-previous-commit.patch +++ /dev/null @@ -1,40 +0,0 @@ -From dfc801c44a93bed7b3951905b188823d6a0432c8 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Wed, 11 Aug 2021 18:10:38 +0300 -Subject: Fix previous commit - -* src/dstring.c (ds_reset,ds_concat): Don't call ds_resize in a -loop. - -[Retrieved from: -https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=dfc801c44a93bed7b3951905b188823d6a0432c8] -Signed-off-by: Fabrice Fontaine ---- - src/dstring.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/dstring.c b/src/dstring.c -index 692d3e7..b7e0bb5 100644 ---- a/src/dstring.c -+++ b/src/dstring.c -@@ -64,7 +64,7 @@ void - ds_reset (dynamic_string *s, size_t len) - { - while (len > s->ds_size) -- ds_resize (s); -+ s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1); - s->ds_idx = len; - } - -@@ -116,7 +116,7 @@ ds_concat (dynamic_string *s, char const *str) - { - size_t len = strlen (str); - while (len + 1 > s->ds_size) -- ds_resize (s); -+ s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1); - memcpy (s->ds_string + s->ds_idx, str, len); - s->ds_idx += len; - s->ds_string[s->ds_idx] = 0; --- -cgit v1.2.1 - diff --git a/package/cpio/cpio.hash b/package/cpio/cpio.hash index b03114635ccc..20fd9392e7c9 100644 --- a/package/cpio/cpio.hash +++ b/package/cpio/cpio.hash @@ -1,7 +1,6 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2019-11/msg00002.html -md5 f3438e672e3fa273a7dc26339dd1eed6 cpio-2.13.tar.bz2 -sha1 4dcefc0e1bc36b11506a354768d82b15e3fe6bb8 cpio-2.13.tar.bz2 +# From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00001.html +sha1 cbac50a61079b6f3bdcf9ffe42171d9257cfe877 cpio-2.14.tar.bz2 # Locally calculated after checking pgp signature -sha256 eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d cpio-2.13.tar.bz2 +sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.13.tar.bz2 # Locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/cpio/cpio.mk b/package/cpio/cpio.mk index e95ea742b33d..19224000bb21 100644 --- a/package/cpio/cpio.mk +++ b/package/cpio/cpio.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPIO_VERSION = 2.13 +CPIO_VERSION = 2.14 CPIO_SOURCE = cpio-$(CPIO_VERSION).tar.bz2 CPIO_SITE = $(BR2_GNU_MIRROR)/cpio CPIO_CONF_OPTS = --bindir=/bin From 341dfc305bd59c2172849fa6d481878330209941 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 May 2023 16:52:34 -0700 Subject: [PATCH 0374/2890] package/docker-engine: bump version to 23.0.5 https://github.com/moby/moby/releases/tag/v23.0.5 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 0dc974ce85f3..092ec989cf5c 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2f74aef0eadf5bfe652b1822f1349fa0baf7412f83b856a9cfb9a8fbfd686880 docker-engine-23.0.3.tar.gz +sha256 f502eba135828ae52cefb12f1c74092c8865e39cb94f5daed0f3f6717a8d50a3 docker-engine-23.0.5.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index c0f2c73b69bc..f904793aa2f6 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 23.0.3 +DOCKER_ENGINE_VERSION = 23.0.5 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From f32e9809c0ac86bf13eb3d79f3c41cf197cfd50f Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 May 2023 16:52:35 -0700 Subject: [PATCH 0375/2890] package/docker-cli: bump version to 23.0.5 https://github.com/moby/moby/releases/tag/v23.0.5 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 891ccf4b4e75..e9e9a18cb1ce 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7d67500372b560110e8200815f7111962ccec7d0eb3b743f80e262c38e2f7b82 docker-cli-23.0.3.tar.gz +sha256 2d6599783d447ac56d4caa482e9d8f09ad9e6f91ba2be6707bc107be04f89ddd docker-cli-23.0.5.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 69c4f76ee69c..522971ac9879 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 23.0.3 +DOCKER_CLI_VERSION = 23.0.5 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From c24012ad86d753f376e01fbaf1ea72cb5975365f Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 May 2023 17:04:03 -0700 Subject: [PATCH 0376/2890] package/runc: bump version to 1.1.7 This is the last planned release of the 1.1.x series. https://github.com/opencontainers/runc/releases/tag/v1.1.7 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index eee2e34cbf7c..1a68b74ccb64 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 76cbf30637cbb828794d72d32fb3fd6ff3139cd9743b8b44790fd110f43d96b2 runc-1.1.5.tar.gz +sha256 f1885d6dfa188f8112328ac2355e5d67346174a2e2e795ec514a972bcbfcc2fa runc-1.1.7.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 9c6b5f9b37de..805ff23964f5 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.1.5 +RUNC_VERSION = 1.1.7 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE From f3bb3797af6247398850c56247d1dd724cfe5539 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 May 2023 17:24:04 -0700 Subject: [PATCH 0377/2890] package/delve: bump to version 1.20.2 https://github.com/go-delve/delve/releases/tag/v1.20.2 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/delve/delve.hash | 2 +- package/delve/delve.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/delve/delve.hash b/package/delve/delve.hash index bf730b9047ef..105249f7f9e5 100644 --- a/package/delve/delve.hash +++ b/package/delve/delve.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 39d2e3ae965abf5e71f3d8efbef368b1ee1d7154ea6604ec71d508350d419d03 delve-1.20.0.tar.gz +sha256 58ad7a7fb42ae2ddd33e7d52dad688b249ca8a358eb73b9e48f91eda79e862a8 delve-1.20.2.tar.gz sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/package/delve/delve.mk b/package/delve/delve.mk index b43d0f03c83a..f261d240b229 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -4,7 +4,7 @@ # ################################################################################ -DELVE_VERSION = 1.20.0 +DELVE_VERSION = 1.20.2 DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) DELVE_LICENSE = MIT DELVE_LICENSE_FILES = LICENSE From e5fbe807f3ca01881d8a8c0944fc18634a74a047 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 May 2023 17:25:06 -0700 Subject: [PATCH 0378/2890] package/docker-compose: bump version to 2.17.3 https://github.com/docker/compose/releases/tag/v2.17.3 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 2c924d5080aa..4fe6d7313933 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 346571ca487bf3f4b3dc9caeadc88a645354b0e098fa60f350249ec35ab3f240 docker-compose-2.15.1.tar.gz +sha256 3a777f6442db77447919cc7006d8b9439c95cc61c04acad4039e0120a8e591ea docker-compose-2.17.3.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 3bced8bb7b33..09f611e18522 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.15.1 +DOCKER_COMPOSE_VERSION = 2.17.3 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From f32ef0be878e8a2db8e3077a85fc54f14adf7870 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 4 May 2023 00:22:26 -0700 Subject: [PATCH 0379/2890] package/fuse-overlayfs: bump version to 1.11 https://github.com/containers/fuse-overlayfs/releases/tag/v1.11 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/fuse-overlayfs/fuse-overlayfs.hash | 2 +- package/fuse-overlayfs/fuse-overlayfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fuse-overlayfs/fuse-overlayfs.hash b/package/fuse-overlayfs/fuse-overlayfs.hash index aa5438755e61..b8df6c88a590 100644 --- a/package/fuse-overlayfs/fuse-overlayfs.hash +++ b/package/fuse-overlayfs/fuse-overlayfs.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 4351eaed7cf26a5012c14c6e0fc883ef65a7b5dcc95ba129ce485904106c25a9 fuse-overlayfs-1.10.tar.gz +sha256 320a411425414679736dcb7f3b05146430ca4af20ded0096c69ac3c7540ebca2 fuse-overlayfs-1.11.tar.gz # Locally computed sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/fuse-overlayfs/fuse-overlayfs.mk b/package/fuse-overlayfs/fuse-overlayfs.mk index 1633d3bd41a6..4db2ccd7d549 100644 --- a/package/fuse-overlayfs/fuse-overlayfs.mk +++ b/package/fuse-overlayfs/fuse-overlayfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -FUSE_OVERLAYFS_VERSION = 1.10 +FUSE_OVERLAYFS_VERSION = 1.11 FUSE_OVERLAYFS_SITE = $(call github,containers,fuse-overlayfs,v$(FUSE_OVERLAYFS_VERSION)) FUSE_OVERLAYFS_LICENSE = GPL-3.0 FUSE_OVERLAYFS_LICENSE_FILES = COPYING From f292d9b736ad396f6013566da9c1d8273f421e47 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 4 May 2023 00:26:44 -0700 Subject: [PATCH 0380/2890] package/gocryptfs: bump version to 2.3.2 Drop patch merged upstream fixing jacobsa-crypto on riscv. https://github.com/rfjakob/gocryptfs/releases/tag/v2.3.2 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- ...-fix-jacobsa-crypto-build-on-riscv64.patch | 186 ------------------ package/gocryptfs/gocryptfs.hash | 2 +- package/gocryptfs/gocryptfs.mk | 2 +- 3 files changed, 2 insertions(+), 188 deletions(-) delete mode 100644 package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch diff --git a/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch b/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch deleted file mode 100644 index 0074932fbad3..000000000000 --- a/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch +++ /dev/null @@ -1,186 +0,0 @@ -From e72d34ef2c87e5c9ffd49c98b651641f48d89c24 Mon Sep 17 00:00:00 2001 -From: Christian Stewart -Date: Sat, 25 Jun 2022 14:57:38 -0700 -Subject: [PATCH] go.mod: fix jacobsa/crypto build on riscv64 - -Replace dependency jacobsa/crypto with a fork with support for riscv64. - -Issue: https://github.com/rfjakob/gocryptfs/issues/666 - -Upstream PR: https://github.com/jacobsa/crypto/issues/13 - -Signed-off-by: Christian Stewart ---- - go.mod | 15 ++++--- - go.sum | 16 +++----- - .../jacobsa/crypto/cmac/hash_generic.go | 40 +++++++++++++++++++ - vendor/modules.txt | 16 ++------ - 4 files changed, 59 insertions(+), 28 deletions(-) - create mode 100644 vendor/github.com/jacobsa/crypto/cmac/hash_generic.go - -diff --git a/go.mod b/go.mod -index 754a667..5103029 100644 ---- a/go.mod -+++ b/go.mod -@@ -2,19 +2,22 @@ module github.com/rfjakob/gocryptfs/v2 - - go 1.16 - -+// Fixes build against risc-v -+// See: https://github.com/jacobsa/crypto/issues/13 -+replace github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 // buildroot-1 -+ -+// Prevent x/sys version from changing and polluting vendor/ -+// Pin it to the current version in the original go.mod. -+replace golang.org/x/sys => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 -+ - require ( - github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914 - github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 -- github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd // indirect -- github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff // indirect -- github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 // indirect -- github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb // indirect - github.com/pkg/xattr v0.4.3 - github.com/rfjakob/eme v1.1.2 - github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f - github.com/spf13/pflag v1.0.5 - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 -- golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect -- golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 -+ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a - golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 - ) -diff --git a/go.sum b/go.sum -index 4167388..71826e9 100644 ---- a/go.sum -+++ b/go.sum -@@ -1,9 +1,9 @@ -+github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 h1:awSzmXfGWzvmRmrU1oSHqUdpxNcVPRMqv0rytbSA8kA= -+github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93/go.mod h1:SHG0nzlQikn4UxNIXqEKd2hvJM2tRIrdr1FfOrF+/wY= - github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= - github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914 h1:hGXMxS1wTE4y+f7iBqFArrJ6X8QozHnEdnVzGZI9Ywc= - github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914/go.mod h1:B1nGE/6RBFyBRC1RRnf23UpwCdyJ31eukw34oAKukAc= --github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 h1:YuDUUFNM21CAbyPOpOP8BicaTD/0klJEKt5p8yuw+uY= --github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115/go.mod h1:LadVJg0XuawGk+8L1rYnIED8451UyNxEMdTWCEt5kmU= - github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA= - github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M= - github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw= -@@ -30,21 +30,17 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= - golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= --golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= --golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -+golang.org/x/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0= -+golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= - golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= - golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= - golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc= - golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= - golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= - golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -diff --git a/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go b/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go -new file mode 100644 -index 0000000..235e3fc ---- /dev/null -+++ b/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go -@@ -0,0 +1,40 @@ -+// Copyright 2012 Aaron Jacobs. All Rights Reserved. -+// Author: aaronjjacobs@gmail.com (Aaron Jacobs) -+// -+// Licensed under the Apache License, Version 2.0 (the "License"); -+// you may not use this file except in compliance with the License. -+// You may obtain a copy of the License at -+// -+// http://www.apache.org/licenses/LICENSE-2.0 -+// -+// Unless required by applicable law or agreed to in writing, software -+// distributed under the License is distributed on an "AS IS" BASIS, -+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+// See the License for the specific language governing permissions and -+// limitations under the License. -+ -+// +build riscv64 -+ -+// This code doesn't require that it's safe to perform unaligned word-sized loads, but has a poor performance. -+ -+package cmac -+ -+import ( -+ "unsafe" -+) -+ -+// XOR the blockSize bytes starting at a and b, writing the result over dst. -+func xorBlock( -+ dstPtr unsafe.Pointer, -+ aPtr unsafe.Pointer, -+ bPtr unsafe.Pointer) { -+ // Convert. -+ a := (*[blockSize]byte)(aPtr) -+ b := (*[blockSize]byte)(bPtr) -+ dst := (*[blockSize]byte)(dstPtr) -+ -+ // Compute. -+ for i := 0; i < blockSize; i++ { -+ dst[i] = a[i] ^ b[i] -+ } -+} -diff --git a/vendor/modules.txt b/vendor/modules.txt -index 0e97e42..634c079 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -5,19 +5,11 @@ github.com/hanwen/go-fuse/v2/fuse - github.com/hanwen/go-fuse/v2/internal - github.com/hanwen/go-fuse/v2/internal/utimens - github.com/hanwen/go-fuse/v2/splice --# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 -+# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 - ## explicit - github.com/jacobsa/crypto/cmac - github.com/jacobsa/crypto/common - github.com/jacobsa/crypto/siv --# github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd --## explicit --# github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff --## explicit --# github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 --## explicit --# github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb --## explicit - # github.com/pkg/xattr v0.4.3 - ## explicit - github.com/pkg/xattr -@@ -39,9 +31,7 @@ golang.org/x/crypto/internal/subtle - golang.org/x/crypto/pbkdf2 - golang.org/x/crypto/poly1305 - golang.org/x/crypto/scrypt --# golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d --## explicit --# golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 -+# golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 - ## explicit - golang.org/x/sys/cpu - golang.org/x/sys/internal/unsafeheader -@@ -51,3 +41,5 @@ golang.org/x/sys/windows - # golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 - ## explicit - golang.org/x/term -+# github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 -+# golang.org/x/sys => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 --- -2.38.1 - diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash index 28965a064872..e8691607b191 100644 --- a/package/gocryptfs/gocryptfs.hash +++ b/package/gocryptfs/gocryptfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bfc98c18e44a2ca24a0e1472b6d9bb96e6072d7fb5651616515d2e7117b8fed9 gocryptfs-2.3.tar.gz +sha256 7ad6138eb49d3a0481211ec4d4828f35e269f234433b57a4e4ea7cf6e63ba887 gocryptfs-2.3.2.tar.gz sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk index 077597e7e872..6d84acc23bcb 100644 --- a/package/gocryptfs/gocryptfs.mk +++ b/package/gocryptfs/gocryptfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOCRYPTFS_VERSION = 2.3 +GOCRYPTFS_VERSION = 2.3.2 GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) GOCRYPTFS_LICENSE = MIT GOCRYPTFS_LICENSE_FILES = LICENSE From bf9a5c397c1c952fc8b5cd75cf4d651c746759fb Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 4 May 2023 00:30:21 -0700 Subject: [PATCH 0381/2890] package/mbpfan: bump version to v2.4.0 - Add support for alternate SMC path used with newer MacBooks - Improved systemd integration - Removed developer tests which confused users https://github.com/linux-on-mac/mbpfan/releases/tag/v2.4.0 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/mbpfan/mbpfan.hash | 2 +- package/mbpfan/mbpfan.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mbpfan/mbpfan.hash b/package/mbpfan/mbpfan.hash index 9195692d5202..5b67744a0004 100644 --- a/package/mbpfan/mbpfan.hash +++ b/package/mbpfan/mbpfan.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f690e9302da4cf97e582606614d91e1ee4ac495a4939aec7c0b3468c8988eb67 mbpfan-2.3.0.tar.gz +sha256 e1cdcffaba52be215ae40a8568949190866d500d6ae2a1e96b71ab5372f3580b mbpfan-2.4.0.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 COPYING diff --git a/package/mbpfan/mbpfan.mk b/package/mbpfan/mbpfan.mk index 52d823cbdc6c..0ac161b327e6 100644 --- a/package/mbpfan/mbpfan.mk +++ b/package/mbpfan/mbpfan.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBPFAN_VERSION = 2.3.0 +MBPFAN_VERSION = 2.4.0 MBPFAN_SITE = $(call github,linux-on-mac,mbpfan,v$(MBPFAN_VERSION)) MBPFAN_LICENSE = GPL-3.0+ MBPFAN_LICENSE_FILES = COPYING From 2b18a93cd5cdb56dd2a0e85ea9d04e16f1513fa4 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 4 May 2023 00:33:10 -0700 Subject: [PATCH 0382/2890] package/moby-buildkit: bump version to 0.11.6 Bugfixes. https://github.com/moby/buildkit/releases/tag/v0.11.6 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/moby-buildkit/moby-buildkit.hash | 2 +- package/moby-buildkit/moby-buildkit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash index ef927636d992..f7922d7e8f13 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b1746575f37715a8a2f2df5bab77ea081ba8436854e241792702109fc9e3653d moby-buildkit-0.11.2.tar.gz +sha256 1efa1c54b299c463c1b039d3df8ba1c68e70fe4de608fd14653fcebf9f27837b moby-buildkit-0.11.6.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index a25f676710eb..91560c1ed1db 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.11.2 +MOBY_BUILDKIT_VERSION = 0.11.6 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE From 5d65570fac4d577bd3661ad892df80bc9601f4ae Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 4 May 2023 00:37:11 -0700 Subject: [PATCH 0383/2890] package/nerdctl: bump version to 1.3.1 Bugfixes and features. https://github.com/containerd/nerdctl/releases/tag/v1.3.1 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index 8f2c6781989d..1fb0649fb210 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 08a84b9481b37dbd8cc6f955dbec0c18a1934bcffeb135fd5d2dc23987152b7c nerdctl-1.2.0.tar.gz +sha256 574438dd7c88e6a607c6f82932f8ada174b1133a66ee0fa0f7510e7c3bebacb4 nerdctl-1.3.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index 7556bcc3913c..43e862f7f975 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 1.2.0 +NERDCTL_VERSION = 1.3.1 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 From e0ef6ddcf9231d367b3f4a0fb1c4cca40b3e6f2e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 6 May 2023 18:15:03 +0200 Subject: [PATCH 0384/2890] .checkpackageignore: regenerate list Some patches were removed in recent version bumps: - 2d7cfd49ba package/valgrind: bump version to 3.20.0 - 4aef53575b package/libgit2: bump version to 1.6.4 - b0306d94b2 package/cpio: bump version to 2.14 - f292d9b736 package/gocryptfs: bump version to 2.3.2 Update the ignore list accordingly. Signed-off-by: Yann E. MORIN --- .checkpackageignore | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index d1626326a80a..9363e7f3bbf2 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -317,9 +317,6 @@ package/connman/0003-wispr-Update-portal-context-references.patch Upstream package/connman/S45connman Variables package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch Upstream package/coremark-pro/coremark-pro.sh.in Shellcheck -package/cpio/0001-Minor-fix.patch Upstream -package/cpio/0002-Rewrite-dynamic-string-support.patch Upstream -package/cpio/0003-Fix-previous-commit.patch Upstream package/cppdb/0001-mysql-library-suffix.patch Upstream package/cpulimit/0001-Fix-crash-and-compiler-warnings.patch Upstream package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch Upstream @@ -622,7 +619,6 @@ package/gob2/0001-dont-include-from-prefix.patch Upstream package/gobject-introspection/0001-disable-tests.patch Upstream package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch Upstream package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch Upstream -package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch Upstream package/google-breakpad/gen-syms.sh Shellcheck package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch Upstream package/gpm/0002-Install-unversioned-solibrary.patch Upstream @@ -795,7 +791,6 @@ package/libfuse/0002-util-ulockmgr_server-c-conditionally-define-closefrom-fix-g package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch Upstream package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch Upstream package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch Upstream -package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch Upstream package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch Upstream package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch Upstream package/libgpgme/0001-Fix-build-without-threads.patch Upstream @@ -1644,7 +1639,6 @@ package/vala/0001-dont-add-dirty-to-valac-version.patch Upstream package/vala/vala-wrapper Shellcheck package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch Upstream package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch Upstream -package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch Upstream package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch Upstream package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch Upstream package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch Upstream From 7e6e2bde8bc1ae0069c534b95f66b8fbb3117c2e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 5 Jan 2023 20:18:12 +0100 Subject: [PATCH 0385/2890] package/freeswitch: ffmpeg's libavresample is an optional dependency See upstream commit from 2019: https://github.com/signalwire/freeswitch/commit/e9c58084db249845af88011a1e3c5d7b9ec05a76#diff-2cd3a5516ad0fc3cba6d14d0ea3e72da43a2c2fc3c21eb7ade6c49d52136bbd2R43 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/freeswitch/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in index bad101486cfa..1ab624c33cd8 100644 --- a/package/freeswitch/Config.in +++ b/package/freeswitch/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_FREESWITCH depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr, included in freeswitch source depends on BR2_USE_WCHAR # uses wchar_t - select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_JPEG From 8e33cc012e53a3964ff7144df1492b3c61c14948 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:17:55 +0200 Subject: [PATCH 0386/2890] package/heimdal: bump version Samba-4.16 bumped its internal heimdal code[1] which made it incompatible with asn1_compile built with heimdal-7.7.1: /home/user/buildroot/output/build/samba4-4.18.2/third_party/heimdal/lib/asn1/rfc2459.asn1:260: Ignoring char(_) /home/user/buildroot/output/build/samba4-4.18.2/third_party/heimdal/lib/asn1/rfc2459.asn1:260: syntax error Bump this package to the same version LibreELEC is using https://github.com/LibreELEC/LibreELEC.tv/commit/1dc0b5bf3e50500658c8a61e89f57a98dfc0468d https://github.com/LibreELEC/LibreELEC.tv/commit/1112a1879523fdff7f6dec5a083d4f2bc82e7017 https://github.com/LibreELEC/LibreELEC.tv/commit/763eddbab10f89da42a380624192cc4039eed086 to fix the build error. Removed HOST_HEIMDAL_MAKE_SYMLINK as asn1_compile is now installed in $(HOST_DIR)/bin/. [1] https://www.samba.org/samba/history/samba-4.16.0.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/heimdal/heimdal.hash | 4 +--- package/heimdal/heimdal.mk | 14 ++++---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/package/heimdal/heimdal.hash b/package/heimdal/heimdal.hash index cf822340daf4..250ddbbd4dbb 100644 --- a/package/heimdal/heimdal.hash +++ b/package/heimdal/heimdal.hash @@ -1,5 +1,3 @@ -# From https://github.com/heimdal/heimdal/releases -sha1 a33fdc957f84ab13f39f164b04fe1deeaab3179e heimdal-7.7.1.tar.gz -sha256 117cb1ede7848db24cf27311c46f7f735a99f9c836c22e80aec92b91efe56644 heimdal-7.7.1.tar.gz # Locally computed +sha256 2576c5e2d793db53c86e108fd117b278437bb02d6c6db2bec4d1b86958f1980a heimdal-f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17.tar.gz sha256 0c4b07bf5b98f7a1d01f8e60722d6c6747ef052c2aa6d2043daf690d4e1b0a7f LICENSE diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 21b6c0ccb3bb..59b64c358b1a 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -4,9 +4,10 @@ # ################################################################################ -HEIMDAL_VERSION = 7.7.1 -HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) +HEIMDAL_VERSION = f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17 +HEIMDAL_SITE = $(call github,heimdal,heimdal,$(HEIMDAL_VERSION)) HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf +HOST_HEIMDAL_AUTORECONF = YES HEIMDAL_INSTALL_STAGING = YES # static because of -fPIC issues with e2fsprogs on x86_64 host HOST_HEIMDAL_CONF_OPTS = \ @@ -39,14 +40,7 @@ define HOST_HEIMDAL_INSTALL_COMPILE_ET $(HOST_DIR)/bin/compile_et endef -# We need asn1_compile in the PATH for samba4 -define HOST_HEIMDAL_MAKE_SYMLINK - ln -sf $(HOST_DIR)/libexec/heimdal/asn1_compile \ - $(HOST_DIR)/bin/asn1_compile -endef - HOST_HEIMDAL_POST_INSTALL_HOOKS += \ - HOST_HEIMDAL_INSTALL_COMPILE_ET \ - HOST_HEIMDAL_MAKE_SYMLINK + HOST_HEIMDAL_INSTALL_COMPILE_ET $(eval $(host-autotools-package)) From 55ceaef8f65eeb0fd9ca7314b03668cf9dd325ca Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:17:56 +0200 Subject: [PATCH 0387/2890] package/samba4: bump version to 4.18.2 Removed patches which were applied upstream, rebased remaining patches. Added patch 0004 to avoid dependency to perl package JSON:PP. This bump depends on bumping heimdal, see previous patch of this series. Signed-off-by: Bernd Kuhls [yann.morin.1998@free.fr: - make new patch git-formatted - add upstream status to new patch - update .checkpackageignore wth removed patches ] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 - ...01-libreplace-disable-libbsd-support.patch | 2 +- ...uilt-heimdal-build-tools-in-case-of-.patch | 42 ++++--------------- ...-Use-perl-module-JSON-part-of-core-i.patch | 41 ++++++++++++++++++ .../0004-lib-util-Add-signal.h-include.patch | 37 ---------------- ...mba-4.16.2-fix-build-without-innetgr.patch | 34 --------------- package/samba4/samba4.hash | 4 +- package/samba4/samba4.mk | 4 +- 8 files changed, 54 insertions(+), 112 deletions(-) create mode 100644 package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch delete mode 100644 package/samba4/0004-lib-util-Add-signal.h-include.patch delete mode 100644 package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch diff --git a/.checkpackageignore b/.checkpackageignore index 9363e7f3bbf2..0db9b2ed4d24 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1453,8 +1453,6 @@ package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch Upstream package/samba4/0001-libreplace-disable-libbsd-support.patch Upstream package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch Upstream package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch Upstream -package/samba4/0004-lib-util-Add-signal.h-include.patch Upstream -package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch Upstream package/samba4/S91smb Indent Shellcheck Variables package/sane-backends/0001-sane_backend-add-missing-config.h.patch Upstream package/screen/0001-no-memcpy-fallback.patch Upstream diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch index 79216860dd8b..8259e91fc653 100644 --- a/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ b/package/samba4/0001-libreplace-disable-libbsd-support.patch @@ -19,7 +19,7 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript index 240d730cbee..c6d8df43c74 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -406,21 +406,6 @@ def configure(conf): +@@ -436,21 +436,6 @@ def configure(conf): strlcpy_in_bsd = False diff --git a/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch index 484e6722ea23..1c4de6a02ef7 100644 --- a/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ b/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -1,4 +1,4 @@ -From e002d2ef2688d5433d2bd03aa4d77a0ec5ac4e63 Mon Sep 17 00:00:00 2001 +From 2e53f331104b29db7caf1641a30d3e9316b57184 Mon Sep 17 00:00:00 2001 From: Uri Simchoni Date: Sun, 20 Oct 2019 00:03:14 +0300 Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded @@ -33,18 +33,20 @@ BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 Signed-off-by: Uri Simchoni Signed-off-by: Bernd Kuhls -[Bernd: rebased for version 4.11.13] +[Bernd: rebased for version 4.11.13 & 4.17.7] --- wscript_configure_embedded_heimdal | 11 +++++++++++ wscript_configure_system_heimdal | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal -index 8c55ae2a938..4fdae8062c5 100644 +index 8c55ae2..4fdae80 100644 --- a/wscript_configure_embedded_heimdal +++ b/wscript_configure_embedded_heimdal -@@ -1 +1,12 @@ - conf.RECURSE('source4/heimdal_build') +@@ -6,3 +6,14 @@ + + conf.define('USING_EMBEDDED_HEIMDAL', 1) + conf.RECURSE('third_party/heimdal_build') + +def check_system_heimdal_binary(name): + if conf.LIB_MAY_BE_BUNDLED(name): @@ -56,34 +58,6 @@ index 8c55ae2a938..4fdae8062c5 100644 + +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") -diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal -index 0ff6dad2f55..f77c177442f 100644 ---- a/wscript_configure_system_heimdal -+++ b/wscript_configure_system_heimdal -@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): - conf.define('USING_SYSTEM_%s' % name.upper(), 1) - return True - --def check_system_heimdal_binary(name): -- if conf.LIB_MAY_BE_BUNDLED(name): -- return False -- if not conf.find_program(name, var=name.upper()): -- return False -- conf.define('USING_SYSTEM_%s' % name.upper(), 1) -- return True -- - check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") - - if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): -@@ -96,9 +88,6 @@ - #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): - # conf.define('USING_SYSTEM_TOMMATH', 1) - --check_system_heimdal_binary("compile_et") --check_system_heimdal_binary("asn1_compile") -- - conf.env.KRB5_VENDOR = 'heimdal' - conf.define('USING_SYSTEM_KRB5', 1) - conf.define('USING_SYSTEM_HEIMDAL', 1) -- 2.20.1 + diff --git a/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch new file mode 100644 index 000000000000..7eb31e5d0781 --- /dev/null +++ b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch @@ -0,0 +1,41 @@ +From bd8fc19c8383914b518a9d56f4c08fba3baeb967 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 7 May 2023 11:02:26 +0200 +Subject: [PATCH] 3rdparty/heindal: Use perl module JSON, part of core, instead + of JSON:PP package + +Downloaded from +https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch + +Signed-off-by: Bernd Kuhls +Signed-off-by: Yann E. MORIN +Upstream: unknown +--- + third_party/heimdal/cf/make-proto.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/third_party/heimdal/cf/make-proto.pl b/third_party/heimdal/cf/make-proto.pl +index 36a040ce6c0..ad21dbad9e1 100644 +--- a/third_party/heimdal/cf/make-proto.pl ++++ b/third_party/heimdal/cf/make-proto.pl +@@ -4,7 +4,7 @@ + use Getopt::Std; + use File::Compare; + +-use JSON; ++use JSON::PP; + + my $comment = 0; + my $doxygen = 0; +@@ -70,7 +70,7 @@ if($opt_x) { + my $EXP; + local $/; + open(EXP, '<', $opt_x) || die "open ${opt_x}"; +- my $obj = JSON->new->utf8->decode(); ++ my $obj = JSON::PP->new->utf8->decode(); + close $EXP; + + foreach my $x (keys %$obj) { +-- +2.25.1 + diff --git a/package/samba4/0004-lib-util-Add-signal.h-include.patch b/package/samba4/0004-lib-util-Add-signal.h-include.patch deleted file mode 100644 index 838a8fa6d756..000000000000 --- a/package/samba4/0004-lib-util-Add-signal.h-include.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d1732a79dbf30c41802245909d0250ebe2b9d92e Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 12 Dec 2021 10:27:42 +0100 -Subject: [PATCH] lib/util: Add signal.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error with samba-4.15.3 and uClibc: - -../../source3/printing/samba-bgqd.c: In function ‘main’: -../../source3/printing/samba-bgqd.c:340:21: error: ‘SIGPIPE’ undeclared (first use in this function); did you mean ‘EPIPE’? -../../source3/printing/samba-bgqd.c:384:14: error: ‘SIGTERM’ undeclared (first use in this function) - -Patch sent upstream: -https://gitlab.com/samba-team/samba/-/merge_requests/2296 - -Signed-off-by: Bernd Kuhls ---- - lib/util/signal.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/util/signal.h b/lib/util/signal.h -index 0663af6ab94..f662ee110d6 100644 ---- a/lib/util/signal.h -+++ b/lib/util/signal.h -@@ -21,6 +21,7 @@ - #ifndef _SAMBA_UTIL_SIGNAL_H_ - #define _SAMBA_UTIL_SIGNAL_H_ - -+#include - #include - - /** --- -2.30.2 - diff --git a/package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch b/package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch deleted file mode 100644 index b338596d7aae..000000000000 --- a/package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch +++ /dev/null @@ -1,34 +0,0 @@ -# Gentoo bug 855047 - -Fixes uClibc build when uClibc was build without netgroup support. -Upstream enables netgroup support based on getdomainname() being -present: -https://github.com/samba-team/samba/commit/f179184a2be2ddd38f463fcc12252f8d24e529f8#diff-b8d1bc25b89846e70ecb61cb296a8f5c50c9a0a1b62e46790fae81aa9d5bfaaeR632 - -Downloaded from -https://gitweb.gentoo.org/repo/gentoo.git/tree/net-fs/samba/files/samba-4.16.2-fix-musl-without-innetgr.patch - -Signed-off-by: Bernd Kuhls - ---- a/lib/util/access.c -+++ b/lib/util/access.c -@@ -115,7 +115,7 @@ static bool string_match(const char *tok,const char *s) - return true; - } - } else if (tok[0] == '@') { /* netgroup: look it up */ --#ifdef HAVE_NETGROUP -+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) - DATA_BLOB tmp; - char *mydomain = NULL; - char *hostname = NULL; ---- a/source3/auth/user_util.c -+++ b/source3/auth/user_util.c -@@ -135,7 +135,7 @@ static void store_map_in_gencache(TALLOC_CTX *ctx, const char *from, const char - - bool user_in_netgroup(TALLOC_CTX *ctx, const char *user, const char *ngname) - { --#ifdef HAVE_NETGROUP -+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) - char nis_domain_buf[256]; - const char *nis_domain = NULL; - char *lowercase_user = NULL; diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 18ec63e07a57..20390fb6b4bc 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.13.tar.asc -sha256 c412e3536a5265d04e52983e643bae9e047bcc3eac08683a945b1057ecdf4968 samba-4.15.13.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.18.2.tar.asc +sha256 5bf87e179616cd12a52d85fb8b26eec709f13709a2b67fe42b1fb0213f7e8106 samba-4.18.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index b979aaf09f6e..2799dbe2f718 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.13 +SAMBA4_VERSION = 4.18.2 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES @@ -120,7 +120,7 @@ define SAMBA4_CONFIGURE_CMDS PERL="$(HOST_DIR)/bin/perl" \ $(TARGET_CONFIGURE_OPTS) \ $(SAMBA4_CONF_ENV) \ - ./buildtools/bin/waf configure \ + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ From 129c83bdd40376eecbcb45653a36d2ce6920892d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:44:48 +0200 Subject: [PATCH 0388/2890] package/bento4: bump version to 1.6.0-639-6-Nexus Switch to kodi fork, remove all kodi-related patches. Needed by upcoming bump of kodi-inputstream-adaptive. Signed-off-by: Bernd Kuhls [yann.morin.1998@free.fr: update .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 16 - .../0001-Add-support-for-cmake-install.patch | 130 ---- ...-methods-funtions-and-passing-poolid.patch | 634 ------------------ .../0003-Backport-Smmothstream-changes.patch | 99 --- package/bento4/0004-more-SPS-parameters.patch | 219 ------ ...0005-AVC-extract-VUI-values-from-SPS.patch | 96 --- .../0006-Implement-SPS-Frame-parser.patch | 67 -- ...-Fix-segfault-when-AP4_Sample-s-seek.patch | 25 - package/bento4/0008-Hack-HBO.patch | 214 ------ .../bento4/0009-Android-32-ftello-fix.patch | 31 - ...0010-Dazn-sample-duration-workaround.patch | 30 - ...ent-to-reuse-single-sample-decrypter.patch | 179 ----- .../0012-Static-ReadGolomb-SignedGolomb.patch | 54 -- .../bento4/0013-Add-GetChannels-method.patch | 40 -- ...ampleIndexForTimeStamp-GetNearestSyn.patch | 59 -- ...015-Avoid-set-next-fragment-position.patch | 43 -- ...ault-in-AP4_LinearReader-ProcessMoof.patch | 27 - package/bento4/bento4.hash | 2 +- package/bento4/bento4.mk | 4 +- 19 files changed, 3 insertions(+), 1966 deletions(-) delete mode 100644 package/bento4/0001-Add-support-for-cmake-install.patch delete mode 100644 package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch delete mode 100644 package/bento4/0003-Backport-Smmothstream-changes.patch delete mode 100644 package/bento4/0004-more-SPS-parameters.patch delete mode 100644 package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch delete mode 100644 package/bento4/0006-Implement-SPS-Frame-parser.patch delete mode 100644 package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch delete mode 100644 package/bento4/0008-Hack-HBO.patch delete mode 100644 package/bento4/0009-Android-32-ftello-fix.patch delete mode 100644 package/bento4/0010-Dazn-sample-duration-workaround.patch delete mode 100644 package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch delete mode 100644 package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch delete mode 100644 package/bento4/0013-Add-GetChannels-method.patch delete mode 100644 package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch delete mode 100644 package/bento4/0015-Avoid-set-next-fragment-position.patch delete mode 100644 package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch diff --git a/.checkpackageignore b/.checkpackageignore index 0db9b2ed4d24..3eb6fdf3b5a1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -219,22 +219,6 @@ package/beecrypt/0002-build-system.patch Upstream package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch Upstream package/benejson/0001-c-std.patch Upstream package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch Upstream -package/bento4/0001-Add-support-for-cmake-install.patch Upstream -package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch Upstream -package/bento4/0003-Backport-Smmothstream-changes.patch Upstream -package/bento4/0004-more-SPS-parameters.patch Upstream -package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch Upstream -package/bento4/0006-Implement-SPS-Frame-parser.patch Upstream -package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch Upstream -package/bento4/0008-Hack-HBO.patch Upstream -package/bento4/0009-Android-32-ftello-fix.patch Upstream -package/bento4/0010-Dazn-sample-duration-workaround.patch Upstream -package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch Upstream -package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch Upstream -package/bento4/0013-Add-GetChannels-method.patch Upstream -package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch Upstream -package/bento4/0015-Avoid-set-next-fragment-position.patch Upstream -package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch Upstream package/berkeleydb/0001-cwd-db_config.patch Upstream package/berkeleydb/0002-atomic_compare_exchange.patch Upstream package/bind/0001-cross.patch Upstream diff --git a/package/bento4/0001-Add-support-for-cmake-install.patch b/package/bento4/0001-Add-support-for-cmake-install.patch deleted file mode 100644 index cec0cb18b9b2..000000000000 --- a/package/bento4/0001-Add-support-for-cmake-install.patch +++ /dev/null @@ -1,130 +0,0 @@ -From ba95f55c495c4c34c75a95de843acfa00f6afe24 Mon Sep 17 00:00:00 2001 -From: Harry Mallon -Date: Fri, 9 Jul 2021 15:50:26 +0100 -Subject: [PATCH] Add support for cmake install - -Downloaded from upstream commit -https://github.com/axiomatic-systems/Bento4/commit/ba95f55c495c4c34c75a95de843acfa00f6afe24 - -Signed-off-by: Bernd Kuhls ---- - Build/cmake/Config.cmake.in | 4 ++ - CMakeLists.txt | 73 ++++++++++++++++++++++++++++++++++--- - 2 files changed, 71 insertions(+), 6 deletions(-) - create mode 100644 Build/cmake/Config.cmake.in - -diff --git a/Build/cmake/Config.cmake.in b/Build/cmake/Config.cmake.in -new file mode 100644 -index 00000000..38bbde7b ---- /dev/null -+++ b/Build/cmake/Config.cmake.in -@@ -0,0 +1,4 @@ -+@PACKAGE_INIT@ -+ -+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") -+check_required_components("@PROJECT_NAME@") -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6de3bfe1..6ebf127f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,7 +7,14 @@ else() - cmake_minimum_required(VERSION 3.10) - endif() - --project(bento4) -+function(get_bento4_version) -+ file(STRINGS "Source/C++/Core/Ap4Version.h" _temp REGEX "AP4_VERSION_STRING") -+ string(REGEX MATCH "\"([^\"]+)\"" _temp "${_temp}") -+ set(BENTO4_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) -+endfunction() -+ -+get_bento4_version() -+project(bento4 VERSION "${BENTO4_VERSION}") - - # Variables - set(SOURCE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/Source/C++) -@@ -51,14 +58,22 @@ endif() - - # Includes - set(AP4_INCLUDE_DIRS -- ${SOURCE_CORE} -- ${SOURCE_CODECS} -- ${SOURCE_CRYPTO} -- ${SOURCE_METADATA} -+ $ -+ $ -+ $ -+ $ -+) -+file(GLOB AP4_HEADERS -+ ${SOURCE_CORE}/*.h -+ ${SOURCE_CODECS}/*.h -+ ${SOURCE_CRYPTO}/*.h -+ ${SOURCE_METADATA}/*.h - ) - - add_library(ap4 STATIC ${AP4_SOURCES}) --target_include_directories(ap4 PUBLIC ${AP4_INCLUDE_DIRS}) -+target_include_directories(ap4 PUBLIC -+ ${AP4_INCLUDE_DIRS} -+) - - # Use the statically linked C runtime library - if(MSVC) -@@ -72,6 +87,7 @@ if(BUILD_APPS) - file(GLOB BENTO4_APPS RELATIVE ${SOURCE_ROOT}/Apps ${SOURCE_ROOT}/Apps/*) - foreach(app ${BENTO4_APPS}) - string(TOLOWER ${app} binary_name) -+ list(APPEND BENTO4_APPS_LOWERCASE ${binary_name}) - add_executable(${binary_name} ${SOURCE_ROOT}/Apps/${app}/${app}.cpp) - target_link_libraries(${binary_name} ap4) - -@@ -81,3 +97,48 @@ foreach(app ${BENTO4_APPS}) - endif() - endforeach() - endif(BUILD_APPS) -+ -+# Install -+include(GNUInstallDirs) -+set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") -+set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") -+set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") -+set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") -+set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") -+set(namespace "${PROJECT_NAME}::") -+ -+include(CMakePackageConfigHelpers) -+write_basic_package_version_file( -+ "${version_config}" COMPATIBILITY SameMajorVersion -+) -+ -+configure_package_config_file( -+ "Build/cmake/Config.cmake.in" -+ "${project_config}" -+ INSTALL_DESTINATION "${config_install_dir}" -+) -+ -+install( -+ TARGETS ap4 ${BENTO4_APPS_LOWERCASE} -+ EXPORT "${TARGETS_EXPORT_NAME}" -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" -+) -+ -+install( -+ FILES ${AP4_HEADERS} -+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/bento4" -+) -+ -+install( -+ FILES "${project_config}" "${version_config}" -+ DESTINATION "${config_install_dir}" -+) -+ -+install( -+ EXPORT "${TARGETS_EXPORT_NAME}" -+ NAMESPACE "${namespace}" -+ DESTINATION "${config_install_dir}" -+) diff --git a/package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch b/package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch deleted file mode 100644 index 22ac657a3f30..000000000000 --- a/package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch +++ /dev/null @@ -1,634 +0,0 @@ -From b2027d354ef5d52efd525730fa5e6beccb88d33f Mon Sep 17 00:00:00 2001 -From: Glenn Guy -Date: Thu, 22 Jul 2021 10:00:44 +0200 -Subject: [PATCH] Add additional methods/funtions and passing poolid - -Added back: -* SSD - > ParentIsOwner functionality -* LinearReader: GetSample, SeekSample, Reset -* Ap4Movie -> GetPsshAtoms -* Uuid/VppC -> GetData -* Ap4Protection -> WVTT atom type - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Core/Ap4ByteStream.h | 1 - - Source/C++/Core/Ap4CommonEncryption.cpp | 15 ++-- - Source/C++/Core/Ap4CommonEncryption.h | 24 +++++-- - Source/C++/Core/Ap4IsmaCryp.cpp | 5 +- - Source/C++/Core/Ap4IsmaCryp.h | 3 +- - Source/C++/Core/Ap4LinearReader.cpp | 94 ++++++++++++++++++++++++- - Source/C++/Core/Ap4LinearReader.h | 4 ++ - Source/C++/Core/Ap4Marlin.cpp | 5 +- - Source/C++/Core/Ap4Marlin.h | 3 +- - Source/C++/Core/Ap4MoovAtom.cpp | 28 +++++++- - Source/C++/Core/Ap4MoovAtom.h | 5 ++ - Source/C++/Core/Ap4Movie.cpp | 10 +++ - Source/C++/Core/Ap4Movie.h | 4 ++ - Source/C++/Core/Ap4OmaDcf.cpp | 8 ++- - Source/C++/Core/Ap4OmaDcf.h | 6 +- - Source/C++/Core/Ap4Protection.h | 3 +- - Source/C++/Core/Ap4SampleDescription.h | 1 + - Source/C++/Core/Ap4UuidAtom.h | 1 + - Source/C++/Core/Ap4VpccAtom.h | 3 + - 19 files changed, 197 insertions(+), 26 deletions(-) - -diff --git a/Source/C++/Core/Ap4ByteStream.h b/Source/C++/Core/Ap4ByteStream.h -index 0a59e63..93ac80f 100644 ---- a/Source/C++/Core/Ap4ByteStream.h -+++ b/Source/C++/Core/Ap4ByteStream.h -@@ -195,7 +195,6 @@ public: - AP4_UI08* UseData() { return m_Buffer->UseData(); } - AP4_Size GetDataSize() { return m_Buffer->GetDataSize(); } - --protected: - virtual ~AP4_MemoryByteStream(); - - private: -diff --git a/Source/C++/Core/Ap4CommonEncryption.cpp b/Source/C++/Core/Ap4CommonEncryption.cpp -index acd6361..5308200 100644 ---- a/Source/C++/Core/Ap4CommonEncryption.cpp -+++ b/Source/C++/Core/Ap4CommonEncryption.cpp -@@ -1859,7 +1859,8 @@ AP4_CencSingleSampleDecrypter::~AP4_CencSingleSampleDecrypter() { - | AP4_CencSingleSampleDecrypter::DecryptSampleData - +---------------------------------------------------------------------*/ - AP4_Result --AP4_CencSingleSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, -+AP4_CencSingleSampleDecrypter::DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* iv, - unsigned int subsample_count, -@@ -2094,8 +2095,9 @@ AP4_CencSampleDecrypter::Create(AP4_CencSampleInfoTable* sample_info_table, - +---------------------------------------------------------------------*/ - AP4_CencSampleDecrypter::~AP4_CencSampleDecrypter() - { -- delete m_SampleInfoTable; -- delete m_SingleSampleDecrypter; -+ delete m_SampleInfoTable; -+ if (m_SingleSampleDecrypter->GetParentIsOwner()) -+ delete m_SingleSampleDecrypter; - } - - /*---------------------------------------------------------------------- -@@ -2112,7 +2114,8 @@ AP4_CencSampleDecrypter::SetSampleIndex(AP4_Ordinal sample_index) - | AP4_CencSampleDecrypter::DecryptSampleData - +---------------------------------------------------------------------*/ - AP4_Result --AP4_CencSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, -+AP4_CencSampleDecrypter::DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* iv) - { -@@ -2139,7 +2142,7 @@ AP4_CencSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, - } - - // decrypt the sample -- return m_SingleSampleDecrypter->DecryptSampleData(data_in, data_out, iv_block, subsample_count, bytes_of_cleartext_data, bytes_of_encrypted_data); -+ return m_SingleSampleDecrypter->DecryptSampleData(poolid, data_in, data_out, iv_block, subsample_count, bytes_of_cleartext_data, bytes_of_encrypted_data); - } - - /*---------------------------------------------------------------------- -@@ -2323,7 +2326,7 @@ AP4_CencFragmentDecrypter::ProcessSample(AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out) - { - // decrypt the sample -- return m_SampleDecrypter->DecryptSampleData(data_in, data_out, NULL); -+ return m_SampleDecrypter->DecryptSampleData(0, data_in, data_out, NULL); - } - - /*---------------------------------------------------------------------- -diff --git a/Source/C++/Core/Ap4CommonEncryption.h b/Source/C++/Core/Ap4CommonEncryption.h -index 80db456..580de66 100644 ---- a/Source/C++/Core/Ap4CommonEncryption.h -+++ b/Source/C++/Core/Ap4CommonEncryption.h -@@ -691,9 +691,18 @@ public: - // methods - AP4_CencSingleSampleDecrypter(AP4_StreamCipher* cipher) : - m_Cipher(cipher), -- m_FullBlocksOnly(false) {} -+ m_FullBlocksOnly(false), -+ m_ParentIsOwner(true) {} - virtual ~AP4_CencSingleSampleDecrypter(); -- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, -+ virtual AP4_Result SetFragmentInfo(AP4_UI32 poolid, const AP4_UI08* keyid, const AP4_UI08 nalu_length_size, -+ AP4_DataBuffer &annexb_sps_pps, AP4_UI32 flags) { -+ return AP4_ERROR_NOT_SUPPORTED; -+ }; -+ virtual AP4_UI32 AddPool() { return 0; }; -+ virtual void RemovePool(AP4_UI32 poolid) {}; -+ virtual const char* GetSessionId() { return nullptr; }; -+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - - // always 16 bytes -@@ -706,7 +715,9 @@ public: - const AP4_UI16* bytes_of_cleartext_data, - - // array of integers. NULL if subsample_count is 0 -- const AP4_UI32* bytes_of_encrypted_data); -+ const AP4_UI32* bytes_of_encrypted_data); -+ bool GetParentIsOwner()const { return m_ParentIsOwner; }; -+ void SetParentIsOwner(bool parent_is_owner) { m_ParentIsOwner = parent_is_owner; }; - - private: - // constructor -@@ -715,12 +726,14 @@ private: - bool reset_iv_at_each_subsample) : - m_Cipher(cipher), - m_FullBlocksOnly(full_blocks_only), -- m_ResetIvAtEachSubsample(reset_iv_at_each_subsample) {} -+ m_ResetIvAtEachSubsample(reset_iv_at_each_subsample), -+ m_ParentIsOwner(true) {} - - // members - AP4_StreamCipher* m_Cipher; - bool m_FullBlocksOnly; - bool m_ResetIvAtEachSubsample; -+ bool m_ParentIsOwner; - }; - - /*---------------------------------------------------------------------- -@@ -766,7 +779,8 @@ public: - m_SampleCursor(0) {} - virtual ~AP4_CencSampleDecrypter(); - virtual AP4_Result SetSampleIndex(AP4_Ordinal sample_index); -- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, -+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* iv); - -diff --git a/Source/C++/Core/Ap4IsmaCryp.cpp b/Source/C++/Core/Ap4IsmaCryp.cpp -index dfb59a4..442ad49 100644 ---- a/Source/C++/Core/Ap4IsmaCryp.cpp -+++ b/Source/C++/Core/Ap4IsmaCryp.cpp -@@ -142,7 +142,8 @@ AP4_IsmaCipher::GetDecryptedSampleSize(AP4_Sample& sample) - | AP4_IsmaCipher::DecryptSampleData - +---------------------------------------------------------------------*/ - AP4_Result --AP4_IsmaCipher::DecryptSampleData(AP4_DataBuffer& data_in, -+AP4_IsmaCipher::DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* /*iv*/) - { -@@ -333,7 +334,7 @@ AP4_Result - AP4_IsmaTrackDecrypter::ProcessSample(AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out) - { -- return m_Cipher->DecryptSampleData(data_in, data_out); -+ return m_Cipher->DecryptSampleData(0, data_in, data_out); - } - - /*---------------------------------------------------------------------- -diff --git a/Source/C++/Core/Ap4IsmaCryp.h b/Source/C++/Core/Ap4IsmaCryp.h -index 4b9c60e..970dac8 100644 ---- a/Source/C++/Core/Ap4IsmaCryp.h -+++ b/Source/C++/Core/Ap4IsmaCryp.h -@@ -74,7 +74,8 @@ public: - AP4_Result EncryptSampleData(AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - AP4_UI32 block_counter); -- AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, -+ AP4_Result DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* iv = NULL); - AP4_Size GetDecryptedSampleSize(AP4_Sample& sample); -diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp -index 08b55ee..7cc3ebd 100644 ---- a/Source/C++/Core/Ap4LinearReader.cpp -+++ b/Source/C++/Core/Ap4LinearReader.cpp -@@ -117,6 +117,29 @@ AP4_LinearReader::FlushQueues() - } - } - -+/*---------------------------------------------------------------------- -+| AP4_LinearReader::Reset -++---------------------------------------------------------------------*/ -+void -+AP4_LinearReader::Reset() -+{ -+ // flush any queued samples -+ FlushQueues(); -+ -+ // reset tracker states -+ for (unsigned int i = 0; i < m_Trackers.ItemCount(); i++) { -+ if (m_Trackers[i]->m_SampleTableIsOwned) { -+ delete m_Trackers[i]->m_SampleTable; -+ } -+ delete m_Trackers[i]->m_NextSample; -+ m_Trackers[i]->m_SampleTable = NULL; -+ m_Trackers[i]->m_NextSample = NULL; -+ m_Trackers[i]->m_NextSampleIndex = 0; -+ m_Trackers[i]->m_Eos = false; -+ } -+ m_NextFragmentPosition = 0; -+} -+ - /*---------------------------------------------------------------------- - | AP4_LinearReader::SetSampleIndex - +---------------------------------------------------------------------*/ -@@ -591,6 +614,75 @@ AP4_LinearReader::ReadNextSample(AP4_Sample& sample, - return ReadNextSample(sample, &sample_data, track_id); - } - -+/*---------------------------------------------------------------------- -+| AP4_LinearReader::GetSample -++---------------------------------------------------------------------*/ -+AP4_Result AP4_LinearReader::GetSample(AP4_UI32 track_id, AP4_Sample &sample, AP4_Ordinal sample_index) -+{ -+ // look for a sample from a specific track -+ Tracker* tracker = FindTracker(track_id); -+ if (tracker == NULL) -+ return AP4_ERROR_INVALID_PARAMETERS; -+ -+ // don't continue if we've reached the end of that tracker -+ if (tracker->m_Eos) -+ return AP4_ERROR_EOS; -+ -+ return tracker->m_SampleTable->GetSample(sample_index, sample); -+} -+ -+/*---------------------------------------------------------------------- -+| AP4_LinearReader::SeekSample -++---------------------------------------------------------------------*/ -+AP4_Result -+AP4_LinearReader::SeekSample(AP4_UI32 track_id, AP4_UI64 ts, AP4_Ordinal &sample_index, bool preceedingSync) -+{ -+ // we only support fragmented sources for now -+ if (!m_HasFragments) -+ return AP4_ERROR_NOT_SUPPORTED; -+ -+ if (m_Trackers.ItemCount() == 0) { -+ return AP4_ERROR_NO_SUCH_ITEM; -+ } -+ -+ // look for a sample from a specific track -+ Tracker* tracker = FindTracker(track_id); -+ if (tracker == NULL) -+ return AP4_ERROR_INVALID_PARAMETERS; -+ -+ // don't continue if we've reached the end of that tracker -+ if (tracker->m_Eos) -+ return AP4_ERROR_EOS; -+ -+ AP4_Result result; -+ -+ if (!tracker->m_SampleTable && AP4_FAILED(result = Advance())) -+ return result; -+ -+ while (AP4_FAILED(result = tracker->m_SampleTable->GetSampleIndexForTimeStamp(ts, sample_index))) -+ { -+ if (result == AP4_ERROR_NOT_ENOUGH_DATA) -+ { -+ tracker->m_NextSampleIndex = tracker->m_SampleTable->GetSampleCount(); -+ if (AP4_FAILED(result = Advance())) -+ return result; -+ continue; -+ } -+ return result; -+ } -+ -+ sample_index = tracker->m_SampleTable->GetNearestSyncSampleIndex(sample_index, preceedingSync); -+ //we have reached the end -> go for the first sample of the next segment -+ if (sample_index == tracker->m_SampleTable->GetSampleCount()) -+ { -+ tracker->m_NextSampleIndex = tracker->m_SampleTable->GetSampleCount(); -+ if (AP4_FAILED(result = Advance())) -+ return result; -+ sample_index = 0; -+ } -+ return SetSampleIndex(tracker->m_Track->GetId(), sample_index); -+} -+ - /*---------------------------------------------------------------------- - | AP4_LinearReader::GetNextSample - +---------------------------------------------------------------------*/ -@@ -633,5 +725,5 @@ AP4_DecryptingSampleReader::ReadSampleData(AP4_Sample& sample, - AP4_Result result = sample.ReadData(m_DataBuffer); - if (AP4_FAILED(result)) return result; - -- return m_Decrypter->DecryptSampleData(m_DataBuffer, sample_data); -+ return m_Decrypter->DecryptSampleData(0, m_DataBuffer, sample_data); - } -diff --git a/Source/C++/Core/Ap4LinearReader.h b/Source/C++/Core/Ap4LinearReader.h -index 549cb5f..21f4871 100644 ---- a/Source/C++/Core/Ap4LinearReader.h -+++ b/Source/C++/Core/Ap4LinearReader.h -@@ -85,6 +85,8 @@ public: - AP4_Result SetSampleIndex(AP4_UI32 track_id, AP4_UI32 sample_index); - - AP4_Result SeekTo(AP4_UI32 time_ms, AP4_UI32* actual_time_ms = 0); -+ -+ AP4_Result SeekSample(AP4_UI32 track_id, AP4_UI64 ts, AP4_Ordinal &sample_index, bool preceedingSync); - - // accessors - AP4_Size GetBufferFullness() { return m_BufferFullness; } -@@ -169,8 +171,10 @@ protected: - AP4_Result ReadNextSample(AP4_Sample& sample, - AP4_DataBuffer* sample_data, - AP4_UI32& track_id); -+ AP4_Result GetSample(AP4_UI32 track_id, AP4_Sample &sample, AP4_Ordinal sample_index); - void FlushQueue(Tracker* tracker); - void FlushQueues(); -+ void Reset(); - - // members - AP4_Movie& m_Movie; -diff --git a/Source/C++/Core/Ap4Marlin.cpp b/Source/C++/Core/Ap4Marlin.cpp -index d0ddd3f..c1aa8b6 100644 ---- a/Source/C++/Core/Ap4Marlin.cpp -+++ b/Source/C++/Core/Ap4Marlin.cpp -@@ -431,7 +431,8 @@ AP4_MarlinIpmpSampleDecrypter::GetDecryptedSampleSize(AP4_Sample& sample) - | AP4_MarlinIpmpSampleDecrypter::DecryptSampleData - +---------------------------------------------------------------------*/ - AP4_Result --AP4_MarlinIpmpSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, -+AP4_MarlinIpmpSampleDecrypter::DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* /*iv*/) - { -@@ -630,7 +631,7 @@ AP4_Result - AP4_MarlinIpmpTrackDecrypter::ProcessSample(AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out) - { -- return m_SampleDecrypter->DecryptSampleData(data_in, data_out); -+ return m_SampleDecrypter->DecryptSampleData(0, data_in, data_out); - } - - /*---------------------------------------------------------------------- -diff --git a/Source/C++/Core/Ap4Marlin.h b/Source/C++/Core/Ap4Marlin.h -index 774e04f..9280ad6 100644 ---- a/Source/C++/Core/Ap4Marlin.h -+++ b/Source/C++/Core/Ap4Marlin.h -@@ -118,7 +118,8 @@ public: - - // AP4_SampleDecrypter methods - AP4_Size GetDecryptedSampleSize(AP4_Sample& sample); -- AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, -+ AP4_Result DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* iv = NULL); - -diff --git a/Source/C++/Core/Ap4MoovAtom.cpp b/Source/C++/Core/Ap4MoovAtom.cpp -index 1ceab49..fbeee4f 100644 ---- a/Source/C++/Core/Ap4MoovAtom.cpp -+++ b/Source/C++/Core/Ap4MoovAtom.cpp -@@ -31,6 +31,7 @@ - +---------------------------------------------------------------------*/ - #include "Ap4MoovAtom.h" - #include "Ap4TrakAtom.h" -+#include "Ap4PsshAtom.h" - #include "Ap4AtomFactory.h" - - /*---------------------------------------------------------------------- -@@ -61,6 +62,29 @@ private: - AP4_List* m_TrakAtoms; - }; - -+/*---------------------------------------------------------------------- -+| AP4_PsshAtomCollector -++---------------------------------------------------------------------*/ -+class AP4_PsshAtomCollector : public AP4_List::Item::Operator -+{ -+public: -+ AP4_PsshAtomCollector(AP4_List* pssh_atoms) : -+ m_PsshAtoms(pssh_atoms) {} -+ -+ AP4_Result Action(AP4_Atom* atom) const { -+ if (atom->GetType() == AP4_ATOM_TYPE_PSSH) { -+ AP4_PsshAtom* pssh = AP4_DYNAMIC_CAST(AP4_PsshAtom, atom); -+ if (pssh) { -+ m_PsshAtoms->Add(pssh); -+ } -+ } -+ return AP4_SUCCESS; -+ } -+ -+private: -+ AP4_List* m_PsshAtoms; -+}; -+ - /*---------------------------------------------------------------------- - | AP4_MoovAtom::AP4_MoovAtom - +---------------------------------------------------------------------*/ -@@ -80,7 +104,9 @@ AP4_MoovAtom::AP4_MoovAtom(AP4_UI32 size, - m_TimeScale(0) - { - // collect all trak atoms -- m_Children.Apply(AP4_TrakAtomCollector(&m_TrakAtoms)); -+ m_Children.Apply(AP4_TrakAtomCollector(&m_TrakAtoms)); -+ // collect all pssh atoms -+ m_Children.Apply(AP4_PsshAtomCollector(&m_PsshAtoms)); - } - - /*---------------------------------------------------------------------- -diff --git a/Source/C++/Core/Ap4MoovAtom.h b/Source/C++/Core/Ap4MoovAtom.h -index f06b2a1..d1a0147 100644 ---- a/Source/C++/Core/Ap4MoovAtom.h -+++ b/Source/C++/Core/Ap4MoovAtom.h -@@ -40,6 +40,7 @@ - +---------------------------------------------------------------------*/ - class AP4_AtomFactory; - class AP4_TrakAtom; -+class AP4_PsshAtom; - - /*---------------------------------------------------------------------- - | AP4_MoovAtom -@@ -61,6 +62,9 @@ public: - AP4_List& GetTrakAtoms() { - return m_TrakAtoms; - } -+ AP4_List& GetPsshAtoms() { -+ return m_PsshAtoms; -+ } - AP4_UI32 GetTimeScale() { - return m_TimeScale; - } -@@ -77,6 +81,7 @@ private: - AP4_AtomFactory& atom_factory); - - // members -+ AP4_List m_PsshAtoms; - AP4_List m_TrakAtoms; - AP4_UI32 m_TimeScale; - }; -diff --git a/Source/C++/Core/Ap4Movie.cpp b/Source/C++/Core/Ap4Movie.cpp -index b080b53..9617494 100644 ---- a/Source/C++/Core/Ap4Movie.cpp -+++ b/Source/C++/Core/Ap4Movie.cpp -@@ -32,6 +32,7 @@ - #include "Ap4File.h" - #include "Ap4Atom.h" - #include "Ap4TrakAtom.h" -+#include "Ap4PsshAtom.h" - #include "Ap4MoovAtom.h" - #include "Ap4MvhdAtom.h" - #include "Ap4AtomFactory.h" -@@ -110,6 +111,15 @@ AP4_Movie::AP4_Movie(AP4_MoovAtom* moov, AP4_ByteStream& sample_stream, bool tra - time_scale = 0; - } - -+ // get the pssh atoms -+ AP4_List* pssh_atoms; -+ pssh_atoms = &moov->GetPsshAtoms(); -+ AP4_List::Item* pssh_item = pssh_atoms->FirstItem(); -+ while (pssh_item) { -+ m_PsshAtoms.Append(*pssh_item->GetData()); -+ pssh_item = pssh_item->GetNext(); -+ } -+ - // get all tracks - AP4_List* trak_atoms; - trak_atoms = &moov->GetTrakAtoms(); -diff --git a/Source/C++/Core/Ap4Movie.h b/Source/C++/Core/Ap4Movie.h -index 21ef173..04992a4 100644 ---- a/Source/C++/Core/Ap4Movie.h -+++ b/Source/C++/Core/Ap4Movie.h -@@ -37,6 +37,7 @@ - #include "Ap4MvhdAtom.h" - #include "Ap4Track.h" - #include "Ap4List.h" -+#include "Ap4PsshAtom.h" - - /*---------------------------------------------------------------------- - | class references -@@ -60,6 +61,8 @@ public: - AP4_Result Inspect(AP4_AtomInspector& inspector); - - AP4_MoovAtom* GetMoovAtom() { return m_MoovAtom;} -+ void SetMoovAtom(AP4_MoovAtom* atom) { m_MoovAtom = atom; } -+ AP4_Array& GetPsshAtoms() { return m_PsshAtoms; } - AP4_MvhdAtom* GetMvhdAtom() { return m_MvhdAtom;} - AP4_List& GetTracks() { return m_Tracks; } - AP4_Track* GetTrack(AP4_UI32 track_id); -@@ -75,6 +78,7 @@ private: - AP4_MoovAtom* m_MoovAtom; - bool m_MoovAtomIsOwned; - AP4_MvhdAtom* m_MvhdAtom; -+ AP4_Array m_PsshAtoms; - AP4_List m_Tracks; - }; - -diff --git a/Source/C++/Core/Ap4OmaDcf.cpp b/Source/C++/Core/Ap4OmaDcf.cpp -index 17099a1..4eefbaf 100644 ---- a/Source/C++/Core/Ap4OmaDcf.cpp -+++ b/Source/C++/Core/Ap4OmaDcf.cpp -@@ -436,7 +436,8 @@ AP4_OmaDcfCtrSampleDecrypter::~AP4_OmaDcfCtrSampleDecrypter() - | AP4_OmaDcfCtrSampleDecrypter::DecryptSampleData - +---------------------------------------------------------------------*/ - AP4_Result --AP4_OmaDcfCtrSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, -+AP4_OmaDcfCtrSampleDecrypter::DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* /*iv*/) - { -@@ -531,7 +532,8 @@ AP4_OmaDcfCbcSampleDecrypter::~AP4_OmaDcfCbcSampleDecrypter() - | AP4_OmaDbcCbcSampleDecrypter::DecryptSampleData - +---------------------------------------------------------------------*/ - AP4_Result --AP4_OmaDcfCbcSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, -+AP4_OmaDcfCbcSampleDecrypter::DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* /*iv*/) - { -@@ -853,7 +855,7 @@ AP4_Result - AP4_OmaDcfTrackDecrypter::ProcessSample(AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out) - { -- return m_Cipher->DecryptSampleData(data_in, data_out); -+ return m_Cipher->DecryptSampleData(0, data_in, data_out); - } - - /*---------------------------------------------------------------------- -diff --git a/Source/C++/Core/Ap4OmaDcf.h b/Source/C++/Core/Ap4OmaDcf.h -index 23f10ed..bb7b3d6 100644 ---- a/Source/C++/Core/Ap4OmaDcf.h -+++ b/Source/C++/Core/Ap4OmaDcf.h -@@ -133,7 +133,8 @@ public: - ~AP4_OmaDcfCtrSampleDecrypter(); - - // methods -- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, -+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* iv = NULL); - virtual AP4_Size GetDecryptedSampleSize(AP4_Sample& sample); -@@ -155,7 +156,8 @@ public: - ~AP4_OmaDcfCbcSampleDecrypter(); - - // methods -- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, -+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* iv = NULL); - virtual AP4_Size GetDecryptedSampleSize(AP4_Sample& sample); -diff --git a/Source/C++/Core/Ap4Protection.h b/Source/C++/Core/Ap4Protection.h -index 856f1f3..4080584 100644 ---- a/Source/C++/Core/Ap4Protection.h -+++ b/Source/C++/Core/Ap4Protection.h -@@ -393,7 +393,8 @@ public: - // methods - virtual AP4_Size GetDecryptedSampleSize(AP4_Sample& sample) { return sample.GetSize(); } - virtual AP4_Result SetSampleIndex(AP4_Ordinal /*index*/) { return AP4_SUCCESS; } -- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, -+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid, -+ AP4_DataBuffer& data_in, - AP4_DataBuffer& data_out, - const AP4_UI08* iv = NULL) = 0; - }; -diff --git a/Source/C++/Core/Ap4SampleDescription.h b/Source/C++/Core/Ap4SampleDescription.h -index 27f3136..d493f96 100644 ---- a/Source/C++/Core/Ap4SampleDescription.h -+++ b/Source/C++/Core/Ap4SampleDescription.h -@@ -101,6 +101,7 @@ const AP4_UI32 AP4_SAMPLE_FORMAT_TX3G = AP4_ATOM_TYPE('t','x','3','g'); - const AP4_UI32 AP4_SAMPLE_FORMAT_VC_1 = AP4_ATOM_TYPE('v','c','-','1'); - const AP4_UI32 AP4_SAMPLE_FORMAT_XML_ = AP4_ATOM_TYPE('x','m','l',' '); - const AP4_UI32 AP4_SAMPLE_FORMAT_STPP = AP4_ATOM_TYPE('s','t','p','p'); -+const AP4_UI32 AP4_SAMPLE_FORMAT_WVTT = AP4_ATOM_TYPE('w','v','t','t'); - const AP4_UI32 AP4_SAMPLE_FORMAT_FLAC = AP4_ATOM_TYPE('f','L','a','C'); - const AP4_UI32 AP4_SAMPLE_FORMAT_OPUS = AP4_ATOM_TYPE('O','p','u','s'); - const AP4_UI32 AP4_SAMPLE_FORMAT_VP8 = AP4_ATOM_TYPE('v','p','0','8'); -diff --git a/Source/C++/Core/Ap4UuidAtom.h b/Source/C++/Core/Ap4UuidAtom.h -index b9771bd..0ec3b08 100644 ---- a/Source/C++/Core/Ap4UuidAtom.h -+++ b/Source/C++/Core/Ap4UuidAtom.h -@@ -90,6 +90,7 @@ public: - - // methods - virtual AP4_Result WriteFields(AP4_ByteStream& stream); -+ const AP4_DataBuffer &GetData() { return m_Data; }; - - protected: - // members -diff --git a/Source/C++/Core/Ap4VpccAtom.h b/Source/C++/Core/Ap4VpccAtom.h -index 9fb60bc..929048a 100644 ---- a/Source/C++/Core/Ap4VpccAtom.h -+++ b/Source/C++/Core/Ap4VpccAtom.h -@@ -79,10 +79,13 @@ public: - AP4_UI08 GetTransferCharacteristics() { return m_TransferCharacteristics; } - AP4_UI08 GetMatrixCoefficients() { return m_MatrixCoefficients; } - const AP4_DataBuffer& GetCodecInitializationData() { return m_CodecIntializationData; } -+ const AP4_DataBuffer& GetData() { return m_Data; } - - // helpers - AP4_Result GetCodecString(AP4_UI32 container_type, AP4_String& codec); - -+protected: -+ AP4_DataBuffer m_Data; - private: - // methods - AP4_VpccAtom(AP4_UI32 size, const AP4_UI08* payload); --- -2.30.2 - diff --git a/package/bento4/0003-Backport-Smmothstream-changes.patch b/package/bento4/0003-Backport-Smmothstream-changes.patch deleted file mode 100644 index a9a577a2d918..000000000000 --- a/package/bento4/0003-Backport-Smmothstream-changes.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 97088e7bd7e84a493bea7e5fe4e808c8ac3e00ff Mon Sep 17 00:00:00 2001 -From: CastagnaIT -Date: Thu, 22 Jul 2021 10:09:24 +0200 -Subject: [PATCH] Backport Smmothstream changes - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Core/Ap4File.cpp | 14 ++++++++------ - Source/C++/Core/Ap4File.h | 6 ++++-- - Source/C++/Core/Ap4FragmentSampleTable.cpp | 2 +- - 3 files changed, 13 insertions(+), 9 deletions(-) - -diff --git a/Source/C++/Core/Ap4File.cpp b/Source/C++/Core/Ap4File.cpp -index cb20c3e..f1d2727 100644 ---- a/Source/C++/Core/Ap4File.cpp -+++ b/Source/C++/Core/Ap4File.cpp -@@ -55,13 +55,14 @@ AP4_File::AP4_File(AP4_Movie* movie) : - +---------------------------------------------------------------------*/ - AP4_File::AP4_File(AP4_ByteStream& stream, - AP4_AtomFactory& atom_factory, -- bool moov_only) : -- m_Movie(NULL), -+ bool moov_only, -+ AP4_Movie* movie) : -+ m_Movie(movie), - m_FileType(NULL), - m_MetaData(NULL), - m_MoovIsBeforeMdat(true) - { -- ParseStream(stream, atom_factory, moov_only); -+ ParseStream(stream, atom_factory, moov_only, movie); - } - - /*---------------------------------------------------------------------- -@@ -75,7 +76,7 @@ AP4_File::AP4_File(AP4_ByteStream& stream, - m_MoovIsBeforeMdat(true) - { - AP4_DefaultAtomFactory atom_factory; -- ParseStream(stream, atom_factory, moov_only); -+ ParseStream(stream, atom_factory, moov_only, m_Movie); - } - - /*---------------------------------------------------------------------- -@@ -93,12 +94,13 @@ AP4_File::~AP4_File() - void - AP4_File::ParseStream(AP4_ByteStream& stream, - AP4_AtomFactory& atom_factory, -- bool moov_only) -+ bool moov_only, -+ AP4_Movie* movie) - { - // parse top-level atoms - AP4_Atom* atom; - AP4_Position stream_position; -- bool keep_parsing = true; -+ bool keep_parsing = movie == 0; - while (keep_parsing && - AP4_SUCCEEDED(stream.Tell(stream_position)) && - AP4_SUCCEEDED(atom_factory.CreateAtomFromStream(stream, atom))) { -diff --git a/Source/C++/Core/Ap4File.h b/Source/C++/Core/Ap4File.h -index 9375258..2f00187 100644 ---- a/Source/C++/Core/Ap4File.h -+++ b/Source/C++/Core/Ap4File.h -@@ -101,7 +101,8 @@ public: - */ - AP4_File(AP4_ByteStream& stream, - AP4_AtomFactory& atom_factory, -- bool moov_only); -+ bool moov_only, -+ AP4_Movie* movie = NULL); - - /** - * Constructs an AP4_File from a stream using the default atom factory -@@ -161,7 +162,8 @@ private: - // methods - void ParseStream(AP4_ByteStream& stream, - AP4_AtomFactory& atom_factory, -- bool moov_only); -+ bool moov_only, -+ AP4_Movie* movie); - - // members - AP4_Movie* m_Movie; -diff --git a/Source/C++/Core/Ap4FragmentSampleTable.cpp b/Source/C++/Core/Ap4FragmentSampleTable.cpp -index 84e5ded..3fbb53e 100644 ---- a/Source/C++/Core/Ap4FragmentSampleTable.cpp -+++ b/Source/C++/Core/Ap4FragmentSampleTable.cpp -@@ -130,7 +130,7 @@ AP4_FragmentSampleTable::AddTrun(AP4_TrunAtom* trun, - data_offset += trun->GetDataOffset(); - } - // MS hack -- if (data_offset == moof_offset) { -+ if (data_offset < payload_offset) { - data_offset = payload_offset; - } else { - payload_offset = data_offset; --- -2.30.2 - diff --git a/package/bento4/0004-more-SPS-parameters.patch b/package/bento4/0004-more-SPS-parameters.patch deleted file mode 100644 index 7034739815e8..000000000000 --- a/package/bento4/0004-more-SPS-parameters.patch +++ /dev/null @@ -1,219 +0,0 @@ -From 25df596f009514b213c5eaf5d5eb94072391c1be Mon Sep 17 00:00:00 2001 -From: peak3d -Date: Thu, 22 Jul 2021 10:22:39 +0200 -Subject: [PATCH] more SPS parameters - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Codecs/Ap4AvcParser.cpp | 100 ++++++++++++++++++++++++++++- - Source/C++/Codecs/Ap4AvcParser.h | 22 +++++++ - Source/C++/Core/Ap4Utils.cpp | 8 +++ - Source/C++/Core/Ap4Utils.h | 2 +- - 4 files changed, 129 insertions(+), 3 deletions(-) - -diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp -index b95398b..7efb5c9 100644 ---- a/Source/C++/Codecs/Ap4AvcParser.cpp -+++ b/Source/C++/Codecs/Ap4AvcParser.cpp -@@ -30,7 +30,6 @@ - | includes - +---------------------------------------------------------------------*/ - #include "Ap4AvcParser.h" --#include "Ap4Utils.h" - - /*---------------------------------------------------------------------- - | debugging -@@ -123,6 +122,25 @@ AP4_AvcNalParser::SliceTypeName(unsigned int slice_type) - } - } - -+const int SAR[17][2] = { -+ { 0, 1 }, -+ { 1, 1 }, -+ { 12, 11 }, -+ { 10, 11 }, -+ { 16, 11 }, -+ { 40, 33 }, -+ { 24, 11 }, -+ { 20, 11 }, -+ { 32, 11 }, -+ { 80, 33 }, -+ { 18, 11 }, -+ { 15, 11 }, -+ { 64, 33 }, -+ { 160, 99 }, -+ { 4, 3 }, -+ { 3, 2 }, -+ { 2, 1 }, -+}; - /*---------------------------------------------------------------------- - | AP4_AvcNalParser::AP4_AvcNalParser - +---------------------------------------------------------------------*/ -@@ -236,7 +254,28 @@ AP4_AvcSequenceParameterSet::AP4_AvcSequenceParameterSet() : - frame_crop_left_offset(0), - frame_crop_right_offset(0), - frame_crop_top_offset(0), -- frame_crop_bottom_offset(0) -+ frame_crop_bottom_offset(0), -+ vui_parameters_present_flag(0), -+ aspect_ratio_info_present_flag(0), -+ aspect_ratio_idc(0), -+ sar_width(0), -+ sar_height(0), -+ overscan_info_present_flag(0), -+ overscan_appropriate_flag(0), -+ video_signal_type_present_flag(0), -+ video_format(0), -+ video_full_range_flag(0), -+ colour_description_present_flag(0), -+ colour_primaries(0), -+ transfer_characteristics(0), -+ matrix_coefficients(0), -+ chroma_loc_info_present_flag(0), -+ chroma_sample_loc_type_top_field(0), -+ chroma_sample_loc_type_bottom_field(0), -+ timing_info_present_flag(0), -+ num_units_in_tick(0), -+ time_scale(0), -+ fixed_frame_rate_flag(0) - { - AP4_SetMemory(scaling_list_4x4, 0, sizeof(scaling_list_4x4)); - AP4_SetMemory(use_default_scaling_matrix_4x4, 0, sizeof(use_default_scaling_matrix_4x4)); -@@ -372,7 +411,64 @@ AP4_AvcFrameParser::ParseSPS(const unsigned char* data, - sps.frame_crop_top_offset = ReadGolomb(bits); - sps.frame_crop_bottom_offset = ReadGolomb(bits); - } -+ sps.vui_parameters_present_flag = bits.ReadBit(); -+ if (sps.vui_parameters_present_flag) { -+ sps.aspect_ratio_info_present_flag = bits.ReadBit(); -+ if (sps.aspect_ratio_info_present_flag) { -+ sps.aspect_ratio_idc = bits.ReadBits(8); -+ if (sps.aspect_ratio_idc == 0xFF) -+ { -+ sps.sar_width = bits.ReadBits(16); -+ sps.sar_height = bits.ReadBits(16); -+ } -+ else if (sps.aspect_ratio_idc < 17) -+ { -+ sps.sar_width = SAR[sps.aspect_ratio_idc][0]; -+ sps.sar_height = SAR[sps.aspect_ratio_idc][1]; -+ } -+ } -+ sps.overscan_info_present_flag = bits.ReadBit(); -+ if (sps.overscan_info_present_flag) -+ sps.overscan_appropriate_flag = bits.ReadBit(); -+ -+ sps.video_signal_type_present_flag = bits.ReadBit(); -+ if (sps.video_signal_type_present_flag) { -+ sps.video_format = bits.ReadBits(3); -+ sps.video_full_range_flag = bits.ReadBit(); -+ sps.colour_description_present_flag = bits.ReadBit(); -+ if (sps.colour_description_present_flag) { -+ sps.colour_primaries = bits.ReadBits(8); -+ sps.transfer_characteristics = bits.ReadBits(8); -+ sps.matrix_coefficients = bits.ReadBits(8); -+ } -+ } -+ - -+ sps.chroma_loc_info_present_flag = bits.ReadBit(); -+ if (sps.chroma_loc_info_present_flag) { -+ sps.chroma_sample_loc_type_top_field = ReadGolomb(bits); -+ sps.chroma_sample_loc_type_bottom_field = ReadGolomb(bits); -+ } -+ -+ if (bits.PeekBit() && bits.BitsLeft() < 10) -+ return AP4_SUCCESS; -+ -+ sps.timing_info_present_flag = bits.ReadBit(); -+ if (sps.timing_info_present_flag) { -+#if AP4_PLATFORM_BYTE_ORDER == AP4_PLATFORM_BYTE_ORDER_BIG_ENDIAN -+ sps.num_units_in_tick = bits.ReadBits(32); -+ sps.time_scale = bits.ReadBits(32); -+#else -+ sps.num_units_in_tick = bits.ReadBits(16) << 16; -+ sps.num_units_in_tick |= bits.ReadBits(16); -+ sps.time_scale = bits.ReadBits(16) << 16; -+ sps.time_scale |= bits.ReadBits(16); -+#endif -+ if (!sps.num_units_in_tick || !sps.time_scale) -+ sps.timing_info_present_flag = 0; -+ sps.fixed_frame_rate_flag = bits.ReadBit(); -+ } -+ } - return AP4_SUCCESS; - } - -diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h -index 8f9cd6c..9f97892 100644 ---- a/Source/C++/Codecs/Ap4AvcParser.h -+++ b/Source/C++/Codecs/Ap4AvcParser.h -@@ -37,6 +37,7 @@ - #include "Ap4DataBuffer.h" - #include "Ap4NalParser.h" - #include "Ap4Array.h" -+#include "Ap4Utils.h" - - /*---------------------------------------------------------------------- - | constants -@@ -131,6 +132,27 @@ struct AP4_AvcSequenceParameterSet { - unsigned int frame_crop_right_offset; - unsigned int frame_crop_top_offset; - unsigned int frame_crop_bottom_offset; -+ unsigned int vui_parameters_present_flag; -+ unsigned int aspect_ratio_info_present_flag; -+ unsigned int aspect_ratio_idc; -+ unsigned int sar_width; -+ unsigned int sar_height; -+ unsigned int overscan_info_present_flag; -+ unsigned int overscan_appropriate_flag; -+ unsigned int video_signal_type_present_flag; -+ unsigned int video_format; -+ unsigned int video_full_range_flag; -+ unsigned int colour_description_present_flag; -+ unsigned int colour_primaries; -+ unsigned int transfer_characteristics; -+ unsigned int matrix_coefficients; -+ unsigned int chroma_loc_info_present_flag; -+ unsigned int chroma_sample_loc_type_top_field; -+ unsigned int chroma_sample_loc_type_bottom_field; -+ unsigned int timing_info_present_flag; -+ unsigned int num_units_in_tick; -+ unsigned int time_scale; -+ unsigned int fixed_frame_rate_flag; - }; - - struct AP4_AvcPictureParameterSet { -diff --git a/Source/C++/Core/Ap4Utils.cpp b/Source/C++/Core/Ap4Utils.cpp -index 96def27..6de4dba 100644 ---- a/Source/C++/Core/Ap4Utils.cpp -+++ b/Source/C++/Core/Ap4Utils.cpp -@@ -581,4 +581,12 @@ AP4_BitReader::SkipBit() - } - } - -+/*---------------------------------------------------------------------- -+| AP4_BitReader::BitsLeft -++---------------------------------------------------------------------*/ -+AP4_UI32 -+AP4_BitReader::BitsLeft() -+{ -+ return (m_Buffer.GetDataSize() - m_Position) * 8 + m_BitsCached; -+} - -diff --git a/Source/C++/Core/Ap4Utils.h b/Source/C++/Core/Ap4Utils.h -index 475bff3..e66bafa 100644 ---- a/Source/C++/Core/Ap4Utils.h -+++ b/Source/C++/Core/Ap4Utils.h -@@ -262,7 +262,7 @@ public: - AP4_Result SkipBytes(AP4_Size byte_count); - void SkipBit(); - void SkipBits(unsigned int bit_count); -- -+ AP4_UI32 BitsLeft(); - unsigned int GetBitsRead(); - - private: --- -2.30.2 - diff --git a/package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch b/package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch deleted file mode 100644 index 27b9572269f9..000000000000 --- a/package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 56e0acde44adbc5503da20dd96c31db33f744bd7 Mon Sep 17 00:00:00 2001 -From: peak3d -Date: Thu, 22 Jul 2021 10:27:50 +0200 -Subject: [PATCH] AVC extract VUI values from SPS - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Codecs/Ap4AvcParser.cpp | 54 +++++++++++++++++++++++++----- - Source/C++/Codecs/Ap4AvcParser.h | 3 +- - 2 files changed, 47 insertions(+), 10 deletions(-) - -diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp -index 7efb5c9..7f4fc34 100644 ---- a/Source/C++/Codecs/Ap4AvcParser.cpp -+++ b/Source/C++/Codecs/Ap4AvcParser.cpp -@@ -287,18 +287,54 @@ AP4_AvcSequenceParameterSet::AP4_AvcSequenceParameterSet() : - /*---------------------------------------------------------------------- - | AP4_AvcSequenceParameterSet::GetInfo - +---------------------------------------------------------------------*/ --void -+bool - AP4_AvcSequenceParameterSet::GetInfo(unsigned int& width, unsigned int& height) - { -- width = (pic_width_in_mbs_minus1+1) * 16; -- height = (2-frame_mbs_only_flag) * (pic_height_in_map_units_minus1+1) * 16; -+ unsigned int nwidth = (pic_width_in_mbs_minus1+1) * 16; -+ unsigned int nheight = (2-frame_mbs_only_flag) * (pic_height_in_map_units_minus1+1) * 16; - -- if (frame_cropping_flag) { -- unsigned int crop_h = 2*(frame_crop_left_offset+frame_crop_right_offset); -- unsigned int crop_v = 2*(frame_crop_top_offset+frame_crop_bottom_offset)*(2-frame_mbs_only_flag); -- if (crop_h < width) width -= crop_h; -- if (crop_v < height) height -= crop_v; -- } -+ if (frame_cropping_flag) { -+ unsigned int crop_h = 2*(frame_crop_left_offset+frame_crop_right_offset); -+ unsigned int crop_v = 2*(frame_crop_top_offset+frame_crop_bottom_offset)*(2-frame_mbs_only_flag); -+ if (crop_h < nwidth) nwidth -= crop_h; -+ if (crop_v < nheight) nheight -= crop_v; -+ } -+ if (nwidth != width || nheight != height) -+ { -+ width = nwidth; -+ height = nheight; -+ return true; -+ } -+ return false; -+} -+ -+/*---------------------------------------------------------------------- -+| AP4_AvcSequenceParameterSet::GetVUIInfo -++---------------------------------------------------------------------*/ -+bool -+AP4_AvcSequenceParameterSet::GetVUIInfo(unsigned int& fps_ticks, unsigned int& fps_scale, float &aspect) -+{ -+ bool ret(false); -+ if (timing_info_present_flag && fixed_frame_rate_flag) -+ { -+ if (fps_scale != (num_units_in_tick << 1) || fps_ticks != time_scale) -+ { -+ fps_scale = num_units_in_tick << 1; -+ fps_ticks = time_scale; -+ ret = true; -+ } -+ } -+ unsigned int w, h; -+ if (aspect_ratio_info_present_flag && GetInfo(w, h)) -+ { -+ float a((float)(sar_width * w) / (sar_height * h)); -+ if (a != aspect) -+ { -+ aspect = a; -+ ret = true; -+ } -+ } -+ return ret; - } - - /*---------------------------------------------------------------------- -diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h -index 9f97892..431a294 100644 ---- a/Source/C++/Codecs/Ap4AvcParser.h -+++ b/Source/C++/Codecs/Ap4AvcParser.h -@@ -91,7 +91,8 @@ typedef struct { - struct AP4_AvcSequenceParameterSet { - AP4_AvcSequenceParameterSet(); - -- void GetInfo(unsigned int& width, unsigned int& height); -+ bool GetInfo(unsigned int& width, unsigned int& height); -+ bool GetVUIInfo(unsigned int& fps_ticks, unsigned int& fps_scale, float &aspect); - - AP4_DataBuffer raw_bytes; - --- -2.30.2 - diff --git a/package/bento4/0006-Implement-SPS-Frame-parser.patch b/package/bento4/0006-Implement-SPS-Frame-parser.patch deleted file mode 100644 index d2c224ccf907..000000000000 --- a/package/bento4/0006-Implement-SPS-Frame-parser.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 441247d84e8493a49d234fe062100b049956de90 Mon Sep 17 00:00:00 2001 -From: peak3d -Date: Thu, 22 Jul 2021 10:34:42 +0200 -Subject: [PATCH] Implement SPS Frame parser - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Codecs/Ap4AvcParser.cpp | 26 ++++++++++++++++++++++++++ - Source/C++/Codecs/Ap4AvcParser.h | 5 +++++ - 2 files changed, 31 insertions(+) - -diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp -index 7f4fc34..cfa841d 100644 ---- a/Source/C++/Codecs/Ap4AvcParser.cpp -+++ b/Source/C++/Codecs/Ap4AvcParser.cpp -@@ -1112,6 +1112,32 @@ AP4_AvcFrameParser::AppendNalUnitData(const unsigned char* data, unsigned int da - m_AccessUnitData.Append(new AP4_DataBuffer(data, data_size)); - } - -+/*---------------------------------------------------------------------- -+| AP4_AvcFrameParser::Feed -++---------------------------------------------------------------------*/ -+AP4_Result AP4_AvcFrameParser::ParseFrameForSPS(const AP4_Byte* data, AP4_Size data_size, AP4_UI08 naluLengthSize, AP4_AvcSequenceParameterSet &sps) -+{ -+ if (data_size < naluLengthSize) -+ return AP4_ERROR_EOS; -+ -+ while (data_size > naluLengthSize) -+ { -+ AP4_Size nalSize(0); -+ for (unsigned int i(0); i < naluLengthSize; ++i) { nalSize = (nalSize << 8) + *data++; }; -+ data_size -= naluLengthSize; -+ if (nalSize > data_size) -+ return AP4_ERROR_INVALID_PARAMETERS; -+ -+ if ((*data & 0x1F) == AP4_AVC_NAL_UNIT_TYPE_SPS) -+ { -+ AP4_AvcFrameParser fp; -+ return fp.ParseSPS(data, data_size, sps); -+ } -+ data_size -= nalSize; -+ } -+ return AP4_SUCCESS; -+} -+ - /*---------------------------------------------------------------------- - | AP4_AvcFrameParser::Feed - +---------------------------------------------------------------------*/ -diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h -index 431a294..99c5320 100644 ---- a/Source/C++/Codecs/Ap4AvcParser.h -+++ b/Source/C++/Codecs/Ap4AvcParser.h -@@ -258,6 +258,11 @@ public: - AP4_AvcFrameParser(); - ~AP4_AvcFrameParser(); - -+ static AP4_Result ParseFrameForSPS(const AP4_Byte* data, -+ AP4_Size data_size, -+ AP4_UI08 naluLengthSize, -+ AP4_AvcSequenceParameterSet &sps); -+ - /** - * Feed some data to the parser and look for the next NAL Unit. - * --- -2.30.2 - diff --git a/package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch b/package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch deleted file mode 100644 index bd7f43465280..000000000000 --- a/package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b36f3c02a93029308654f77c01c3c04259449c5c Mon Sep 17 00:00:00 2001 -From: peak3d -Date: Thu, 22 Jul 2021 10:35:48 +0200 -Subject: [PATCH] Fix segfault when AP4_Sample's seek - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Core/Ap4LinearReader.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp -index 7cc3ebd..61dd60e 100644 ---- a/Source/C++/Core/Ap4LinearReader.cpp -+++ b/Source/C++/Core/Ap4LinearReader.cpp -@@ -482,6 +482,7 @@ AP4_LinearReader::Advance(bool read_data) - result = buffer->m_Sample->ReadData(buffer->m_Data); - } - if (AP4_FAILED(result)) { -+ buffer->m_Sample = nullptr; - delete buffer; - return result; - } --- -2.30.2 - diff --git a/package/bento4/0008-Hack-HBO.patch b/package/bento4/0008-Hack-HBO.patch deleted file mode 100644 index ed297574a835..000000000000 --- a/package/bento4/0008-Hack-HBO.patch +++ /dev/null @@ -1,214 +0,0 @@ -From 37e54320f2822bdc7eab50eb54b1fc4a452c7f60 Mon Sep 17 00:00:00 2001 -From: peak3d -Date: Thu, 22 Jul 2021 11:18:14 +0200 -Subject: [PATCH] Hack HBO - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Core/Ap4FragmentSampleTable.cpp | 8 +++++++- - Source/C++/Core/Ap4FragmentSampleTable.h | 1 + - Source/C++/Core/Ap4LinearReader.cpp | 20 +++++++++++++------- - Source/C++/Core/Ap4LinearReader.h | 3 ++- - Source/C++/Core/Ap4MovieFragment.cpp | 5 ++++- - Source/C++/Core/Ap4MovieFragment.h | 2 ++ - Source/C++/Core/Ap4Processor.cpp | 3 ++- - 7 files changed, 31 insertions(+), 11 deletions(-) - -diff --git a/Source/C++/Core/Ap4FragmentSampleTable.cpp b/Source/C++/Core/Ap4FragmentSampleTable.cpp -index 3fbb53e..cea5c7d 100644 ---- a/Source/C++/Core/Ap4FragmentSampleTable.cpp -+++ b/Source/C++/Core/Ap4FragmentSampleTable.cpp -@@ -47,6 +47,7 @@ AP4_FragmentSampleTable::AP4_FragmentSampleTable(AP4_ContainerAtom* traf, - AP4_ByteStream* sample_stream, - AP4_Position moof_offset, - AP4_Position mdat_payload_offset, -+ AP4_UI64 mdat_payload_size, - AP4_UI64 dts_origin) : - m_Duration(0) - { -@@ -73,6 +74,7 @@ AP4_FragmentSampleTable::AP4_FragmentSampleTable(AP4_ContainerAtom* traf, - } - - // process all the trun atoms -+ AP4_UI32 trun_flags(0); - for (AP4_List::Item* item = traf->GetChildren().FirstItem(); - item; - item = item->GetNext()) { -@@ -88,9 +90,13 @@ AP4_FragmentSampleTable::AP4_FragmentSampleTable(AP4_ContainerAtom* traf, - mdat_payload_offset, - dts_origin); - if (AP4_FAILED(result)) return; -+ trun_flags |= trun->GetFlags(); - } - } -- } -+ } -+ // Hack if we have a single sample and default sample size is wrong (hbo ttml) -+ if (m_Samples.ItemCount() == 1 && (trun_flags & AP4_TRUN_FLAG_SAMPLE_SIZE_PRESENT) == 0) -+ m_Samples[0].SetSize(mdat_payload_size); - } - - /*---------------------------------------------------------------------- -diff --git a/Source/C++/Core/Ap4FragmentSampleTable.h b/Source/C++/Core/Ap4FragmentSampleTable.h -index 67192de..29fa4a9 100644 ---- a/Source/C++/Core/Ap4FragmentSampleTable.h -+++ b/Source/C++/Core/Ap4FragmentSampleTable.h -@@ -57,6 +57,7 @@ class AP4_FragmentSampleTable : public AP4_SampleTable - AP4_ByteStream* sample_stream, - AP4_Position moof_offset, - AP4_Position mdat_payload_offset, // hack because MS doesn't implement the spec correctly -+ AP4_UI64 mdat_payload_size, - AP4_UI64 dts_origin=0); - virtual ~AP4_FragmentSampleTable(); - -diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp -index 61dd60e..eabeacf 100644 ---- a/Source/C++/Core/Ap4LinearReader.cpp -+++ b/Source/C++/Core/Ap4LinearReader.cpp -@@ -309,7 +309,8 @@ AP4_LinearReader::ProcessTrack(AP4_Track* track) - AP4_Result - AP4_LinearReader::ProcessMoof(AP4_ContainerAtom* moof, - AP4_Position moof_offset, -- AP4_Position mdat_payload_offset) -+ AP4_Position mdat_payload_offset, -+ AP4_UI64 mdat_payload_size) - { - AP4_Result result; - -@@ -334,7 +335,8 @@ AP4_LinearReader::ProcessMoof(AP4_ContainerAtom* moof, - ids[j], - m_FragmentStream, - moof_offset, -- mdat_payload_offset, -+ mdat_payload_offset, -+ mdat_payload_size, - tracker->m_NextDts, - sample_table); - if (AP4_FAILED(result)) return result; -@@ -382,13 +384,11 @@ AP4_LinearReader::AdvanceFragment() - AP4_Position position = 0; - m_FragmentStream->Tell(position); - -- // process the movie fragment -- result = ProcessMoof(moof, position-atom->GetSize(), position+8); -- if (AP4_FAILED(result)) return result; -- - // compute where the next fragment will be - AP4_UI32 size; - AP4_UI32 type; -+ AP4_UI64 size_64 = 0; -+ - m_FragmentStream->Tell(position); - result = m_FragmentStream->ReadUI32(size); - if (AP4_FAILED(result)) return AP4_SUCCESS; // can't read more -@@ -397,13 +397,19 @@ AP4_LinearReader::AdvanceFragment() - if (size == 0) { - m_NextFragmentPosition = 0; - } else if (size == 1) { -- AP4_UI64 size_64 = 0; - result = m_FragmentStream->ReadUI64(size_64); - if (AP4_FAILED(result)) return AP4_SUCCESS; // can't read more - m_NextFragmentPosition = position+size_64; -+ size_64 -= 8; - } else { - m_NextFragmentPosition = position+size; -+ size_64 = size; - } -+ -+ // process the movie fragment -+ result = ProcessMoof(moof, position - atom->GetSize(), position + 8, size_64 - 8); -+ if (AP4_FAILED(result)) return result; -+ - return AP4_SUCCESS; - } else { - delete atom; -diff --git a/Source/C++/Core/Ap4LinearReader.h b/Source/C++/Core/Ap4LinearReader.h -index 21f4871..929b4e1 100644 ---- a/Source/C++/Core/Ap4LinearReader.h -+++ b/Source/C++/Core/Ap4LinearReader.h -@@ -161,7 +161,8 @@ protected: - virtual AP4_Result ProcessTrack(AP4_Track* track); - virtual AP4_Result ProcessMoof(AP4_ContainerAtom* moof, - AP4_Position moof_offset, -- AP4_Position mdat_payload_offset); -+ AP4_Position mdat_payload_offset, -+ AP4_UI64 mdat_payload_size); - - // methods - Tracker* FindTracker(AP4_UI32 track_id); -diff --git a/Source/C++/Core/Ap4MovieFragment.cpp b/Source/C++/Core/Ap4MovieFragment.cpp -index 028d42d..c2ead25 100644 ---- a/Source/C++/Core/Ap4MovieFragment.cpp -+++ b/Source/C++/Core/Ap4MovieFragment.cpp -@@ -127,6 +127,7 @@ AP4_MovieFragment::CreateSampleTable(AP4_MoovAtom* moov, - AP4_ByteStream* sample_stream, - AP4_Position moof_offset, - AP4_Position mdat_payload_offset, -+ AP4_UI64 mdat_payload_size, - AP4_UI64 dts_origin, - AP4_FragmentSampleTable*& sample_table) - { -@@ -158,6 +159,7 @@ AP4_MovieFragment::CreateSampleTable(AP4_MoovAtom* moov, - sample_stream, - moof_offset, - mdat_payload_offset, -+ mdat_payload_size, - dts_origin); - return AP4_SUCCESS; - } -@@ -174,9 +176,10 @@ AP4_MovieFragment::CreateSampleTable(AP4_Movie* movie, - AP4_ByteStream* sample_stream, - AP4_Position moof_offset, - AP4_Position mdat_payload_offset, -+ AP4_UI64 mdat_payload_size, - AP4_UI64 dts_origin, - AP4_FragmentSampleTable*& sample_table) - { - AP4_MoovAtom* moov = movie?movie->GetMoovAtom():NULL; -- return CreateSampleTable(moov, track_id, sample_stream, moof_offset, mdat_payload_offset, dts_origin, sample_table); -+ return CreateSampleTable(moov, track_id, sample_stream, moof_offset, mdat_payload_offset, mdat_payload_size, dts_origin, sample_table); - } -diff --git a/Source/C++/Core/Ap4MovieFragment.h b/Source/C++/Core/Ap4MovieFragment.h -index f829411..de59c42 100644 ---- a/Source/C++/Core/Ap4MovieFragment.h -+++ b/Source/C++/Core/Ap4MovieFragment.h -@@ -70,6 +70,7 @@ public: - AP4_ByteStream* sample_stream, - AP4_Position moof_offset, - AP4_Position mdat_payload_offset, // hack because MS doesn't implement the spec properly -+ AP4_UI64 mdat_payload_size, - AP4_UI64 dts_origin, - AP4_FragmentSampleTable*& sample_table); - AP4_Result CreateSampleTable(AP4_Movie* movie, -@@ -77,6 +78,7 @@ public: - AP4_ByteStream* sample_stream, - AP4_Position moof_offset, - AP4_Position mdat_payload_offset, // hack because MS doesn't implement the spec properly -+ AP4_UI64 mdat_payload_size, - AP4_UI64 dts_origin, - AP4_FragmentSampleTable*& sample_table); - -diff --git a/Source/C++/Core/Ap4Processor.cpp b/Source/C++/Core/Ap4Processor.cpp -index c4e1d78..365d955 100644 ---- a/Source/C++/Core/Ap4Processor.cpp -+++ b/Source/C++/Core/Ap4Processor.cpp -@@ -156,6 +156,7 @@ AP4_Processor::ProcessFragments(AP4_MoovAtom* moov, - AP4_Atom* atom = locator->m_Atom; - AP4_UI64 atom_offset = locator->m_Offset; - AP4_UI64 mdat_payload_offset = atom_offset+atom->GetSize()+AP4_ATOM_HEADER_SIZE; -+ AP4_UI64 mdat_payload_size = atom->GetSize(); - AP4_Sample sample; - AP4_DataBuffer sample_data_in; - AP4_DataBuffer sample_data_out; -@@ -226,7 +227,7 @@ AP4_Processor::ProcessFragments(AP4_MoovAtom* moov, - - // create a sample table object so we can read the sample data - AP4_FragmentSampleTable* sample_table = NULL; -- result = fragment->CreateSampleTable(moov, tfhd->GetTrackId(), &input, atom_offset, mdat_payload_offset, 0, sample_table); -+ result = fragment->CreateSampleTable(moov, tfhd->GetTrackId(), &input, atom_offset, mdat_payload_offset, mdat_payload_size, 0, sample_table); - if (AP4_FAILED(result)) return result; - sample_tables.Append(sample_table); - --- -2.30.2 - diff --git a/package/bento4/0009-Android-32-ftello-fix.patch b/package/bento4/0009-Android-32-ftello-fix.patch deleted file mode 100644 index 0adca20ed087..000000000000 --- a/package/bento4/0009-Android-32-ftello-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f12fbb6f54b8302db2ab7c926a26f9189cf86532 Mon Sep 17 00:00:00 2001 -From: peak3d -Date: Thu, 22 Jul 2021 10:41:35 +0200 -Subject: [PATCH] Android 32 ftello fix - -ref: https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md -Signed-off-by: Bernd Kuhls ---- - Source/C++/Core/Ap4Config.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/C++/Core/Ap4Config.h b/Source/C++/Core/Ap4Config.h -index 422069e..c859a03 100644 ---- a/Source/C++/Core/Ap4Config.h -+++ b/Source/C++/Core/Ap4Config.h -@@ -141,10 +141,10 @@ - #endif - - #if !defined(AP4_fseek) --#define AP4_fseek fseeko -+#define AP4_fseek fseek - #endif - #if !defined(AP4_ftell) --#define AP4_ftell ftello -+#define AP4_ftell ftell - #endif - - /* some compilers (ex: MSVC 8) deprecate those, so we rename them */ --- -2.30.2 - diff --git a/package/bento4/0010-Dazn-sample-duration-workaround.patch b/package/bento4/0010-Dazn-sample-duration-workaround.patch deleted file mode 100644 index 5c64210324a4..000000000000 --- a/package/bento4/0010-Dazn-sample-duration-workaround.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 10f931c703c68b4fc856e09788dfe64579252bb8 Mon Sep 17 00:00:00 2001 -From: peak3d -Date: Thu, 22 Jul 2021 10:48:36 +0200 -Subject: [PATCH] Dazn sample duration workaround - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Core/Ap4TrunAtom.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/Source/C++/Core/Ap4TrunAtom.cpp b/Source/C++/Core/Ap4TrunAtom.cpp -index c51f21d..77b7c6d 100644 ---- a/Source/C++/Core/Ap4TrunAtom.cpp -+++ b/Source/C++/Core/Ap4TrunAtom.cpp -@@ -128,6 +128,12 @@ AP4_TrunAtom::AP4_TrunAtom(AP4_UI32 size, - for (unsigned int i=0; i 1 sequences -+ if (i && m_Entries[i].sample_duration == 1 && m_Entries[i - 1].sample_duration > 1) -+ { -+ m_Entries[i].sample_duration = m_Entries[i - 1].sample_duration >> 1; -+ m_Entries[i - 1].sample_duration -= m_Entries[i].sample_duration; -+ } - --record_fields_count; - } - if (flags & AP4_TRUN_FLAG_SAMPLE_SIZE_PRESENT) { --- -2.30.2 - diff --git a/package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch b/package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch deleted file mode 100644 index 15159af892d2..000000000000 --- a/package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 7bb5120b52814e4471a165e295acdc6b6155259e Mon Sep 17 00:00:00 2001 -From: peak3d -Date: Thu, 22 Jul 2021 11:01:12 +0200 -Subject: [PATCH] Add argument to reuse single sample decrypter - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Core/Ap4CommonEncryption.cpp | 36 ++++++++++++++++++------- - Source/C++/Core/Ap4CommonEncryption.h | 8 +++++- - Source/C++/Core/Ap4Protection.cpp | 3 ++- - 3 files changed, 35 insertions(+), 12 deletions(-) - -diff --git a/Source/C++/Core/Ap4CommonEncryption.cpp b/Source/C++/Core/Ap4CommonEncryption.cpp -index 5308200..cb5c328 100644 ---- a/Source/C++/Core/Ap4CommonEncryption.cpp -+++ b/Source/C++/Core/Ap4CommonEncryption.cpp -@@ -1967,6 +1967,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti - const AP4_UI08* key, - AP4_Size key_size, - AP4_BlockCipherFactory* block_cipher_factory, -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, - AP4_CencSampleDecrypter*& decrypter) - { - AP4_SaioAtom* saio = NULL; -@@ -1982,6 +1983,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti - saio, - saiz, - sample_encryption_atom, -+ singlesample_decrypter, - decrypter); - } - -@@ -1999,6 +2001,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti - AP4_SaioAtom*& saio, - AP4_SaizAtom*& saiz, - AP4_CencSampleEncryption*& sample_encryption_atom, -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, - AP4_CencSampleDecrypter*& decrypter) - { - // default return values -@@ -2032,6 +2035,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti - key_size, - block_cipher_factory, - reset_iv_at_each_subsample, -+ singlesample_decrypter, - decrypter); - } - -@@ -2045,6 +2049,7 @@ AP4_CencSampleDecrypter::Create(AP4_CencSampleInfoTable* sample_info_table, - AP4_Size key_size, - AP4_BlockCipherFactory* block_cipher_factory, - bool reset_iv_at_each_subsample, -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, - AP4_CencSampleDecrypter*& decrypter) - { - // default return value -@@ -2074,15 +2079,23 @@ AP4_CencSampleDecrypter::Create(AP4_CencSampleInfoTable* sample_info_table, - - // create a single-sample decrypter - AP4_CencSingleSampleDecrypter* single_sample_decrypter = NULL; -- AP4_Result result = AP4_CencSingleSampleDecrypter::Create(cipher_type, -- key, -- key_size, -- sample_info_table->GetCryptByteBlock(), -- sample_info_table->GetSkipByteBlock(), -- block_cipher_factory, -- reset_iv_at_each_subsample, -- single_sample_decrypter); -- if (AP4_FAILED(result)) return result; -+ if (!singlesample_decrypter) -+ { -+ AP4_Result result = AP4_CencSingleSampleDecrypter::Create(cipher_type, -+ key, -+ key_size, -+ sample_info_table->GetCryptByteBlock(), -+ sample_info_table->GetSkipByteBlock(), -+ block_cipher_factory, -+ reset_iv_at_each_subsample, -+ single_sample_decrypter); -+ -+ if (AP4_FAILED(result)) return result; -+ } -+ else -+ { -+ single_sample_decrypter = singlesample_decrypter; -+ } - - // create the decrypter - decrypter = new AP4_CencSampleDecrypter(single_sample_decrypter, sample_info_table); -@@ -2333,7 +2346,9 @@ AP4_CencFragmentDecrypter::ProcessSample(AP4_DataBuffer& data_in, - | AP4_CencDecryptingProcessor::AP4_CencDecryptingProcessor - +---------------------------------------------------------------------*/ - AP4_CencDecryptingProcessor::AP4_CencDecryptingProcessor(const AP4_ProtectionKeyMap* key_map, -- AP4_BlockCipherFactory* block_cipher_factory) : -+ AP4_BlockCipherFactory* block_cipher_factory, -+ AP4_CencSingleSampleDecrypter *cenc_singlesample_decrypter) : -+ m_CencSingleSampleDecrypter(cenc_singlesample_decrypter), - m_KeyMap(key_map) - { - if (block_cipher_factory) { -@@ -2483,6 +2498,7 @@ AP4_CencDecryptingProcessor::CreateFragmentHandler(AP4_TrakAtom* trak, - saio, - saiz, - sample_encryption_atom, -+ m_CencSingleSampleDecrypter, - sample_decrypter); - if (AP4_FAILED(result)) return NULL; - -diff --git a/Source/C++/Core/Ap4CommonEncryption.h b/Source/C++/Core/Ap4CommonEncryption.h -index 580de66..a6b20ce 100644 ---- a/Source/C++/Core/Ap4CommonEncryption.h -+++ b/Source/C++/Core/Ap4CommonEncryption.h -@@ -48,6 +48,7 @@ class AP4_SaioAtom; - class AP4_CencSampleInfoTable; - class AP4_AvcFrameParser; - class AP4_HevcFrameParser; -+class AP4_CencSingleSampleDecrypter; - - /*---------------------------------------------------------------------- - | constants -@@ -654,7 +655,8 @@ class AP4_CencDecryptingProcessor : public AP4_Processor - public: - // constructor - AP4_CencDecryptingProcessor(const AP4_ProtectionKeyMap* key_map, -- AP4_BlockCipherFactory* block_cipher_factory = NULL); -+ AP4_BlockCipherFactory* block_cipher_factory = NULL, -+ AP4_CencSingleSampleDecrypter* cenc_singlesample_decrypter = NULL); - - // AP4_Processor methods - virtual AP4_Processor::TrackHandler* CreateTrackHandler(AP4_TrakAtom* trak); -@@ -670,6 +672,7 @@ protected: - - // members - AP4_BlockCipherFactory* m_BlockCipherFactory; -+ AP4_CencSingleSampleDecrypter* m_CencSingleSampleDecrypter; - const AP4_ProtectionKeyMap* m_KeyMap; - }; - -@@ -752,6 +755,7 @@ public: - AP4_SaioAtom*& saio_atom, // [out] - AP4_SaizAtom*& saiz_atom, // [out] - AP4_CencSampleEncryption*& sample_encryption_atom, // [out] -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, - AP4_CencSampleDecrypter*& decrypter); - - static AP4_Result Create(AP4_ProtectedSampleDescription* sample_description, -@@ -761,6 +765,7 @@ public: - const AP4_UI08* key, - AP4_Size key_size, - AP4_BlockCipherFactory* block_cipher_factory, -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, - AP4_CencSampleDecrypter*& decrypter); - - static AP4_Result Create(AP4_CencSampleInfoTable* sample_info_table, -@@ -769,6 +774,7 @@ public: - AP4_Size key_size, - AP4_BlockCipherFactory* block_cipher_factory, - bool reset_iv_at_each_subsample, -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, - AP4_CencSampleDecrypter*& decrypter); - - // methods -diff --git a/Source/C++/Core/Ap4Protection.cpp b/Source/C++/Core/Ap4Protection.cpp -index fd421e9..80bb9f0 100644 ---- a/Source/C++/Core/Ap4Protection.cpp -+++ b/Source/C++/Core/Ap4Protection.cpp -@@ -812,7 +812,8 @@ AP4_SampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_description, - aux_info_data_offset, - key, - key_size, -- block_cipher_factory, -+ block_cipher_factory, -+ NULL, - decrypter); - if (AP4_FAILED(result)) return NULL; - return decrypter; --- -2.30.2 - diff --git a/package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch b/package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch deleted file mode 100644 index d20e1191bf7e..000000000000 --- a/package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 91e148a9c53811447d35c36d9f11f767d49477a0 Mon Sep 17 00:00:00 2001 -From: Glenn Guy -Date: Thu, 22 Jul 2021 11:04:26 +0200 -Subject: [PATCH] Static ReadGolomb/SignedGolomb - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Codecs/Ap4AvcParser.cpp | 8 ++++---- - Source/C++/Codecs/Ap4AvcParser.h | 3 +++ - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp -index cfa841d..a17b698 100644 ---- a/Source/C++/Codecs/Ap4AvcParser.cpp -+++ b/Source/C++/Codecs/Ap4AvcParser.cpp -@@ -191,8 +191,8 @@ AP4_AvcFrameParser::~AP4_AvcFrameParser() - /*---------------------------------------------------------------------- - | ReadGolomb - +---------------------------------------------------------------------*/ --static unsigned int --ReadGolomb(AP4_BitReader& bits) -+unsigned int -+AP4_AvcFrameParser::ReadGolomb(AP4_BitReader& bits) - { - unsigned int leading_zeros = 0; - while (bits.ReadBit() == 0) { -@@ -209,8 +209,8 @@ ReadGolomb(AP4_BitReader& bits) - /*---------------------------------------------------------------------- - | SignedGolomb - +---------------------------------------------------------------------*/ --static int --SignedGolomb(unsigned int code_num) -+int -+AP4_AvcFrameParser::SignedGolomb(unsigned int code_num) - { - if (code_num % 2) { - return (code_num+1)/2; -diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h -index 99c5320..0c74c0e 100644 ---- a/Source/C++/Codecs/Ap4AvcParser.h -+++ b/Source/C++/Codecs/Ap4AvcParser.h -@@ -321,6 +321,9 @@ public: - unsigned int nal_ref_idc, - AP4_AvcSliceHeader& slice_header); - -+ static unsigned int ReadGolomb(AP4_BitReader& bits); -+ static int SignedGolomb(unsigned int code_num); -+ - private: - // methods - bool SameFrame(unsigned int nal_unit_type_1, unsigned int nal_ref_idc_1, AP4_AvcSliceHeader& sh1, --- -2.30.2 - diff --git a/package/bento4/0013-Add-GetChannels-method.patch b/package/bento4/0013-Add-GetChannels-method.patch deleted file mode 100644 index 7e3f6e69acae..000000000000 --- a/package/bento4/0013-Add-GetChannels-method.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 15e31e3641e4f85475984bf4d9ebf8ae47303a8a Mon Sep 17 00:00:00 2001 -From: peak3d -Date: Thu, 22 Jul 2021 11:07:13 +0200 -Subject: [PATCH] Add GetChannels method - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Core/Ap4Dac3Atom.cpp | 6 ++++++ - Source/C++/Core/Ap4Dac3Atom.h | 1 + - 2 files changed, 7 insertions(+) - -diff --git a/Source/C++/Core/Ap4Dac3Atom.cpp b/Source/C++/Core/Ap4Dac3Atom.cpp -index 80a511e..a9ea78a 100644 ---- a/Source/C++/Core/Ap4Dac3Atom.cpp -+++ b/Source/C++/Core/Ap4Dac3Atom.cpp -@@ -143,3 +143,9 @@ AP4_Dac3Atom::InspectFields(AP4_AtomInspector& inspector) - inspector.AddField("lfeon", m_StreamInfo.lfeon); - return AP4_SUCCESS; - } -+ -+AP4_UI08 AP4_Dac3Atom::GetChannels() const -+{ -+ static const AP4_UI08 CC[] = { 2, 1, 2, 3, 3, 4, 4, 5 }; -+ return CC[m_StreamInfo.acmod] + m_StreamInfo.lfeon; -+} -diff --git a/Source/C++/Core/Ap4Dac3Atom.h b/Source/C++/Core/Ap4Dac3Atom.h -index 2532ef2..78e2875 100644 ---- a/Source/C++/Core/Ap4Dac3Atom.h -+++ b/Source/C++/Core/Ap4Dac3Atom.h -@@ -73,6 +73,7 @@ public: - const AP4_DataBuffer& GetRawBytes() const { return m_RawBytes; } - unsigned int GetDataRate() const { return m_DataRate; } - const StreamInfo& GetStreamInfo() const { return m_StreamInfo; } -+ AP4_UI08 GetChannels() const; - - private: - // methods --- -2.30.2 - diff --git a/package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch b/package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch deleted file mode 100644 index a2bc7aefebe2..000000000000 --- a/package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f673675843144785658a010bab455972d83af004 Mon Sep 17 00:00:00 2001 -From: peak3d -Date: Thu, 22 Jul 2021 11:09:37 +0200 -Subject: [PATCH] Implemented - GetSampleIndexForTimeStamp/GetNearestSyncSampleIndex - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Core/Ap4FragmentSampleTable.cpp | 25 ++++++++++++++++++---- - 1 file changed, 21 insertions(+), 4 deletions(-) - -diff --git a/Source/C++/Core/Ap4FragmentSampleTable.cpp b/Source/C++/Core/Ap4FragmentSampleTable.cpp -index cea5c7d..1c62f24 100644 ---- a/Source/C++/Core/Ap4FragmentSampleTable.cpp -+++ b/Source/C++/Core/Ap4FragmentSampleTable.cpp -@@ -297,10 +297,19 @@ AP4_FragmentSampleTable::GetSampleChunkPosition(AP4_Ordinal sample_index, - | AP4_FragmentSampleTable::GetSampleIndexForTimeStamp - +---------------------------------------------------------------------*/ - AP4_Result --AP4_FragmentSampleTable::GetSampleIndexForTimeStamp(AP4_UI64 /*ts*/, -+AP4_FragmentSampleTable::GetSampleIndexForTimeStamp(AP4_UI64 ts, - AP4_Ordinal& sample_index) - { -- sample_index = 0; // TODO -+ if (!m_Samples.ItemCount()) -+ return AP4_ERROR_NOT_ENOUGH_DATA; -+ -+ sample_index = 0; -+ while (sample_index < m_Samples.ItemCount() && m_Samples[sample_index].GetCts() + m_Samples[sample_index].GetDuration() < ts) -+ ++sample_index; -+ -+ if (sample_index == m_Samples.ItemCount()) -+ return AP4_ERROR_NOT_ENOUGH_DATA; -+ - return AP4_SUCCESS; - } - -@@ -308,8 +317,16 @@ AP4_FragmentSampleTable::GetSampleIndexForTimeStamp(AP4_UI64 /*ts*/, - | AP4_FragmentSampleTable::GetNearestSyncSampleIndex - +---------------------------------------------------------------------*/ - AP4_Ordinal --AP4_FragmentSampleTable::GetNearestSyncSampleIndex(AP4_Ordinal /*sample_index*/, bool /*before*/) -+AP4_FragmentSampleTable::GetNearestSyncSampleIndex(AP4_Ordinal sample_index, bool before) - { -- return 0; // TODO -+ if (sample_index >= m_Samples.ItemCount()) -+ return sample_index; -+ -+ AP4_Ordinal end(before ? 0 : m_Samples.ItemCount()); -+ -+ while (sample_index != end && !m_Samples[sample_index].IsSync()) -+ sample_index = sample_index + (before ? -1 : 1); -+ -+ return sample_index; - } - --- -2.30.2 - diff --git a/package/bento4/0015-Avoid-set-next-fragment-position.patch b/package/bento4/0015-Avoid-set-next-fragment-position.patch deleted file mode 100644 index ded33ffdaf29..000000000000 --- a/package/bento4/0015-Avoid-set-next-fragment-position.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0658d38be16c88585b248b237895b4dc63f28e79 Mon Sep 17 00:00:00 2001 -From: peak3d -Date: Thu, 22 Jul 2021 11:23:13 +0200 -Subject: [PATCH] Avoid set next fragment position - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Core/Ap4LinearReader.cpp | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp -index eabeacf..61c3a9d 100644 ---- a/Source/C++/Core/Ap4LinearReader.cpp -+++ b/Source/C++/Core/Ap4LinearReader.cpp -@@ -54,8 +54,8 @@ AP4_LinearReader::AP4_LinearReader(AP4_Movie& movie, - m_HasFragments = movie.HasFragments(); - if (fragment_stream) { - fragment_stream->AddReference(); -- fragment_stream->Tell(m_CurrentFragmentPosition); -- m_NextFragmentPosition = m_CurrentFragmentPosition; -+ //fragment_stream->Tell(m_CurrentFragmentPosition); -+ //m_NextFragmentPosition = m_CurrentFragmentPosition; - } - } - -@@ -360,9 +360,11 @@ AP4_LinearReader::AdvanceFragment() - AP4_Result result; - - // go the the start of the next fragment -- result = m_FragmentStream->Seek(m_NextFragmentPosition); -- if (AP4_FAILED(result)) return result; -- m_CurrentFragmentPosition = m_NextFragmentPosition; -+ if (m_NextFragmentPosition) { -+ result = m_FragmentStream->Seek(m_NextFragmentPosition); -+ if (AP4_FAILED(result)) return result; -+ m_CurrentFragmentPosition = m_NextFragmentPosition; -+ } - - // read atoms until we find a moof - assert(m_HasFragments); --- -2.30.2 - diff --git a/package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch b/package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch deleted file mode 100644 index cbcc62f9825b..000000000000 --- a/package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e5b37c1e0a7a84fdc7b403c5e30a5e93706104b8 Mon Sep 17 00:00:00 2001 -From: Dobroslaw Kijowski -Date: Tue, 19 Oct 2021 14:17:11 +0200 -Subject: [PATCH] Fix segfault in Ap4LinearReader ProcessMoof - -Downloaded from https://github.com/xbmc/inputstream.adaptive/pull/856 - -Signed-off-by: Bernd Kuhls ---- - Source/C++/Core/Ap4LinearReader.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp -index 61c3a9d..2464865 100644 ---- a/Source/C++/Core/Ap4LinearReader.cpp -+++ b/Source/C++/Core/Ap4LinearReader.cpp -@@ -329,7 +329,7 @@ AP4_LinearReader::ProcessMoof(AP4_ContainerAtom* moof, - tracker->m_SampleTable = NULL; - tracker->m_NextSampleIndex = 0; - for (unsigned int j=0; jm_Track->GetId()) { -+ if (ids.ItemCount()==1 || ids[j] == tracker->m_Track->GetId()) { - AP4_FragmentSampleTable* sample_table = NULL; - result = m_Fragment->CreateSampleTable(&m_Movie, - ids[j], --- -2.33.1 diff --git a/package/bento4/bento4.hash b/package/bento4/bento4.hash index 8b9ec610f514..8e2033dc980b 100644 --- a/package/bento4/bento4.hash +++ b/package/bento4/bento4.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9f3eb912207d7ed9c1e6e05315083404b32a11f8aacd604a9b2bdcb10bf79eb9 bento4-1.6.0-639.tar.gz +sha256 8afa4ae07a7629a65e0d5014750960ced33a8771d363652f3913261fb5d0c84f bento4-1.6.0-639-6-Nexus.tar.gz sha256 7daae92c8628ada28def8d096fe2fde298b72ec3e2d64a3c408afce38edb361b Documents/LICENSE.txt diff --git a/package/bento4/bento4.mk b/package/bento4/bento4.mk index 89ff2e4b85a2..a2e0805c174b 100644 --- a/package/bento4/bento4.mk +++ b/package/bento4/bento4.mk @@ -4,8 +4,8 @@ # ################################################################################ -BENTO4_VERSION = 1.6.0-639 -BENTO4_SITE = $(call github,axiomatic-systems,Bento4,v$(BENTO4_VERSION)) +BENTO4_VERSION = 1.6.0-639-6-Nexus +BENTO4_SITE = $(call github,xbmc,Bento4,$(BENTO4_VERSION)) BENTO4_INSTALL_STAGING = YES BENTO4_LICENSE = GPL-2.0+ BENTO4_LICENSE_FILES = Documents/LICENSE.txt From d8c647c204242e6f2fd6086b4aebaa5bb91043d5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:44:49 +0200 Subject: [PATCH 0389/2890] package/kodi: bump version to 20.1-Nexus Replaced patch 0002 to fix python detection with new version due to upstream changes: https://github.com/xbmc/xbmc/pull/21597#issuecomment-1166365667 Removed patches which were applied upstream. Bump gcc requirement as kodi depends on C++17. Rework configure options. Signed-off-by: Bernd Kuhls [yann.morin.1998@free.fr: - git-format patch 0002 - add upstream tag to patch 0002 - regenerate .checkpackageignore ] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 3 - .../kodi-jsonschemabuilder.mk | 2 +- .../kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/0002-cmake-findpython.patch | 135 ------------------ ...2-cmake-modules-fix-python-detection.patch | 28 ++++ ...-cmake-search-for-python-interpreter.patch | 48 ------- ...-allow-to-override-PYTHON_EXECUTABLE.patch | 39 ----- package/kodi/Config.in | 6 +- package/kodi/kodi.hash | 8 +- package/kodi/kodi.mk | 16 ++- 10 files changed, 47 insertions(+), 240 deletions(-) delete mode 100644 package/kodi/0002-cmake-findpython.patch create mode 100644 package/kodi/0002-cmake-modules-fix-python-detection.patch delete mode 100644 package/kodi/0003-cmake-search-for-python-interpreter.patch delete mode 100644 package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch diff --git a/.checkpackageignore b/.checkpackageignore index 3eb6fdf3b5a1..dd57e8062df5 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -707,9 +707,6 @@ package/kmod/0001-fix-O_CLOEXEC.patch Upstream package/kodi-texturepacker/0001-texturepacker.patch Upstream package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch Upstream package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch Upstream -package/kodi/0002-cmake-findpython.patch Upstream -package/kodi/0003-cmake-search-for-python-interpreter.patch Upstream -package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch Upstream package/kodi/S50kodi Shellcheck Variables package/latencytop/0001-makefile.patch Upstream package/lbase64/0001-retro-compatible-with-Lua-5.1.patch Upstream diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index a13fb91afee9..72a2f05bd665 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 19.5-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 20.1-Nexus KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 9432e4bbd611..cb6b04d069cd 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 19.5-Matrix +KODI_TEXTUREPACKER_VERSION = 20.1-Nexus KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch deleted file mode 100644 index 60728aa465a8..000000000000 --- a/package/kodi/0002-cmake-findpython.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 -From: fuzzard -Date: Sat, 31 Jul 2021 19:22:08 +1000 -Subject: [PATCH] [cmake] findpython - -use cmakes (3.12+) FindPython3 module. -Provide cmake vars for user to overide specific version, and search path - -Backport of https://github.com/xbmc/xbmc/pull/20045 - -Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 4 +- - cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- - 2 files changed, 56 insertions(+), 19 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d5369798d..9bed54ef40 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4) -+cmake_minimum_required(VERSION 3.12) - if(WIN32) - # Version 3.15 is required to use "PREPEND" for dependencies - cmake_minimum_required(VERSION 3.15) -@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) - find_package(TexturePacker REQUIRED) - find_package(JsonSchemaBuilder REQUIRED) - --SET(PYTHON_VERSION 3.8) -- - if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) - MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") - elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) -diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake -index c40e12d551..35220b5426 100644 ---- a/cmake/modules/FindPython.cmake -+++ b/cmake/modules/FindPython.cmake -@@ -1,17 +1,56 @@ --# - Try to find python --# Once done this will define -+# FindPython -+# -------- -+# Finds Python3 libraries -+# -+# This module will search for the required python libraries on the system -+# If multiple versions are found, the highest version will be used. -+# -+# -------- -+# -+# the following variables influence behaviour: -+# -+# PYTHON_PATH - use external python not found in system paths -+# usage: -DPYTHON_PATH=/path/to/python/lib -+# PYTHON_VER - use exact python version, fail if not found -+# usage: -DPYTHON_VER=3.8 -+# -+# -------- -+# -+# This module will define the following variables: - # - # PYTHON_FOUND - system has PYTHON -+# PYTHON_VERSION - Python version number (Major.Minor) - # PYTHON_INCLUDE_DIRS - the python include directory - # PYTHON_LIBRARIES - The python libraries -+# PYTHON_LDFLAGS - Python provided link options -+# -+# -------- -+# -+ -+# for Depends builds, set search root dir to depends path -+if(KODI_DEPENDSBUILD) -+ set(Python3_USE_STATIC_LIBS TRUE) -+ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) -+endif() -+ -+# Provide root dir to search for Python if provided -+if(PYTHON_PATH) -+ set(Python3_ROOT_DIR ${PYTHON_PATH}) -+ -+ # unset cache var so we can generate again with a different dir (or none) if desired -+ unset(PYTHON_PATH CACHE) -+endif() -+ -+# Set specific version of Python to find if provided -+if(PYTHON_VER) -+ set(VERSION ${PYTHON_VER}) -+ set(EXACT_VER "EXACT") - --if(PKG_CONFIG_FOUND) -- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) -+ # unset cache var so we can generate again with a different ver (or none) if desired -+ unset(PYTHON_VER CACHE) - endif() - --find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) --find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) --find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) -+find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) - - if(KODI_DEPENDSBUILD) - find_library(FFI_LIBRARY ffi REQUIRED) -@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) - endif() - endif() - -- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) --else() -- find_package(PythonLibs 3.5 REQUIRED) -- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) -+ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) - endif() - --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) --if(PYTHON_FOUND) -- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) -+if(Python3_FOUND) - list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) -+ # These are all set for easy integration with the rest of our build system -+ set(PYTHON_FOUND ${Python3_FOUND}) -+ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) -+ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) -+ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) -+ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) - endif() - --mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) -+mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) --- -2.30.2 - diff --git a/package/kodi/0002-cmake-modules-fix-python-detection.patch b/package/kodi/0002-cmake-modules-fix-python-detection.patch new file mode 100644 index 000000000000..92a4ac904dfc --- /dev/null +++ b/package/kodi/0002-cmake-modules-fix-python-detection.patch @@ -0,0 +1,28 @@ +From c29c1e762e126fdb46a19fc15bcb465cf1cd6c76 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 7 May 2023 11:18:00 +0200 +Subject: [PATCH] cmake/modules: fix python detection + +Signed-off-by: Bernd Kuhls +Signed-off-by: Yann E. MORIN +Upstream: unknown +--- + cmake/modules/FindPython.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +index 782c0f51f6..a013cccf80 100644 +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -60,7 +60,7 @@ endif() + + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) + if(CORE_SYSTEM_NAME STREQUAL linux) +- if(HOST_CAN_EXECUTE_TARGET) ++ if(HOST_CAN_EXECUTE_TARGET OR DEFINED PYTHON_EXECUTABLE) + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) + else() + find_package(Python3 COMPONENTS Interpreter) +-- +2.25.1 + diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch deleted file mode 100644 index 158345a21210..000000000000 --- a/package/kodi/0003-cmake-search-for-python-interpreter.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 -From: wsnipex -Date: Thu, 19 Aug 2021 08:50:05 +0200 -Subject: [PATCH] [cmake] search for python interpreter fixes installing - eventclients on linux - -Backport of https://github.com/xbmc/xbmc/pull/20058 - -Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 - -Signed-off-by: Bernd Kuhls ---- - cmake/modules/FindPython.cmake | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake -index 35220b5426..c469ed9fb6 100644 ---- a/cmake/modules/FindPython.cmake -+++ b/cmake/modules/FindPython.cmake -@@ -20,6 +20,7 @@ - # - # PYTHON_FOUND - system has PYTHON - # PYTHON_VERSION - Python version number (Major.Minor) -+# PYTHON_EXECUTABLE - Python interpreter binary - # PYTHON_INCLUDE_DIRS - the python include directory - # PYTHON_LIBRARIES - The python libraries - # PYTHON_LDFLAGS - Python provided link options -@@ -51,6 +52,9 @@ if(PYTHON_VER) - endif() - - find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) -+if(CORE_SYSTEM_NAME STREQUAL linux) -+ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) -+endif() - - if(KODI_DEPENDSBUILD) - find_library(FFI_LIBRARY ffi REQUIRED) -@@ -73,6 +77,7 @@ if(Python3_FOUND) - list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) - # These are all set for easy integration with the rest of our build system - set(PYTHON_FOUND ${Python3_FOUND}) -+ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) - set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) - set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) - set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) --- -2.30.2 - diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch deleted file mode 100644 index d1e9b3f25f78..000000000000 --- a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Sat, 25 Sep 2021 07:41:10 +0200 -Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE - -If Kodi is being build for distro which has different python version -than host, PYTHON_EXECUTABLE must be overriden and point to distro -version. Otherwise, eventclients will be installed in wrong location and -be thus unusable. - -Use case: Cross compiling Kodi for LibreELEC - -Backport of https://github.com/xbmc/xbmc/pull/20171 - -Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 - -Signed-off-by: Bernd Kuhls ---- - cmake/modules/FindPython.cmake | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake -index c469ed9fb6..87b8368705 100644 ---- a/cmake/modules/FindPython.cmake -+++ b/cmake/modules/FindPython.cmake -@@ -77,7 +77,9 @@ if(Python3_FOUND) - list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) - # These are all set for easy integration with the rest of our build system - set(PYTHON_FOUND ${Python3_FOUND}) -- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) -+ if(NOT PYTHON_EXECUTABLE) -+ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) -+ endif() - set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) - set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) - set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) --- -2.30.2 - diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 7bd8bc2943d4..a21733ea7823 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -5,12 +5,12 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on !(BR2_i386 && !BR2_X86_CPU_HAS_SSE) depends on BR2_USE_MMU # libcdio, and others -comment "kodi needs python3 w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.9" +comment "kodi needs python3 w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 9.x" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ || BR2_TOOLCHAIN_USES_MUSL \ || !BR2_PACKAGE_PYTHON3 \ || BR2_PACKAGE_PYTHON3_PYC_ONLY @@ -55,7 +55,7 @@ menuconfig BR2_PACKAGE_KODI bool "kodi" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # C++17 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_WCHAR diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index e0f548879e42..ea9a588aebc2 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,6 +1,6 @@ # Locally computed -sha256 56e0074f27f08496b2a21af5704a15378a2f0979ae3e9fa9a50a2630d0313d19 kodi-19.5-Matrix.tar.gz -sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz -sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz -sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz +sha256 cd4158b2bc2d9593ad2f5c1cd2494957ab726b13d8379bbfb09d7d36df7b7d7e kodi-20.1-Nexus.tar.gz +sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz +sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz +sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz sha256 9d2396ef3e091d3b82bc84143e070700412984e8589513570f54e0675d1e8851 LICENSE.md diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 093b3aa9ae35..70ed27055565 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,8 +6,8 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 19.5 -KODI_VERSION_NAME = Matrix +KODI_VERSION_MAJOR = 20.1 +KODI_VERSION_NAME = Nexus KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPL-2.0 @@ -57,9 +57,9 @@ KODI_DEPENDENCIES = \ zlib # taken from tools/depends/target/*/*-VERSION -KODI_LIBDVDCSS_VERSION = 1.4.2-Leia-Beta-5 -KODI_LIBDVDNAV_VERSION = 6.0.0-Leia-Alpha-3 -KODI_LIBDVDREAD_VERSION = 6.0.0-Leia-Alpha-3 +KODI_LIBDVDCSS_VERSION = 1.4.3-Next-Nexus-Alpha2-2 +KODI_LIBDVDNAV_VERSION = 6.1.1-Next-Nexus-Alpha2-2 +KODI_LIBDVDREAD_VERSION = 6.1.3-Next-Nexus-Alpha2-2 KODI_EXTRA_DOWNLOADS += \ $(call github,xbmc,libdvdcss,$(KODI_LIBDVDCSS_VERSION))/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ $(call github,xbmc,libdvdnav,$(KODI_LIBDVDNAV_VERSION))/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ @@ -74,11 +74,15 @@ KODI_CONF_OPTS += \ -DWITH_FFMPEG=$(STAGING_DIR)/usr \ -DENABLE_INTERNAL_FLATBUFFERS=OFF \ -DFLATBUFFERS_FLATC_EXECUTABLE=$(HOST_DIR)/bin/flatc \ + -DENABLE_INTERNAL_RapidJSON=OFF \ + -DENABLE_INTERNAL_SPDLOG=OFF \ -DKODI_DEPENDSBUILD=OFF \ - -DENABLE_LDGOLD=OFF \ + -DENABLE_GOLD=OFF \ + -DHOST_CAN_EXECUTE_TARGET=FALSE \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ -DENABLE_TESTING=OFF \ + -DENABLE_DEBUGFISSION=OFF \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ From 171d4f56dcf95c356a20174d925690b4feb24e43 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:44:50 +0200 Subject: [PATCH 0390/2890] package/kodi-audiodecoder-*: mass version bump to Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash | 2 +- package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 2 +- .../kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash | 2 +- .../kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk | 2 +- .../kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash | 2 +- package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk | 2 +- .../kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash | 2 +- package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk | 2 +- .../kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash | 2 +- package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk | 2 +- .../kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash | 2 +- .../kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk | 2 +- .../kodi-audiodecoder-vgmstream.hash | 2 +- .../kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index e2bfe0992889..20f13e95f799 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6e1b1910e799ea8c5ab11428084feb8f6a0a9b1b0d4b5760033545fe765a59e9 kodi-audiodecoder-modplug-19.0.2-Matrix.tar.gz +sha256 619ba20ea19dd9aea15e7d30aa12a146b412c7fcd9e709528f6758e82a3d85e7 kodi-audiodecoder-modplug-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk index f5736e7db738..bbbada01da97 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.2-Matrix +KODI_AUDIODECODER_MODPLUG_VERSION = 20.2.0-Nexus KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index 9d1c9a2a76e7..4012353b0b12 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 631b2abded62a34bf66a6769f7b1597a418057f64d79e54322f57090e53e63e7 kodi-audiodecoder-nosefart-19.0.2-Matrix.tar.gz +sha256 2f7a92bfaddcd5aa63e2ea7348ae9eeefd07dee2aba46840ce5376677e2abc19 kodi-audiodecoder-nosefart-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk index fbf327032bb7..8954da18dee0 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.2-Matrix +KODI_AUDIODECODER_NOSEFART_VERSION = 20.2.0-Nexus KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+ KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash index 28999afb7b76..caf9390eaa99 100644 --- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash +++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a4fe4f0c48649222930c8c574156c5c3b2ad82fc97de2bdbd0c5e510402853ec kodi-audiodecoder-sidplay-19.0.1-Matrix.tar.gz +sha256 ab1f89237c91bc7157557f42dadcff50a7191eb7285ee668543defce9f1efcf2 kodi-audiodecoder-sidplay-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk index 173a2b10cad7..c30be0774b21 100644 --- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk +++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SIDPLAY_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_SIDPLAY_VERSION = 20.2.0-Nexus KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,xbmc,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION)) KODI_AUDIODECODER_SIDPLAY_LICENSE = GPL-2.0+ KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index 1a0227f415e2..3ed7483fdbaa 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b7180132472b27e71bf9f30675c0af58330f3ad07d7065492d28f3e97117c341 kodi-audiodecoder-snesapu-19.0.2-Matrix.tar.gz +sha256 f216a7d25c864986618118236c575687ab62d129a16cb1f73c15860948d9ac92 kodi-audiodecoder-snesapu-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk index ff988dffce29..577adc0bc3f1 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.2-Matrix +KODI_AUDIODECODER_SNESAPU_VERSION = 20.2.0-Nexus KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+ KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash index 5f8d4564c8ae..c4d6a68ef975 100644 --- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash +++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c740e69047d93d34cfe8c574f923f8dd205adb997fb5d1444a55a6b9d9f0f75 kodi-audiodecoder-stsound-19.0.1-Matrix.tar.gz +sha256 a8138fb075a480c59d7041a9408eca6e52dc88f188daed519cd9e684b430f333 kodi-audiodecoder-stsound-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk index 491be3a7ba1b..0fa9a654e440 100644 --- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk +++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_STSOUND_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_STSOUND_VERSION = 20.2.0-Nexus KODI_AUDIODECODER_STSOUND_SITE = $(call github,xbmc,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION)) KODI_AUDIODECODER_STSOUND_LICENSE = GPL-2.0+ KODI_AUDIODECODER_STSOUND_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash index b1131ff43d38..d8c1535395b3 100644 --- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash +++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d9aa6f00315d227a39cb67089c64671987fd9167766f37c28a91168cb8e230e kodi-audiodecoder-timidity-19.0.2-Matrix.tar.gz +sha256 ef1b384090df3c2c78d00ed33de1d989ce802702b0a9aa13575946409a5cd0f1 kodi-audiodecoder-timidity-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk index d10fd161cba7..6ec66fab9ba5 100644 --- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk +++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_TIMIDITY_VERSION = 19.0.2-Matrix +KODI_AUDIODECODER_TIMIDITY_VERSION = 20.2.0-Nexus KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,xbmc,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION)) KODI_AUDIODECODER_TIMIDITY_LICENSE = GPL-2.0+ KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash index 152f1a6eb5e0..d861b5957e3a 100644 --- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash +++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0e349225f35ce4bae3026c669b13c696cec2399ec34c0f7726527d19503e14d4 kodi-audiodecoder-vgmstream-19.0.0-Matrix.tar.gz +sha256 72367d7196f8049ef1fae426d32d3de1eac56bd4cb5a8fc38a6ba0c3da1b23d8 kodi-audiodecoder-vgmstream-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk index 15cfdcded905..78e7a9f1a214 100644 --- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk +++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_VGMSTREAM_VERSION = 19.0.0-Matrix +KODI_AUDIODECODER_VGMSTREAM_VERSION = 20.2.0-Nexus KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,xbmc,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION)) KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPL-2.0+ KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = LICENSE.md From b516744fd1eb2621efb676561460d817de3a1d04 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:44:51 +0200 Subject: [PATCH 0391/2890] package/kodi-audioencoder-*: mass version bump to Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash | 2 +- package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk | 2 +- package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash | 2 +- package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 2 +- package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash | 2 +- package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk | 2 +- package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash | 2 +- package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash index 5784c2585b1c..e54eafcdf8c2 100644 --- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash +++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fdc70c68b10e28469c8d20f5a0dcc1c24fdddda81afe98dd031bff58c8e184e8 kodi-audioencoder-flac-19.0.1-Matrix.tar.gz +sha256 71daf8c35bbf644591600fef93412cd068a6bf6173d2258dc243ee04c8e5b091 kodi-audioencoder-flac-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk index 65d5ff4aeee4..d14843cb5345 100644 --- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk +++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_FLAC_VERSION = 19.0.1-Matrix +KODI_AUDIOENCODER_FLAC_VERSION = 20.2.0-Nexus KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION)) KODI_AUDIOENCODER_FLAC_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_FLAC_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index a9cb12af6a6e..f66db7d68039 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 774e75b051b1872620a706aa5e6c8741708364ac8d9d849286c4a265dd1a22f7 kodi-audioencoder-lame-19.1.2-Matrix.tar.gz +sha256 90f36ee0b4972669ed2876eae2502e58d86287aacdbf4bb25180aca01385e1c1 kodi-audioencoder-lame-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk index fbc748978265..ce891f183833 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = 19.1.2-Matrix +KODI_AUDIOENCODER_LAME_VERSION = 20.3.0-Nexus KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION)) KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_LAME_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash index 02e976f2d435..2b551a81dff1 100644 --- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash +++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 26f5b3e60ec3d3e17ea81a009fc91886159335fb8eec56e874e357901c90deeb kodi-audioencoder-vorbis-19.0.1-Matrix.tar.gz +sha256 359e972ddcc498727620ff224a82f970fa2ae22b71ea6ab30b96898dffe6f1f9 kodi-audioencoder-vorbis-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk index 66faba19f328..451884d0bcad 100644 --- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk +++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_VORBIS_VERSION = 19.0.1-Matrix +KODI_AUDIOENCODER_VORBIS_VERSION = 20.2.0-Nexus KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION)) KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash index f616d769928d..9318b69e481f 100644 --- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash +++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 32069979efb02daaa79b8ce09e060eed73f3fa73a4614b6c67e50ee33f1b096f kodi-audioencoder-wav-19.0.1-Matrix.tar.gz +sha256 1baf69cca688ebd389705ea2bef2c5285ba75dcfd0d0b534b6ab1e61c0020979 kodi-audioencoder-wav-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk index d8c7b1a69406..b13ee8ea4c41 100644 --- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk +++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_WAV_VERSION = 19.0.1-Matrix +KODI_AUDIOENCODER_WAV_VERSION = 20.2.0-Nexus KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION)) KODI_AUDIOENCODER_WAV_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_WAV_LICENSE_FILES = LICENSE.md From efa3bdcdba716e1a3370f08e8c8cfc4c1f1e2093 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:44:52 +0200 Subject: [PATCH 0392/2890] package/kodi-inputstream-adaptive: bump version to Nexus Added dependency to bento4 needed after upstream commit https://github.com/xbmc/inputstream.adaptive/commit/70625e76702186c73ddb43440f44262c48e14755 License file renamed https://github.com/xbmc/inputstream.adaptive/commit/b555973d98e15bb40022dd1ab704d8d42efd7686 and updated upstream https://github.com/xbmc/inputstream.adaptive/commit/4b62e9e3257526e0359e0b797902ba9119633c16 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-inputstream-adaptive/Config.in | 1 + .../kodi-inputstream-adaptive.hash | 4 ++-- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/kodi-inputstream-adaptive/Config.in b/package/kodi-inputstream-adaptive/Config.in index f0a24b7043a3..3efe3aa11407 100644 --- a/package/kodi-inputstream-adaptive/Config.in +++ b/package/kodi-inputstream-adaptive/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE # wvdecrypter/cdm/build/build_config.h depends on BR2_aarch64 || BR2_arm || BR2_i386 || BR2_mipsel \ || BR2_mips64el || BR2_x86_64 + select BR2_PACKAGE_BENTO4 select BR2_PACKAGE_EXPAT help Kodi inputstream addon for several manifest types diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index a36095c38ccc..18df044c6282 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b208313fd50442cabd339a16a3beec8cfa41c1b6bf19617ffeb269144c5f65fe kodi-inputstream-adaptive-19.0.7-Matrix.tar.gz -sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL +sha256 907915228335eeb9217e6f069cbb210fffce01095a6326908015cd89165a0328 kodi-inputstream-adaptive-20.3.6-Nexus.tar.gz +sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 9da87e0e3809..1f3e86bb270e 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.7-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.6-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ -KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL -KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = expat kodi +KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.md +KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = bento4 expat kodi $(eval $(cmake-package)) From a916182beedacb2f91a61855e7d43220be14efc0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:44:53 +0200 Subject: [PATCH 0393/2890] package/kodi-inputstream-*: mass version bump to Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-inputstream-ffmpegdirect.hash | 2 +- .../kodi-inputstream-ffmpegdirect.mk | 2 +- package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash | 2 +- package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash index 888c0ca91881..7dbcee658550 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4693793a44b54204884c676a285bd371b354c426162736e5adae4ad2aa6088cf kodi-inputstream-ffmpegdirect-19.0.3-Matrix.tar.gz +sha256 a849b6b4d5ce740ec3552d244acc4c7a4d64792358428f5154236052473d5734 kodi-inputstream-ffmpegdirect-20.5.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk index 39347010b5b8..ff66f13e1454 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 19.0.3-Matrix +KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 20.5.0-Nexus KODI_INPUTSTREAM_FFMPEGDIRECT_SITE = $(call github,xbmc,inputstream.ffmpegdirect,$(KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION)) KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash index 62a1c261a27a..affe8b5171ac 100644 --- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash +++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ed3db36f9ef667295fbce8fb2be6f032039e3d0e18e34677ed17de11be8a6e8 kodi-inputstream-rtmp-19.0.1-Matrix.tar.gz +sha256 6a6129dca822e1447c0945ddf9cc6dbff1203dab313395d27efb4669a0ef3370 kodi-inputstream-rtmp-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk index b719a6ab2e57..f496fd388106 100644 --- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk +++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_RTMP_VERSION = 19.0.1-Matrix +KODI_INPUTSTREAM_RTMP_VERSION = 20.3.0-Nexus KODI_INPUTSTREAM_RTMP_SITE = $(call github,xbmc,inputstream.rtmp,$(KODI_INPUTSTREAM_RTMP_VERSION)) KODI_INPUTSTREAM_RTMP_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_RTMP_LICENSE_FILES = LICENSE.md From 06c7be82c061d883d50c9f025ee55e2bf1ec7949 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:44:54 +0200 Subject: [PATCH 0394/2890] package/kodi-peripheral-*: mass version bump to Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash | 2 +- package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 0b483f70bf66..1ccb528526eb 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a5c7c6b8b1f39c92d00289bd602ea2db13a3d3f73a50bd3f95ec08cf110a570e kodi-peripheral-joystick-19.0.4-Matrix.tar.gz +sha256 6e8fb553309d3ad48fad21d2d6cebdb537a4e2b88878b6fdc43707c7bc37e160 kodi-peripheral-joystick-20.1.8-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index db1bc2c50f34..c893ae1247a6 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.4-Matrix +KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.8-Nexus KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash index 5467513a0b95..1d9579615b92 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11f746cfeeffdfc1de6829d17aad999c8b598ca2239fcddb64801738546be6c9 kodi-peripheral-xarcade-19.0.5-Matrix.tar.gz +sha256 e6be386ebba44e214b91784ba6e1560020daac82024c18bea7be4719340b12bd kodi-peripheral-xarcade-20.1.3-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk index 2d9e33b62511..3af3f2f4ff2a 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_XARCADE_VERSION = 19.0.5-Matrix +KODI_PERIPHERAL_XARCADE_VERSION = 20.1.3-Nexus KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION)) KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+ KODI_PERIPHERAL_XARCADE_LICENSE_FILES = LICENSE.md From 7f3762ae15793c3a123453434fa8299436db818a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:44:55 +0200 Subject: [PATCH 0395/2890] package/kodi-pvr-*: mass version bump to Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash | 2 +- package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk | 2 +- package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash | 2 +- package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk | 2 +- package/kodi-pvr-filmon/kodi-pvr-filmon.hash | 2 +- package/kodi-pvr-filmon/kodi-pvr-filmon.mk | 2 +- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash | 2 +- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- .../kodi-pvr-mediaportal-tvserver.hash | 2 +- .../kodi-pvr-mediaportal-tvserver.mk | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +- package/kodi-pvr-njoy/kodi-pvr-njoy.hash | 2 +- package/kodi-pvr-njoy/kodi-pvr-njoy.mk | 2 +- package/kodi-pvr-octonet/kodi-pvr-octonet.hash | 2 +- package/kodi-pvr-octonet/kodi-pvr-octonet.mk | 2 +- package/kodi-pvr-pctv/kodi-pvr-pctv.hash | 2 +- package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 2 +- package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash | 2 +- package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +- package/kodi-pvr-vbox/kodi-pvr-vbox.hash | 2 +- package/kodi-pvr-vbox/kodi-pvr-vbox.mk | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash | 2 +- package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +- package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index 33de7d6ca011..e2f73c70c4e9 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 027e49b56c03d182fbf69ce71a84270dddb06e537814cd9ea209d4baca8d16fe kodi-pvr-argustv-19.2.1-Matrix.tar.gz +sha256 c4b18a0abf4ba0a797509d79c4291c4e69589a6482c6ec85f5d9bdae63ea3f35 kodi-pvr-argustv-20.5.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 90d0a530025a..fac90dfeb679 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.2.1-Matrix +KODI_PVR_ARGUSTV_VERSION = 20.5.0-Nexus KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash index de429ebf15ee..9d914fdbf296 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 77f425d3521332e06ff758cfd1c63eb26f73990391ddb04f0ea6f9f3f0d114cf kodi-pvr-dvblink-19.0.1-Matrix.tar.gz +sha256 71a9fa64bdf7d784afc28f8b686fcdc00d9fea536c2aad1464e76e3b7648ed41 kodi-pvr-dvblink-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk index e58711cb1173..8c0b178f75fe 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_DVBLINK_VERSION = 19.0.1-Matrix +KODI_PVR_DVBLINK_VERSION = 20.3.0-Nexus KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION)) KODI_PVR_DVBLINK_LICENSE = GPL-2.0+ KODI_PVR_DVBLINK_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash index e3ff5bd1c156..516366d7b20b 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5ccb4fa952c8909169dddd0a4c8f393ef8c1e8d35b9df0332f66a5f6442d6e85 kodi-pvr-dvbviewer-19.1.0-Matrix.tar.gz +sha256 dc79db0486c7ef75b4b23c4dfe94115cb12e1903c3700ef4eef04fc517fcd039 kodi-pvr-dvbviewer-20.4.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk index e4b00c06b5f8..914de3c72d54 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_DVBVIEWER_VERSION = 19.1.0-Matrix +KODI_PVR_DVBVIEWER_VERSION = 20.4.0-Nexus KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION)) KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+ KODI_PVR_DVBVIEWER_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash index ce6fb8f38566..7a4d5d3364b2 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5853a69455847da87ed0aebad4121f47c7a1aeb80cda6dbe20f069d33a02720b kodi-pvr-filmon-19.0.1-Matrix.tar.gz +sha256 dfd2a7b64d2b647ba3f7bfba05676a593c3284e2298becfed68b82e441a69b33 kodi-pvr-filmon-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk index c5705670f859..50dad3c47faa 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_FILMON_VERSION = 19.0.1-Matrix +KODI_PVR_FILMON_VERSION = 20.3.0-Nexus KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION)) KODI_PVR_FILMON_LICENSE = GPL-2.0+ KODI_PVR_FILMON_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index f177eabd5383..3bcfa2359357 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cfd2695f38b0c0e3c7e7490e17476c2b82e2bbf18f0993d8041c7f15f6640cdd kodi-pvr-hdhomerun-19.1.0-Matrix.tar.gz +sha256 3872265e00fc748ba327aaa91beece747936f55d16356051cdd04b0b70a353c0 kodi-pvr-hdhomerun-20.4.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index a4a448c51eb4..cc6e097efa33 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HDHOMERUN_VERSION = 19.1.0-Matrix +KODI_PVR_HDHOMERUN_VERSION = 20.4.0-Nexus KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+ KODI_PVR_HDHOMERUN_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 40cd8fd62f4c..7b55eb88fd44 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 990e5fd0757d48b86675aa124b77629e7fb2de6b27dcfd6f6ccc7ce181d04aeb kodi-pvr-hts-19.0.6-Matrix.tar.gz +sha256 e77bd87f1f4d1abc06e32d0347a0bb635bc129bec43a07864cb8a9e6b0e4d374 kodi-pvr-hts-20.6.2-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index caa90b7af64b..d32ce8738803 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 19.0.6-Matrix +KODI_PVR_HTS_VERSION = 20.6.2-Nexus KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index de71703c53fc..6be0623a5ab9 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 421a883054dd31ad512866236c364e5a564d7db9fa595dadc3e37b9169b7fe79 kodi-pvr-iptvsimple-19.3.0-Matrix.tar.gz +sha256 91ed962a4f77a2aa5df820ce57cf744c2a8ea02a356dafc2da270cf813c2d669 kodi-pvr-iptvsimple-20.10.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index e5976a7d3a00..1182ea517aed 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.3.0-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 20.10.1-Nexus KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 9f4bd973664c..37489de7dc89 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3e0ba7a111ee0f93b64d0a0cb640569b13e429b1c47c88ac737389083054d732 kodi-pvr-mediaportal-tvserver-19.0.2-Matrix.tar.gz +sha256 a61efdadb56c65e081f8b2e99f2d5b32b3c932ca1954243548710be57c8b70b8 kodi-pvr-mediaportal-tvserver-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index 1db0dca6183b..dfc7c2873be8 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 19.0.2-Matrix +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 20.3.0-Nexus KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 81270ca7d222..d0d6331364bd 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 27c2546bf512f87f230e8312abeccd61d6bbb52ec1fbd7751f19d8df3c3afd4e kodi-pvr-mythtv-19.0.11-Matrix.tar.gz +sha256 b1ad428bec882d3e852240cbef2378803635b530545a08421ff3baf0611a29e7 kodi-pvr-mythtv-20.3.2-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 8475249e5130..f67457480c5a 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.11-Matrix +KODI_PVR_MYTHTV_VERSION = 20.3.2-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 17d981705369..b89320d9c09e 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45ad0def6bbdb50fc42dc0b8a997e0db758fda42421fa7eb7643466ea512134f kodi-pvr-nextpvr-19.0.6-Matrix.tar.gz +sha256 bad9e7dd4f67348015f8fc477e0c4c8447e00dbd38b9f6548d1ce04f0845b1fd kodi-pvr-nextpvr-20.4.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index 6b3590a6d616..7b1140795496 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 19.0.6-Matrix +KODI_PVR_NEXTPVR_VERSION = 20.4.1-Nexus KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index ec78e7c84a9c..bb7f4218cf3a 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e5a6d31d1a74d8c053919f1c3c73eb9ada1e799d99f61dca171c3d8f0afa0a03 kodi-pvr-njoy-19.0.1-Matrix.tar.gz +sha256 0e8dc8ddce7830878c816da0836bdf5558c0dd388c48019012735a518eeefb04 kodi-pvr-njoy-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index 4808974c318c..d0cfc006d779 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NJOY_VERSION = 19.0.1-Matrix +KODI_PVR_NJOY_VERSION = 20.3.0-Nexus KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) KODI_PVR_NJOY_LICENSE = GPL-2.0+ KODI_PVR_NJOY_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-octonet/kodi-pvr-octonet.hash b/package/kodi-pvr-octonet/kodi-pvr-octonet.hash index 1dc9636e63a1..2342f0c836a7 100644 --- a/package/kodi-pvr-octonet/kodi-pvr-octonet.hash +++ b/package/kodi-pvr-octonet/kodi-pvr-octonet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b95a4f1d7381ebee1c9be9fca582bb0b70144271a47223ba06fc046ea595aaa kodi-pvr-octonet-19.0.0-Matrix.tar.gz +sha256 cc83ada3b3d1dbf3d42fa41f2b221c640cdc9fd505a1c76e7b479f99fe1ec8c5 kodi-pvr-octonet-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-octonet/kodi-pvr-octonet.mk b/package/kodi-pvr-octonet/kodi-pvr-octonet.mk index e2699bc44d54..84950d2514cd 100644 --- a/package/kodi-pvr-octonet/kodi-pvr-octonet.mk +++ b/package/kodi-pvr-octonet/kodi-pvr-octonet.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_OCTONET_VERSION = 19.0.0-Matrix +KODI_PVR_OCTONET_VERSION = 20.3.0-Nexus KODI_PVR_OCTONET_SITE = $(call github,DigitalDevices,pvr.octonet,$(KODI_PVR_OCTONET_VERSION)) KODI_PVR_OCTONET_LICENSE = GPL-2.0+ KODI_PVR_OCTONET_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index 04919af7d2d9..d0c340fe7818 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cd267a5b9e98b3b1b1c00feac16e2a07962641cbe53ff4c05ccb72acd925e3f8 kodi-pvr-pctv-19.0.1-Matrix.tar.gz +sha256 c99d3ef085c4900e0c03e5e37047dc136efced78ed245d07bc286468a31e8a65 kodi-pvr-pctv-20.4.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 6f8dca4b2362..4ae7bd0bc666 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PCTV_VERSION = 19.0.1-Matrix +KODI_PVR_PCTV_VERSION = 20.4.0-Nexus KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ KODI_PVR_PCTV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash index 4673bbbf883d..36a9dd41878e 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 79e753d7329a4e61e56618c0e821cdd5dccb81c3659838a9de2df407a5bd7c10 kodi-pvr-plutotv-19.0.3-Matrix.tar.gz +sha256 d38a6bf4debc442849d01faedadcccb1b07debe850cd3c9a5789508233d22256 kodi-pvr-plutotv-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk index a9ac03a007f3..b05c4528543d 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PLUTOTV_VERSION = 19.0.3-Matrix +KODI_PVR_PLUTOTV_VERSION = 20.3.0-Nexus KODI_PVR_PLUTOTV_SITE = $(call github,kodi-pvr,pvr.plutotv,$(KODI_PVR_PLUTOTV_VERSION)) KODI_PVR_PLUTOTV_LICENSE = GPL-2.0+ KODI_PVR_PLUTOTV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 167905f637a3..ed8668b2c9c6 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 191b2bd2dcbe15de29c1b867c127668784991e43817b00947cf955e569cf148e kodi-pvr-stalker-19.0.4-Matrix.tar.gz +sha256 8fdd4ab4cf28d7255550b4c351a397b7ce8eb1aa1f12e93bce7d61a951fbd6f3 kodi-pvr-stalker-20.3.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index f306c3a51bf0..763f7054adcb 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 19.0.4-Matrix +KODI_PVR_STALKER_VERSION = 20.3.1-Nexus KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash index ce3397fad5ec..1aff2dd98507 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a87926702c51e52043e595ceae530a9101761cc15e8e3cadec85ac8cc9ba8f2b kodi-pvr-vbox-19.0.0-Matrix.tar.gz +sha256 04c50eba71426f062339491e7567545ec8c910b17c7055b28285eab14f26ca6f kodi-pvr-vbox-20.4.2-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk index fd83ffef3706..60a8a819b035 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VBOX_VERSION = 19.0.0-Matrix +KODI_PVR_VBOX_VERSION = 20.4.2-Nexus KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION)) KODI_PVR_VBOX_LICENSE = GPL-2.0+ KODI_PVR_VBOX_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 3e17fd553d3c..64ecb17b1430 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 521add432b7fe38b6019f99547a440b1a2927d10f1420d518235c1c6d2e95b6b kodi-pvr-vdr-vnsi-19.0.5-Matrix.tar.gz +sha256 f26e2a9f1e9d83c5b44a8875b1f9cd37a0dbe59faf08002f083a4db95c9f84e0 kodi-pvr-vdr-vnsi-20.4.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index ebb5f117b820..02a2e2e45626 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.5-Matrix +KODI_PVR_VDR_VNSI_VERSION = 20.4.1-Nexus KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index b2a4031bd3e0..7f051071f123 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cd5658c5e40d42bc02e5c99b47c28cb24bdda4b6dd49029131ff147405d4c8a8 kodi-pvr-vuplus-19.0.1-Matrix.tar.gz +sha256 467363d7015d426f05fac3f514222d7ec03aa4b61a0935fd7f00e95e9c443514 kodi-pvr-vuplus-20.5.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index 81159e05f310..80b57f25102a 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VUPLUS_VERSION = 19.0.1-Matrix +KODI_PVR_VUPLUS_VERSION = 20.5.1-Nexus KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) KODI_PVR_VUPLUS_LICENSE = GPL-2.0+ KODI_PVR_VUPLUS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index b80ca10ae5c6..cdcaeeff9d35 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 67ae49e516dfe4328587ea36439b3f48b099d1784dd57acebe1e49e137d75b56 kodi-pvr-waipu-19.3.1-Matrix.tar.gz +sha256 5dfe9f891edefd5334c7a45593651634b43e1fdbea5a1b396131a45f5928f4aa kodi-pvr-waipu-20.8.1-Nexus.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index b20f1c641437..41f9e8281486 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 19.3.1-Matrix +KODI_PVR_WAIPU_VERSION = 20.8.1-Nexus KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index 4a04c07ac8b2..232750db33ff 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d5addd39f64f97beb6e14090561583de47f0acdc70bedb39b3037613430cc71a kodi-pvr-wmc-19.0.2-Matrix.tar.gz +sha256 f045d871789ef3d36e1a7c7361ea35be4e14a395e75446519e937be70d2433b4 kodi-pvr-wmc-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index 3bf21b3440a8..fd967317640d 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 19.0.2-Matrix +KODI_PVR_WMC_VERSION = 20.3.0-Nexus KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ KODI_PVR_WMC_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index c1d3b476b96e..1af86d4de052 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ac09db721e51b47f1ca7f4c2201833dbcd69040fd19b09c194fa7491ff4dad41 kodi-pvr-zattoo-19.7.16-Matrix.tar.gz +sha256 c75ba4710d7e85cf516005ee3eca6d677e2fc018abaf490c881bc6552eb32929 kodi-pvr-zattoo-20.3.7-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index 49b33916ee12..fa5e116fa0ff 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 19.7.16-Matrix +KODI_PVR_ZATTOO_VERSION = 20.3.7-Nexus KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md From 29d96c507697e9d78f8d7a45abfe9ced9773ec7e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:44:56 +0200 Subject: [PATCH 0396/2890] package/kodi-screensaver-*: mass version bump to Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash | 2 +- .../kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk | 2 +- .../kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash | 2 +- .../kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk | 2 +- .../kodi-screensaver-biogenesis.hash | 2 +- .../kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk | 2 +- package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash | 2 +- package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk | 2 +- .../kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash | 2 +- .../kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk | 2 +- .../kodi-screensaver-matrixtrails.hash | 2 +- .../kodi-screensaver-matrixtrails.mk | 2 +- .../kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash | 2 +- package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk | 2 +- package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash | 2 +- package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk | 2 +- package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash | 2 +- package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk | 2 +- package/kodi-screensaver-stars/kodi-screensaver-stars.hash | 2 +- package/kodi-screensaver-stars/kodi-screensaver-stars.mk | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash index 0f1d77e814c1..3f1163fe1bf0 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 189b4f45ac2c0920445db0240f080203041c77053430595e764d773fdcd8604a kodi-screensaver-asteroids-19.0.1-Matrix.tar.gz +sha256 492d826efa7a252ce62a1bebf075fe9b0c0cf452929f4cd6f228003f6e445b82 kodi-screensaver-asteroids-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk index 0c660e9556ab..d91779610bb3 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_ASTEROIDS_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_ASTEROIDS_VERSION = 20.2.0-Nexus KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,xbmc,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION)) KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash index 95c37a8e694d..79815b3cba7e 100644 --- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash +++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e1d97cf5628dd844745d152a2b3633a22c720c35ef0e81aa61857f47a78003aa kodi-screensaver-asterwave-19.0.1-Matrix.tar.gz +sha256 2c07219218fad17ef285577ff8309f7b6503302e52048d12ee20459dbcedf89c kodi-screensaver-asterwave-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk index 2ae243eba09b..c721f21cc0ab 100644 --- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk +++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_ASTERWAVE_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_ASTERWAVE_VERSION = 20.2.0-Nexus KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,xbmc,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION)) KODI_SCREENSAVER_ASTERWAVE_LICENSE = GPL-2.0+ KODI_SCREENSAVER_ASTERWAVE_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash index 314c06787826..5426cb3f6c4d 100644 --- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash +++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ef90c940f70ae9ffb4e5b6928993f053c24de2180566a5fdb21eea359a6c61df kodi-screensaver-biogenesis-19.0.1-Matrix.tar.gz +sha256 dfc291fbafe16444f3a5a5f886ba562b5d7b16ed77f4302017fbbe5f5ef9a82d kodi-screensaver-biogenesis-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk index 70e4cdc0bd81..f25ad9c66655 100644 --- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk +++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_BIOGENESIS_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_BIOGENESIS_VERSION = 20.1.0-Nexus KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,xbmc,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION)) KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash index 80dfbad35785..6ca36c0d328f 100644 --- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash +++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f281efde421cfe9d5f251520853e43e8b1ee128de216af760fcafb80861f504b kodi-screensaver-cpblobs-19.0.1-Matrix.tar.gz +sha256 0e398a30aac0e6316778d7bb93256b9a3758ac11bc42388ac4367417bf82ea55 kodi-screensaver-cpblobs-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk index 9ca6718c9271..49b510f22903 100644 --- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk +++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_CPBLOBS_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_CPBLOBS_VERSION = 20.1.0-Nexus KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,xbmc,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION)) KODI_SCREENSAVER_CPBLOBS_LICENSE = GPL-2.0 KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash index 2268b2e52c76..27b5a0f712b9 100644 --- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash +++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5428bc2bf17132dbc98ef0f9df0c98ab5abcbe4bf6e9040460cbf5be58ea3058 kodi-screensaver-greynetic-19.0.1-Matrix.tar.gz +sha256 e060f69a7c403a5d7bb59058dc38e8c6a6ea1aa7bc9b82f8ffa7c5e94ede0866 kodi-screensaver-greynetic-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk index 3e91cfb03a43..4c3f358894f7 100644 --- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk +++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_GREYNETIC_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_GREYNETIC_VERSION = 20.2.0-Nexus KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,xbmc,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION)) KODI_SCREENSAVER_GREYNETIC_LICENSE = GPL-2.0+ KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash index 2c4de8204944..4f0c3f47464b 100644 --- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash +++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a7054eedcf7b614f5a9cf584ac1f92225b5b960ff5f8d846372e920319a47d30 kodi-screensaver-matrixtrails-19.0.1-Matrix.tar.gz +sha256 929af1a5a08399449497a13c2eb9761b4770b41445a13ee61d78b82677978ea5 kodi-screensaver-matrixtrails-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk index 230977bb942e..b9a3e8d68169 100644 --- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk +++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 20.1.0-Nexus KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION)) KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash index 20e725f07a6a..39853836fbaa 100644 --- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash +++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d8d87943bfb795fc66565d06197a6b3a12b2cdc2b60269197ddccf295217b776 kodi-screensaver-pingpong-19.0.1-Matrix.tar.gz +sha256 72b3c9be5b65afe7fbc6d496eb7700786d88811bfafcd131a3219a646d30805d kodi-screensaver-pingpong-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk index fffdc82d8802..3801515329e7 100644 --- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk +++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_PINGPONG_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_PINGPONG_VERSION = 20.2.0-Nexus KODI_SCREENSAVER_PINGPONG_SITE = $(call github,xbmc,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION)) KODI_SCREENSAVER_PINGPONG_LICENSE = GPL-2.0+ KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash index 9b0effef156b..aa48d490e59e 100644 --- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash +++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6a68904ff6915a7b908126d1336f5ad78e0791680fae14c71d5a187b13ce3730 kodi-screensaver-pyro-19.0.1-Matrix.tar.gz +sha256 ec981d070cccdfaa9116244e80a63d86c37f67dccd11aacfcc66dcfcbb608ce1 kodi-screensaver-pyro-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk index 3ab723437075..e33c09ab97dd 100644 --- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk +++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_PYRO_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_PYRO_VERSION = 20.1.0-Nexus KODI_SCREENSAVER_PYRO_SITE = $(call github,xbmc,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION)) KODI_SCREENSAVER_PYRO_LICENSE = GPL-2.0+ KODI_SCREENSAVER_PYRO_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash index 073a1b27023f..c66d3b2cd3ed 100644 --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8bd1012dc2ae10d2c3b7920214616b0bca5278e4e78f8b0e41fa9cf14569273c kodi-screensaver-rsxs-19.0.2-Matrix.tar.gz +sha256 e135408812b8c267554e3881a05396d4286c1f47b20416b4e5d88b632367ace7 kodi-screensaver-rsxs-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk index 59ec30b8685d..adf745172372 100644 --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_RSXS_VERSION = 19.0.2-Matrix +KODI_SCREENSAVER_RSXS_VERSION = 20.1.0-Nexus KODI_SCREENSAVER_RSXS_SITE = $(call github,xbmc,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION)) KODI_SCREENSAVER_RSXS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_RSXS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash index 9cf978bbbc33..4641296596c6 100644 --- a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash +++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c65bd9baa351ba4c5d443205b9e125303e341bd85e99aaf36793f95395372bf kodi-screensaver-stars-19.0.0-Matrix.tar.gz +sha256 5ea0d19c3ef94e9603a0e06c78ae01cd6f9227da7b505eaa7d4527ca6018ea03 kodi-screensaver-stars-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk index 06c77331afe0..a38ad5c7dbb4 100644 --- a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk +++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_STARS_VERSION = 19.0.0-Matrix +KODI_SCREENSAVER_STARS_VERSION = 20.1.0-Nexus KODI_SCREENSAVER_STARS_SITE = $(call github,xbmc,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION)) KODI_SCREENSAVER_STARS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_STARS_LICENSE_FILES = LICENSE.md From cc6c7401cb57fa38146f765546b78c7814ebcc51 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:44:57 +0200 Subject: [PATCH 0397/2890] package/kodi-vfs-*: mass version bump to Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash | 2 +- package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk | 2 +- package/kodi-vfs-rar/kodi-vfs-rar.hash | 2 +- package/kodi-vfs-rar/kodi-vfs-rar.mk | 2 +- package/kodi-vfs-sftp/kodi-vfs-sftp.hash | 2 +- package/kodi-vfs-sftp/kodi-vfs-sftp.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash index c0468517f2e6..d395ba2d4214 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 957c76d3327b618396d9530394b235cebb73090b53afdeb2bd0d87f9677622d9 kodi-vfs-libarchive-19.2.0-Matrix.tar.gz +sha256 06be9bfcda3e676e0757ea9602351d67f2bf0aa9aa9e408b14d947772a615e4f kodi-vfs-libarchive-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk index 1f79bad71f30..975e28485a02 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_LIBARCHIVE_VERSION = 19.2.0-Matrix +KODI_VFS_LIBARCHIVE_VERSION = 20.3.0-Nexus KODI_VFS_LIBARCHIVE_SITE = $(call github,xbmc,vfs.libarchive,$(KODI_VFS_LIBARCHIVE_VERSION)) KODI_VFS_LIBARCHIVE_LICENSE = GPL-2.0+ KODI_VFS_LIBARCHIVE_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-vfs-rar/kodi-vfs-rar.hash b/package/kodi-vfs-rar/kodi-vfs-rar.hash index 845d7516ee89..4d7f800acf1b 100644 --- a/package/kodi-vfs-rar/kodi-vfs-rar.hash +++ b/package/kodi-vfs-rar/kodi-vfs-rar.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 a2c97c478e20efcf1aef2db652ad3c1f9cfc95a89d7ae77b706121c56fb0feca kodi-vfs-rar-19.0.1-Matrix.tar.gz +sha256 50870b24a3663f8d8d88802b327a8fd2fec441a9fed952baf71faba6854a8e1b kodi-vfs-rar-20.1.0-Nexus.tar.gz # License files sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a lib/UnrarXLib/license.txt sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-rar/kodi-vfs-rar.mk b/package/kodi-vfs-rar/kodi-vfs-rar.mk index 12b7b266c005..4322e41abd55 100644 --- a/package/kodi-vfs-rar/kodi-vfs-rar.mk +++ b/package/kodi-vfs-rar/kodi-vfs-rar.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_RAR_VERSION = 19.0.1-Matrix +KODI_VFS_RAR_VERSION = 20.1.0-Nexus KODI_VFS_RAR_SITE = $(call github,xbmc,vfs.rar,$(KODI_VFS_RAR_VERSION)) KODI_VFS_RAR_LICENSE = unrar, GPL-2.0+ KODI_VFS_RAR_LICENSE_FILES = lib/UnrarXLib/license.txt LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash index 1f3cc4978fd7..2f439e8e0d98 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 671bc7bd45d8d744f7e8a60bde9d1f9a0c821d7dd79b9e33d29b2bb2b5d231a1 kodi-vfs-sftp-19.0.1-Matrix.tar.gz +sha256 66f139d3d06c06d03ceccdcee12b79d3886bd0ea7aec662341736f1c9bdd63e2 kodi-vfs-sftp-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk index 6415fcb1de80..c050b4bc20fd 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_SFTP_VERSION = 19.0.1-Matrix +KODI_VFS_SFTP_VERSION = 20.2.0-Nexus KODI_VFS_SFTP_SITE = $(call github,xbmc,vfs.sftp,$(KODI_VFS_SFTP_VERSION)) KODI_VFS_SFTP_LICENSE = GPL-2.0+ KODI_VFS_SFTP_LICENSE_FILES = LICENSE.md From 7296a0659bcf5383303774aac02797f94bd564fb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:44:58 +0200 Subject: [PATCH 0398/2890] package/kodi-visualisation-*: mass version bump to Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash | 2 +- .../kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk | 2 +- package/kodi-visualisation-goom/kodi-visualisation-goom.hash | 2 +- package/kodi-visualisation-goom/kodi-visualisation-goom.mk | 2 +- .../kodi-visualisation-matrix/kodi-visualisation-matrix.hash | 2 +- package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk | 2 +- .../kodi-visualisation-shadertoy.hash | 2 +- .../kodi-visualisation-shadertoy.mk | 2 +- .../kodi-visualisation-spectrum.hash | 2 +- .../kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk | 2 +- .../kodi-visualisation-starburst.hash | 2 +- .../kodi-visualisation-starburst.mk | 2 +- .../kodi-visualisation-waveform.hash | 2 +- .../kodi-visualisation-waveform/kodi-visualisation-waveform.mk | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash index 449b2a48175f..5edb2b9ac237 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3023e6cf739985c31ff9a6cd2a217909563b9817de5c1047aab8d9928a00cfd9 kodi-visualisation-fishbmc-19.0.1-Matrix.tar.gz +sha256 168788d7cd292edf9c13c0e0e0148f19b2ecd35edd8f65f24240dff99f01677a kodi-visualisation-fishbmc-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk index 060e1d9b6965..58087d4f0d89 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_FISHBMC_VERSION = 19.0.1-Matrix +KODI_VISUALISATION_FISHBMC_VERSION = 20.2.0-Nexus KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+ KODI_VISUALISATION_FISHBMC_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash index f49fff77de33..cc82b1f59a47 100644 --- a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1936aaacdf0b3b032e848f8e7b7694111e1c78ce16efdb063263d543d70f003a kodi-visualisation-goom-19.0.2-Matrix.tar.gz +sha256 75102a8c3f066a889493b77fbe26070be78c6dff8e7d44ebda89295ddb2da3b0 kodi-visualisation-goom-20.1.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk index 8b258e19c2c2..b7b048f165ee 100644 --- a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_GOOM_VERSION = 19.0.2-Matrix +KODI_VISUALISATION_GOOM_VERSION = 20.1.1-Nexus KODI_VISUALISATION_GOOM_SITE = $(call github,xbmc,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION)) KODI_VISUALISATION_GOOM_LICENSE = GPL-2.0+ KODI_VISUALISATION_GOOM_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash index 9a5652a2d979..abc97a892f81 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 aba081aca30b6ff2b349f90ecc3ad9519fa7b8b88d61e08aeba2b66fad2a17a2 kodi-visualisation-matrix-19.0.1-Matrix.tar.gz +sha256 f0b76edf45df7161d8525fa2ba623dee64ca66d515342e942100dc46c8220553 kodi-visualisation-matrix-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk index f8959facbdbb..8cd5ea204509 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_MATRIX_VERSION = 19.0.1-Matrix +KODI_VISUALISATION_MATRIX_VERSION = 20.2.0-Nexus KODI_VISUALISATION_MATRIX_SITE = $(call github,xbmc,visualization.matrix,$(KODI_VISUALISATION_MATRIX_VERSION)) KODI_VISUALISATION_MATRIX_LICENSE = GPL-2.0+ KODI_VISUALISATION_MATRIX_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash index d3f489e4f9db..c38931f2ddea 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 49ffaf8ee1a95193d7ac4a6280ae7db8d59ca44c9e5554c0b8cd85a768d1d002 kodi-visualisation-shadertoy-19.1.2-Matrix.tar.gz +sha256 2f97a34f74ee3e3e1d9fe8cfd37796564f8f88eb4c07d60b27ff635d64a5a724 kodi-visualisation-shadertoy-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk index 5c644bb3eef7..a056c3481d0e 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_SHADERTOY_VERSION = 19.1.2-Matrix +KODI_VISUALISATION_SHADERTOY_VERSION = 20.3.0-Nexus KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+ KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash index 1198dd1eabb8..4b8a1f7e71d6 100644 --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 524a740db973673c0038bcc9f73fbae9af497c6699dd3c34527683f29824a5c9 kodi-visualisation-spectrum-19.0.2-Matrix.tar.gz +sha256 1c405ea9b6f43ba5f24df13ebce12cb428369279336deb97790917aa675c809f kodi-visualisation-spectrum-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk index 0da5f22bae2c..67d02ab38ad2 100644 --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_SPECTRUM_VERSION = 19.0.2-Matrix +KODI_VISUALISATION_SPECTRUM_VERSION = 20.2.0-Nexus KODI_VISUALISATION_SPECTRUM_SITE = $(call github,xbmc,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION)) KODI_VISUALISATION_SPECTRUM_LICENSE = GPL-2.0+ KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash index 7f335ed9e275..3e1669f776d0 100644 --- a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash +++ b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e2b3ad0473d1ae40c3ecc81f9631c7d956fd4ec3edc7ef43eaeefec242fa79e5 kodi-visualisation-starburst-19.0.1-Matrix.tar.gz +sha256 0d63b38ba8d5b3bac542546b1ecfb7d722b79652da485d75b22086e26ef4f825 kodi-visualisation-starburst-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk index afa1fb1aef40..3e876797b6cd 100644 --- a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk +++ b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_STARBURST_VERSION = 19.0.1-Matrix +KODI_VISUALISATION_STARBURST_VERSION = 20.2.0-Nexus KODI_VISUALISATION_STARBURST_SITE = $(call github,xbmc,visualization.starburst,$(KODI_VISUALISATION_STARBURST_VERSION)) KODI_VISUALISATION_STARBURST_LICENSE = GPL-2.0+ KODI_VISUALISATION_STARBURST_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash index 3265477050c3..fe9d16423438 100644 --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a89b7d82afaa3bb279ecf32a2c04e6c7653f536b0df6fee2b7389c15340a01c7 kodi-visualisation-waveform-19.0.3-Matrix.tar.gz +sha256 865e72a5f2ed8fd53469518280cbe26f9516467d091009fe5e012ea0d85d5edd kodi-visualisation-waveform-20.2.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk index 9d75f79a87c5..92e46b8997b5 100644 --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_WAVEFORM_VERSION = 19.0.3-Matrix +KODI_VISUALISATION_WAVEFORM_VERSION = 20.2.1-Nexus KODI_VISUALISATION_WAVEFORM_SITE = $(call github,xbmc,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION)) KODI_VISUALISATION_WAVEFORM_LICENSE = GPL-2.0+ KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = LICENSE.md From 1a81a2f28c5e59dadcddefe2c38613ebad5e51c6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:38:56 +0200 Subject: [PATCH 0399/2890] package/x11r7/xdriver_xf86-video-geode: bump version to 2.11.21 Release notes: https://lists.x.org/archives/xorg-announce/2023-May/003393.html Fixes: http://autobuild.buildroot.net/results/d1d/d1dae8c7ba9dc82fbbcc5914ea3b378e48304617/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash | 4 +++- .../xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash index 7a66c28b52bd..7dcb99fe2a81 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2023-May/003393.html +sha256 8256ac3f14117324d00b7bfa8053645ca92562fe837c542489a502adbb5f9f1e xf86-video-geode-2.11.21.tar.xz +sha512 e12f74268ab7d16b57644a9465b4be1ca28d250625a31b8810e19a1f94a17e47e0a258455155fd8f336fa59fd78160cdf3763aa94b85c6ccc2c42edf3b65bc61 xf86-video-geode-2.11.21.tar.xz # Locally calculated -sha256 f497d0bfb09f36c72e3467e2d701f57f6b03ab8992c5d570e66582f714f84d64 xf86-video-geode-2.11.20.tar.bz2 sha256 3994ef7cee54f0935a4b57b1c34efd904da567931dd9e1a2d9390d22c8332ea2 COPYING diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk index dbeae1aa659b..8f84e4863ff8 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.20 -XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.21 +XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.xz +XDRIVER_XF86_VIDEO_GEODE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_GEODE_LICENSE = MIT XDRIVER_XF86_VIDEO_GEODE_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xorgproto From b30206b708e02adb1b287a2d450f48c4bd12f754 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:38:57 +0200 Subject: [PATCH 0400/2890] package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.5 Release notes: https://lists.x.org/archives/xorg-announce/2023-May/003392.html Updated license hash due to update in copyrighht years with upstream commit: https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/commit/5f63ab04338fd811c610ae7617757ede52471316 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../xdriver_xf86-input-mouse.hash | 8 ++++---- .../xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash index adba659aea65..d654c362a94f 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003247.html -sha256 7f6f8551fc238abdddcf9f38906564c1f8c7dacb0ad947cfc110487aefbd8d4c xf86-input-mouse-1.9.4.tar.xz -sha512 7dfde3b1e0c1291c4d78ee920942771808b007f743bfc6eed20de12579383745858673dd874a4b5cf4ab8d9d15f6f7ca2db81ee831547a488d64848a7fe5e16c xf86-input-mouse-1.9.4.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-May/003392.html +sha256 4fde8ae9b44352e2a208584c36528ee3ed13cf5fe4417208a9785daccefd9968 xf86-input-mouse-1.9.5.tar.xz +sha512 ed9bd9cb9a05dac0ff1bfb4e4704cb2e94117afb400aa9e0b7ccdbb102bc6db1b0d3af7cb6f99d0892f8fc306f1643286291c0fa7114af8e65864412bd6c1afa xf86-input-mouse-1.9.5.tar.xz # Locally computed -sha256 472ff645ead9bf3ffb48d42c596376ffc595897e0c0993a071a7ada0da1f4f10 COPYING +sha256 5b066654bdb61a1ef41f38cceda752897bbddb6e60e20f5889cab436a9b7b813 COPYING diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk index 4a9eb3089ffd..25e25ab93de5 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.4 +XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.5 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.xz XDRIVER_XF86_INPUT_MOUSE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT From e07901f5e74c0d97a98a69dae4aad5014bb6983b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:38:58 +0200 Subject: [PATCH 0401/2890] package/x11r7/xapp_xcalc: bump version to 1.1.2 Release notes: https://lists.x.org/archives/xorg-announce/2023-May/003391.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xcalc/xapp_xcalc.hash | 6 +++--- package/x11r7/xapp_xcalc/xapp_xcalc.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.hash b/package/x11r7/xapp_xcalc/xapp_xcalc.hash index 0580253dd692..12633a41a92c 100644 --- a/package/x11r7/xapp_xcalc/xapp_xcalc.hash +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003138.html -sha256 8cb08212c5322e8043f39b28699e13a43f000976c90b3c7fadd4fae2766326b4 xcalc-1.1.1.tar.xz -sha512 a261e9798d62727f40b9aff07e68e63ba40aa7f4f9b1811d8efd8c3e73cd5912d6178c55ca3c059968191051bd20b889b06b5e92b3df70c7b5d09bd013b9ebdb xcalc-1.1.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-May/003391.html +sha256 8578dfa1457e94289f6d6ed6146714307d8a73a1b54d2f42af1321b625fc1cd4 xcalc-1.1.2.tar.xz +sha512 51da677dc88bcd7299ed8d678cb26b048fdb82a1983e1496a06253ee2dceefca4ac87d1a74432b4a76dcc11921a61339bb3d292607be46228164140b430bbad2 xcalc-1.1.2.tar.xz # Locally computed sha256 8dd69dbec37866a41d3040c5c478aca46e0b50c30319f178064d5e2ed9d3f912 COPYING diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk index 849746ece3fb..ffb724e39cff 100644 --- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XCALC_VERSION = 1.1.1 +XAPP_XCALC_VERSION = 1.1.2 XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.xz XAPP_XCALC_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XCALC_LICENSE = MIT From e45fb0242496ed4d5bb43108c8bac0ba01af2fff Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:38:59 +0200 Subject: [PATCH 0402/2890] package/x11r7/xlib_libXi: bump version to 1.8.1 Release notes: https://lists.x.org/archives/xorg-announce/2023-May/003390.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXi/xlib_libXi.hash | 6 +++--- package/x11r7/xlib_libXi/xlib_libXi.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xlib_libXi/xlib_libXi.hash b/package/x11r7/xlib_libXi/xlib_libXi.hash index a86ef13225fc..545d4881f6ac 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.hash +++ b/package/x11r7/xlib_libXi/xlib_libXi.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-September/003109.html -sha256 2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00 libXi-1.8.tar.bz2 -sha512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba libXi-1.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-May/003390.html +sha256 89bfc0e814f288f784202e6e5f9b362b788ccecdeb078670145eacd8749656a7 libXi-1.8.1.tar.xz +sha512 a30b1a07e6d710f5196e7477415d68074736f89d954e8f2d5ccc9b5f349e7d1d440c90fb512508176b5db5ecad55608cfb540872936b731963fd83343db3a0b9 libXi-1.8.1.tar.xz # Locally computed sha256 9392174bc86e291369fd2f61f3ed325962735a5f5c585ce8d7ebd365e2a5639f COPYING diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk index b4802cf018cf..6ae5ec8be837 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXI_VERSION = 1.8 -XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 -XLIB_LIBXI_SITE = https://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXI_VERSION = 1.8.1 +XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.xz +XLIB_LIBXI_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXI_LICENSE = MIT XLIB_LIBXI_LICENSE_FILES = COPYING XLIB_LIBXI_CPE_ID_VENDOR = x.org From 33916e184b1e6efa9221c66707132d9b997eb98b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:00 +0200 Subject: [PATCH 0403/2890] package/x11r7/xapp_xinput: bump version to 1.6.4 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003389.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xinput/xapp_xinput.hash | 8 +++----- package/x11r7/xapp_xinput/xapp_xinput.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xapp_xinput/xapp_xinput.hash b/package/x11r7/xapp_xinput/xapp_xinput.hash index 0961879637eb..d3a6a66902ab 100644 --- a/package/x11r7/xapp_xinput/xapp_xinput.hash +++ b/package/x11r7/xapp_xinput/xapp_xinput.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003013.html -md5 ac6b7432726008b2f50eba82b0e2dbe4 xinput-1.6.3.tar.bz2 -sha1 92ea7dfb3d8465921b0dca85da7d5b01cedae6c8 xinput-1.6.3.tar.bz2 -sha256 35a281dd3b9b22ea85e39869bb7670ba78955d5fec17c6ef7165d61e5aeb66ed xinput-1.6.3.tar.bz2 -sha512 cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076 xinput-1.6.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003389.html +sha256 ad04d00d656884d133110eeddc34e9c69e626ebebbbab04dc95791c2907057c8 xinput-1.6.4.tar.xz +sha512 6734860852715e5cb9d26259a173e42413fc037546ed7fa4173ffa802c2619ee0322bed228a28cd1911be759d860070867d9b89b115f37323cca1c9ef75354b9 xinput-1.6.4.tar.xz # Locally computed sha256 bbd35c7a8e8c5cb073935e84b29b0c53f7131a4ef1ce737dc2be5616941e07e1 COPYING diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk index 0d6c0deffe4d..614b62fe7732 100644 --- a/package/x11r7/xapp_xinput/xapp_xinput.mk +++ b/package/x11r7/xapp_xinput/xapp_xinput.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XINPUT_VERSION = 1.6.3 -XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2 +XAPP_XINPUT_VERSION = 1.6.4 +XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.xz XAPP_XINPUT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XINPUT_LICENSE = MIT XAPP_XINPUT_LICENSE_FILES = COPYING From 770c9baa3ebc56ef0633948ecc0ccceb12b7825c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:01 +0200 Subject: [PATCH 0404/2890] package/x11r7/xapp_xdpyinfo: bump version to 1.3.4 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003388.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash | 6 +++--- package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash index 07a3eb936cf7..b0afdc15acd1 100644 --- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash +++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003157.html -sha256 356d5fd62f3e98ee36d6becf1b32d4ab6112d618339fb4b592ccffbd9e0fc206 xdpyinfo-1.3.3.tar.xz -sha512 47fe0821bc64145876853712ebd7c0af80111c243813615b892429021cc9a53abd38c4684551ae300cb5a4eacdd3d26e2c93e789ed91a948b20e2c37cd2d2442 xdpyinfo-1.3.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-April/003388.html +sha256 a8ada581dbd7266440d7c3794fa89edf6b99b8857fc2e8c31042684f3af4822b xdpyinfo-1.3.4.tar.xz +sha512 9ef9f5c10e15a40895e8f008896b960fdd438277657c7159d16f05db79cd2374cfaca4af2f4e59335824bfd2f74a045ef89dd99ea4130ed436ea59fbbb1cbe12 xdpyinfo-1.3.4.tar.xz # Locally computed sha256 49733ead65fdfa1da0d176f9b965cc08dae74d73d66c9606488d52f6fc036abf COPYING diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk index c5e2a857e3f9..a198fc44c365 100644 --- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk +++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDPYINFO_VERSION = 1.3.3 +XAPP_XDPYINFO_VERSION = 1.3.4 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.xz -XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDPYINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDPYINFO_LICENSE = MIT XAPP_XDPYINFO_LICENSE_FILES = COPYING XAPP_XDPYINFO_CONF_OPTS = --without-xf86misc # not in BR From a8c003ae295f056699a325ba1bf9ec0c4d8e37e9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:03 +0200 Subject: [PATCH 0405/2890] package/x11r7/xlib_libXpm: bump version to 3.5.16 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003385.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 6 +++--- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index 733c404543f6..a041f0d440d1 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-January/003313.html -sha256 60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1 libXpm-3.5.15.tar.xz -sha512 955d716fcea2c9d868ab941c56f017b39bfa0f47fd2904e9b04c6a9be17f23f8b8c906da9c90a89a789f1f399d419641705ff5b6f9921820e34d4807c7a1992f libXpm-3.5.15.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-April/003385.html +sha256 e6bc5da7a69dbd9bcc67e87c93d4904fe2f5177a0711c56e71fa2f6eff649f51 libXpm-3.5.16.tar.xz +sha512 ee564311f8c1c9c08ed1035d55c287ecf7c20c6fee09ad448acfab59f38fd1ef381d4a24b4af2b581f3033730eebc7c690918e52ba706de689d1ef11085edac2 libXpm-3.5.16.tar.xz # Locally calculated sha256 a80d706759624a04aa90fd62bc644a360fc3d72e08dcbfb129f167c11ca285de COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 970ec9340773..51f628337019 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.15 +XLIB_LIBXPM_VERSION = 3.5.16 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT From 634a119e9c04c68408800f78e05f9d29d5750627 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:04 +0200 Subject: [PATCH 0406/2890] package/x11r7/xlib_libXft: bump version to 2.3.8 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003384.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXft/xlib_libXft.hash | 6 +++--- package/x11r7/xlib_libXft/xlib_libXft.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libXft/xlib_libXft.hash b/package/x11r7/xlib_libXft/xlib_libXft.hash index 5074365aeda8..749aa0ad620b 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.hash +++ b/package/x11r7/xlib_libXft/xlib_libXft.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg/2022-November/061175.html -sha256 79f0b37c45007381c371a790c2754644ad955166dbf2a48e3625032e9bdd4f71 libXft-2.3.7.tar.xz -sha512 9df29d3c7b88a21952df1015604511e5d79856d721b2a61eb2c5a062a9abccf16318132432a7c86c0ef816bf174ae86842fa67dabbaa0b163dfa56d99022de19 libXft-2.3.7.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-April/003384.html +sha256 5e8c3c4bc2d4c0a40aef6b4b38ed2fb74301640da29f6528154b5009b1c6dd49 libXft-2.3.8.tar.xz +sha512 fc385d73e1acb701942c154ffb5a283d17891f21d3ac598c4a3fb375a7d6082734593062368c15cad67c1a94177dd15deed878ec5ea852188393b52e92c372c8 libXft-2.3.8.tar.xz # Locally computed sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index 845b612669f8..154c220aa119 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFT_VERSION = 2.3.7 +XLIB_LIBXFT_VERSION = 2.3.8 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.xz XLIB_LIBXFT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFT_LICENSE = MIT From 2e76842bab862f078bdefeba578ce73bb549e979 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:05 +0200 Subject: [PATCH 0407/2890] package/x11r7/xlib_libXt: bump version to 1.3.0 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003383.html Update license hash due to copyright changes with upstream commits: https://gitlab.freedesktop.org/xorg/lib/libxt/-/commit/4ece1c842a08c11c1f84b95355801d41cd8435b1 https://gitlab.freedesktop.org/xorg/lib/libxt/-/commit/444eb13db2f9bc89aba333057fb9eae5d12acf5d https://gitlab.freedesktop.org/xorg/lib/libxt/-/commit/bf57306493609b654167966eaad314048e649f9a -> changes in copyright years, drop of a "all rights reserved". -> license does not change Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXt/xlib_libXt.hash | 8 ++++---- package/x11r7/xlib_libXt/xlib_libXt.mk | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXt/xlib_libXt.hash b/package/x11r7/xlib_libXt/xlib_libXt.hash index 40512f35401b..577896d38ba4 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.hash +++ b/package/x11r7/xlib_libXt/xlib_libXt.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-January/003070.html -sha256 679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60 libXt-1.2.1.tar.bz2 -sha512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c libXt-1.2.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003383.html +sha256 52820b3cdb827d08dc90bdfd1b0022a3ad8919b57a39808b12591973b331bf91 libXt-1.3.0.tar.xz +sha512 64c5978655135b925c3aaad86b1aa6a3f3b57ad8b3592bf142be616b8aa339a02c2fc7badfab9564ea8076ea8f37acfe31709ed528f5a1d251f2d116aa074118 libXt-1.3.0.tar.xz # Locally calculated -sha256 a2866ccc0b1745149e4a2258d934314d40cbb43bd8318c6fa597f233995b0a81 COPYING +sha256 75c5574ca04731d739b1420f55f2b7b47f30df895817f1b03d0d7f5c1fbee534 COPYING diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk index 9530262cf511..cca89145f86a 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXT_VERSION = 1.2.1 -XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2 -XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXT_VERSION = 1.3.0 +XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.xz +XLIB_LIBXT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXT_LICENSE = MIT XLIB_LIBXT_LICENSE_FILES = COPYING XLIB_LIBXT_INSTALL_STAGING = YES From 6bd350f9bdd4f4358b037d6d873ee915f4dc5ac1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:06 +0200 Subject: [PATCH 0408/2890] package/x11r7/xlib_libXfixes: bump version to 6.0.1 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003382.html Update license hash due to copyright update with upstream commit: https://gitlab.freedesktop.org/xorg/lib/libxfixes/-/commit/1f908b1f27723a9a8f532ab4cc58429c2f174224 -> drop "all rights reserved" -> no licensing change Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXfixes/xlib_libXfixes.hash | 9 ++++----- package/x11r7/xlib_libXfixes/xlib_libXfixes.mk | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash index 5dfe49605258..03de90624532 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-May/003086.html -sha256 a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c libXfixes-6.0.0.tar.bz2 -sha512 1985ef156f382e9a7e1cc7e044e0f626de1e4c82557a511cbcf6431994c0ac25b1f8b3a0293bd3089331593db8ce01d3a71ddec68f19b5fe6029d5082fb6885d libXfixes-6.0.0.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2023-April/003382.html +sha256 b695f93cd2499421ab02d22744458e650ccc88c1d4c8130d60200213abc02d58 libXfixes-6.0.1.tar.xz +sha512 b46deffb30cd73ec8a127390d99f2ba2f3ab78f334fdba227f1f461441644a0c169b0d13ffa47576fa458780e7a6db664ff8b93e9195fb217262efd8128f1ffe libXfixes-6.0.1.tar.xz # Locally calculated -sha256 d64e671ffeb483d4543f98c842788ab34c77427e27d83d6b082065a4438d4885 COPYING +sha256 a07d8a5a6972638a745a03983207a1052881c24eea29021fdca7794bea8d7774 COPYING diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk index c0229b57d2e1..3f535fc1d499 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXFIXES_VERSION = 6.0.0 -XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2 -XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXFIXES_VERSION = 6.0.1 +XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.xz +XLIB_LIBXFIXES_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFIXES_LICENSE = MIT XLIB_LIBXFIXES_LICENSE_FILES = COPYING XLIB_LIBXFIXES_CPE_ID_VENDOR = x From cb4b592f6654ba15f21b4cead97661e18df2beec Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:08 +0200 Subject: [PATCH 0409/2890] package/x11r7/xdriver_xf86-video-neomagic: bump version to 1.3.1 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003380.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../xdriver_xf86-video-neomagic.hash | 8 +++----- .../xdriver_xf86-video-neomagic.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash index acc65348f79b..b5a139fdacd1 100644 --- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash +++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-December/002934.html -md5 349d5254d09eb46f2a1f151cd423b89a xf86-video-neomagic-1.3.0.tar.bz2 -sha1 6bccfa15ea05d5264120cd96ccf13687642e8f6d xf86-video-neomagic-1.3.0.tar.bz2 -sha256 93833950fae7757088eb6abb125e15e8c245e5e25681c19c3ad4213ec7319064 xf86-video-neomagic-1.3.0.tar.bz2 -sha512 25d019a2556e52aeb4e25942f444437a921e76d527c10ddd420f16aa7d85bf2b8a51612c382a2a7e3e407bb1e8d610d063101184eea0889c3e1a69bfb3b37735 xf86-video-neomagic-1.3.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003380.html +sha256 b61fac7ec32971e92e34cfd51f88fef169e272a210455e0e1a0faa0d30fc7494 xf86-video-neomagic-1.3.1.tar.xz +sha512 b2425c4e9b8e6e816cbb6fa436da12bd242acf55c3c615352fc80ea072b1822abdb40838c2adcc3c450e429ec6e3b5112d194e739cf5d8ac22d430e273d5378b xf86-video-neomagic-1.3.1.tar.xz # Locally computed sha256 95063ce9aa09850025dd317549ce688519079a8d3cf66ceb3d882cb2bafcced9 COPYING diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk index 8dd2777ff9c5..8c7beeed6e9f 100644 --- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk +++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.3.0 -XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.3.1 +XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.xz +XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE = MIT XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xorgproto From de8a3a53e52dc1ac6e04e623739aa67d412e965e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:09 +0200 Subject: [PATCH 0410/2890] package/x11r7/xapp_xwininfo: bump version to 1.1.6 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003379.html Updated license hash due to upstream commit: https://gitlab.freedesktop.org/xorg/app/xwininfo/-/commit/9a5623e2ffc6995b2c6edf379f191d76d7b4444a -> drop "all rights reserved", update years -> no change in licensing Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xwininfo/xapp_xwininfo.hash | 10 ++++------ package/x11r7/xapp_xwininfo/xapp_xwininfo.mk | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash b/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash index fbc7f7be0000..bbf2e37328a3 100644 --- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash +++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003012.html -md5 26d46f7ef0588d3392da3ad5802be420 xwininfo-1.1.5.tar.bz2 -sha1 9f67b1eb07c5824d437bf577cf6198962af1aeb7 xwininfo-1.1.5.tar.bz2 -sha256 7a405441dfc476666c744f5fcd1bc8a75abf8b5b1d85db7b88b370982365080e xwininfo-1.1.5.tar.bz2 -sha512 a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6 xwininfo-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003379.html +sha256 3518897c17448df9ba99ad6d9bb1ca0f17bc0ed7c0fd61281b34ceed29a9253f xwininfo-1.1.6.tar.xz +sha512 c6df4ed3dcf97772450612f2786ecab8313a43bb78e0b8020cc9ec228b3f466f55090313ad02c8159a73a6892d117322ad85e28d9d76e38bb84c9750712c20bc xwininfo-1.1.6.tar.xz # Locally computed -sha256 443d675237c023a47e4886506b72796afbb2633394812027f91d6e8fa433b2af COPYING +sha256 1be1f0763a5efd08e48089c52728a822bf769b690a2fd82fbab456cfffee822f COPYING diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk index 9652487aae59..196b73c83d2d 100644 --- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk +++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XWININFO_VERSION = 1.1.5 -XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2 +XAPP_XWININFO_VERSION = 1.1.6 +XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.xz XAPP_XWININFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XWININFO_LICENSE = MIT XAPP_XWININFO_LICENSE_FILES = COPYING From e24cd30a147992a6647da23cc4ff5b4aac1aa120 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:10 +0200 Subject: [PATCH 0411/2890] package/x11r7/xdriver_xf86-input-libinput: bump version to 1.3.0 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003378.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../xdriver_xf86-input-libinput.hash | 6 +++--- .../xdriver_xf86-input-libinput.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index 480886b295d7..cca2639dc314 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-January/003129.html -sha256 8151db5b9ddb317c0ce92dcb62da9a8db5079e5b8a95b60abc854da21e7e971b xf86-input-libinput-1.2.1.tar.xz -sha512 3decf694861d1aa3c02d090e66c5ed5513818cb18e9863f1790e0c8122a972230fb903705062b8291e1709db9098623f1205c63ccfb68e552e104813414589c7 xf86-input-libinput-1.2.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-April/003378.html +sha256 1446ba20a22bc968b5a4a0b4dbc3b8e037c50d9c59ac75fa3f7fc506c58c1abb xf86-input-libinput-1.3.0.tar.xz +sha512 f81f408b37e5f98ee97337dc4da6e78449e554e0ab2a3c6791b089d2cb6d645d0206ddf9babbc2120ab8bfe3b1489314fe42503ee015cec41775024538f3a34f xf86-input-libinput-1.3.0.tar.xz # Locally computed sha256 4114220b281561e80f3422f0e7ae8d3e1fc85131ffc2e3b6265119e66f1adb27 COPYING diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index d1f93ffb5b97..381df31fee86 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.2.1 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.3.0 XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.xz XDRIVER_XF86_INPUT_LIBINPUT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT From 0864f874287c06cdbc54c6150f52c003b5741226 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:11 +0200 Subject: [PATCH 0412/2890] package/x11r7/xlib_libXaw: bump version to 1.0.15 Release notes: https://lists.x.org/archives/xorg-announce/2023-March/003372.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXaw/xlib_libXaw.hash | 7 +++---- package/x11r7/xlib_libXaw/xlib_libXaw.mk | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.hash b/package/x11r7/xlib_libXaw/xlib_libXaw.hash index f289e661530d..ce2ec4a3e158 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.hash +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-March/003077.html -sha256 76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e libXaw-1.0.14.tar.bz2 -sha512 29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4 libXaw-1.0.14.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2023-March/003372.html +sha256 ab35f70fde9fb02cc71b342f654846a74328b74cb3a0703c02d20eddb212754a libXaw-1.0.15.tar.xz +sha512 8edbf280b7b24b9040c291545053c1251d6af7e7f56da43a6065a1848245863eb52bdfc28c2f18dbb6597a4064394a44f4df5d8596a1a467549ccc9ce50a7821 libXaw-1.0.15.tar.xz # Locally calculated sha256 9f5adb26952f93b3e4650285b94ec6c61a27aab5a21088bfb6694001be1b360d COPYING diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk index 6b615a8de5eb..f81a7b4a8890 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXAW_VERSION = 1.0.14 -XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2 -XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXAW_VERSION = 1.0.15 +XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.xz +XLIB_LIBXAW_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXAW_LICENSE = MIT XLIB_LIBXAW_LICENSE_FILES = COPYING XLIB_LIBXAW_INSTALL_STAGING = YES From 75d404bb2902cf891f76e8b21a913355d117e514 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:12 +0200 Subject: [PATCH 0413/2890] package/x11r7/xfont_encodings: bump version to 1.0.7 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003355.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xfont_encodings/xfont_encodings.hash | 6 +++--- package/x11r7/xfont_encodings/xfont_encodings.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xfont_encodings/xfont_encodings.hash b/package/x11r7/xfont_encodings/xfont_encodings.hash index 6da1080576e5..80d4a48c4066 100644 --- a/package/x11r7/xfont_encodings/xfont_encodings.hash +++ b/package/x11r7/xfont_encodings/xfont_encodings.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-July/003189.html -sha256 77e301de661f35a622b18f60b555a7e7d8c4d5f43ed41410e830d5ac9084fc26 encodings-1.0.6.tar.xz -sha512 2d52486996939401121bc858ba23031f70eef857760db8da4c84f083e981868e4bc7a8c2ab6d59274a0cf95f592a0dbfad47bce6c9299bb45d115b48abc39134 encodings-1.0.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003355.html +sha256 3a39a9f43b16521cdbd9f810090952af4f109b44fa7a865cd555f8febcea70a4 encodings-1.0.7.tar.xz +sha512 dc72982b14e5d89fe1eff1ab11f308796c89255a06337d8cd6bf65757f11dd0a5478b41d844793213db8fe9638389734f148abe9df9fb05027ea563dacde6ba8 encodings-1.0.7.tar.xz # Locally computed sha256 13b4a0f9431f0fdd6ee36ed386e0b7d1eb429c5cb88df73353896078cbb5a137 COPYING diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk index d499b421fb0a..7825f4117e17 100644 --- a/package/x11r7/xfont_encodings/xfont_encodings.mk +++ b/package/x11r7/xfont_encodings/xfont_encodings.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_ENCODINGS_VERSION = 1.0.6 +XFONT_ENCODINGS_VERSION = 1.0.7 XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.xz -XFONT_ENCODINGS_SITE = https://xorg.freedesktop.org/releases/individual/font +XFONT_ENCODINGS_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_ENCODINGS_LICENSE = Public Domain XFONT_ENCODINGS_LICENSE_FILES = COPYING From 1a5d479d6887a241fc6092f1828617e4cb72d93e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:13 +0200 Subject: [PATCH 0414/2890] package/x11r7/xdata_xbitmaps: bump version to 1.1.3 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003333.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash | 8 +++----- package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash index 7ebc88a0beed..c9a3956686ef 100644 --- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash +++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002881.html -md5 cedeef095918aca86da79a2934e03daf xbitmaps-1.1.2.tar.bz2 -sha1 1cb0e485a66280e9a64b48426140b8a0de9cf169 xbitmaps-1.1.2.tar.bz2 -sha256 b9f0c71563125937776c8f1f25174ae9685314cbd130fb4c2efce811981e07ee xbitmaps-1.1.2.tar.bz2 -sha512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d xbitmaps-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003333.html +sha256 ad6cad54887832a17d86c2ccfc5e52a1dfab090f8307b152c78b0e1529cd0f7a xbitmaps-1.1.3.tar.xz +sha512 b9a7340385fcce2dcd0204f14a462685b14b72ff58f3ec53cd76695bef2b02af902bdac809622dcb27fd4075d5ba13587b5d059530aff502cd5288d161352814 xbitmaps-1.1.3.tar.xz # Locally computed sha256 e121ec6605558ee021674d33b1ab9306e16b9ea7d30453df42286556247be17a COPYING diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk index e9545abaec64..c8b644582910 100644 --- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk +++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDATA_XBITMAPS_VERSION = 1.1.2 -XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2 -XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data +XDATA_XBITMAPS_VERSION = 1.1.3 +XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.xz +XDATA_XBITMAPS_SITE = https://xorg.freedesktop.org/archive/individual/data XDATA_XBITMAPS_LICENSE = MIT XDATA_XBITMAPS_LICENSE_FILES = COPYING From 58035c687aa9128408e6519857a8b6a8c64ae6e8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:14 +0200 Subject: [PATCH 0415/2890] package/x11r7/xdata_xcursor-themes: bump version to 1.0.7 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003332.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash | 8 +++----- .../x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash index 2b88f567a074..1bb3831c91e3 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002945.html -md5 aea14eabf40528ec4db18f1cfcf5c458 xcursor-themes-1.0.6.tar.bz2 -sha1 b56fd5bf5b1ada0532a85c27db0d296e392168c5 xcursor-themes-1.0.6.tar.bz2 -sha256 ee1ec574741293abcf66ac14ce7e74add7ac6be7deb8b38179ef010d22354999 xcursor-themes-1.0.6.tar.bz2 -sha512 2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3 xcursor-themes-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003332.html +sha256 95bae8f48823d894a05bf42dfbf453674ab7dbdeb11e2bc079e8525ad47378c8 xcursor-themes-1.0.7.tar.xz +sha512 910925dd17c576028ae0d9dfe5683888648b941806b53cd9ff74ed18ff2de537664b07ab4c647a55290aeba37f6051f322b29e8ecd54f348e32abe2ccea1c902 xcursor-themes-1.0.7.tar.xz # Locally computed sha256 e437aed89c3440a9fe7e19968a3f2eeb97041ef6c9616837a3fd42d0874fc0e6 COPYING diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk index c3c5f388e906..e5bf1e502f4e 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDATA_XCURSOR_THEMES_VERSION = 1.0.6 -XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2 -XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data +XDATA_XCURSOR_THEMES_VERSION = 1.0.7 +XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.xz +XDATA_XCURSOR_THEMES_SITE = https://xorg.freedesktop.org/archive/individual/data XDATA_XCURSOR_THEMES_LICENSE = MIT XDATA_XCURSOR_THEMES_LICENSE_FILES = COPYING From 551a702b93ea356a7e050ce4710eed30ededf793 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:15 +0200 Subject: [PATCH 0416/2890] package/x11r7/xfont_font-util: bump version to 1.4.0 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003331.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xfont_font-util/xfont_font-util.hash | 6 +++--- package/x11r7/xfont_font-util/xfont_font-util.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xfont_font-util/xfont_font-util.hash b/package/x11r7/xfont_font-util/xfont_font-util.hash index a7664efec200..cf52a2348f5a 100644 --- a/package/x11r7/xfont_font-util/xfont_font-util.hash +++ b/package/x11r7/xfont_font-util/xfont_font-util.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-July/003190.html -sha256 e791c890779c40056ab63aaed5e031bb6e2890a98418ca09c534e6261a2eebd2 font-util-1.3.3.tar.xz -sha512 5e1cb8af44fe0bea72b1a6a4e455f50ca49b7531c2f4b605800c0b2b7578b9826ccf17fa195c505ab1d6339fd4ad697c01ba3b9777616f354ab62b23434d47c9 font-util-1.3.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003331.html +sha256 9f724bf940128c7e39f7252bd961cd38cfac2359de2100a8bed696bf40d40f7d font-util-1.4.0.tar.xz +sha512 05fff613019718a4bd8537ff7eb270bd85345ffb006c16f81b739d6e8cdbfaa9d6503aef9bc48d6c7f70330bf90ff1a46bacdff3c99e8017191d935c85f73d60 font-util-1.4.0.tar.xz # Locally calculated sha256 ce16c3ee6f2a38db6870b66bdb54fce9dcf24acd1161840789e321f6faa1251c COPYING diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk index b864dce23cce..8a97c85d6840 100644 --- a/package/x11r7/xfont_font-util/xfont_font-util.mk +++ b/package/x11r7/xfont_font-util/xfont_font-util.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_UTIL_VERSION = 1.3.3 +XFONT_FONT_UTIL_VERSION = 1.4.0 XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.xz -XFONT_FONT_UTIL_SITE = https://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_UTIL_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_UTIL_LICENSE = MIT/BSD-2-Clause XFONT_FONT_UTIL_LICENSE_FILES = COPYING From f4e8a18e96724339b69cade4f6bb1c3d27e360b1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:16 +0200 Subject: [PATCH 0417/2890] package/x11r7/xdriver_xf86-video-amdgpu: bump version to 23.0.0 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003334.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../xdriver_xf86-video-amdgpu.hash | 6 +++--- .../xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash index c45ae59ee43d..962cb0e16b19 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg/2022-February/060928.html -sha256 9d23fb602915dc3ccde92aa4d1e9485e7e54eaae2f41f485e55eb20761778266 xf86-video-amdgpu-22.0.0.tar.xz -sha512 95c64e3fef7729ced6e7adc5e81c60cc218f6d8b6604f7b290e86ff52c917426b5102decbf8be8a66c9181ccde6e5dff7083dca8cc0c493a39e82625b5c7cb2a xf86-video-amdgpu-22.0.0.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003334.html +sha256 4f04f0ea66f3ced0dcc58f617409860163a19c4e8c285cfb5285f36ba09cc061 xf86-video-amdgpu-23.0.0.tar.xz +sha512 bf26f147629a34e84a0ae8435119e170b9c95edafcab1995b63bb8f55abef32f2efbf4536eb070e64b2ae1460424b1b27a4206cb9836d33ddc6dfbee404f718b xf86-video-amdgpu-23.0.0.tar.xz # Locally computed sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index ba4ab43db290..84f8e39ddd6f 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 22.0.0 +XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 23.0.0 XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.xz -XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_AMDGPU_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT XDRIVER_XF86_VIDEO_AMDGPU_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \ From cd1b1bcc0ec31b3af8d901cb7e05bd2794e3130f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:17 +0200 Subject: [PATCH 0418/2890] package/x11r7/xdriver_xf86-video-ark: bump version to 0.7.6 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003328.html Removed patch which was applied upstream. Signed-off-by: Bernd Kuhls [yann.morin.1998@free.fr: regenerate .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - .../0001-mibstore.patch | 40 ------------------- .../xdriver_xf86-video-ark.hash | 5 ++- .../xdriver_xf86-video-ark.mk | 6 +-- 4 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch diff --git a/.checkpackageignore b/.checkpackageignore index dd57e8062df5..476a802770bc 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1695,7 +1695,6 @@ package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch Ups package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch Upstream package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch Upstream package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch Upstream -package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch Upstream package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch Upstream package/x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch Upstream package/x11r7/xdriver_xf86-video-ati/0003-Guard-local-variable-priv-only-used-with-glamor.patch Upstream diff --git a/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch b/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch deleted file mode 100644 index fa3e68596aa6..000000000000 --- a/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3a3eb72baec46f48e6cf15a834271c3d3386deac Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon -Date: Tue, 17 Sep 2013 19:55:37 +0000 -Subject: Remove usage of mibstore.h (removed from server) - -The module had a compile error for this missing header file. - -Changes similar to vmware commit -23d87c92b7211cc5249eefe4ab3a2c7f370e279e - -Reviewed-by: Alex Deucher -Signed-off-by: Gaetan Nadon ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-ark/commit/?id=3a3eb72baec46f48e6cf15a834271c3d3386deac - -Signed-off-by: Bernd Kuhls - -diff --git a/src/ark_driver.c b/src/ark_driver.c -index b7c287c..65cfe84 100644 ---- a/src/ark_driver.c -+++ b/src/ark_driver.c -@@ -39,7 +39,6 @@ - #include "compiler.h" - #include "mipointer.h" - #include "micmap.h" --#include "mibstore.h" - #include "fb.h" - #include "ark.h" - -@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL) - - fbPictureInit (pScreen, 0, 0); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - if (!pARK->NoAccel) { --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash index 2e2e95367636..68131fdb38a5 100644 --- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash +++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002007.html -sha256 c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e xf86-video-ark-0.7.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003328.html +sha256 5acc9e78122ff6f4390787b2d0d44df81379bd613b6245983cc4bf3f325d085d xf86-video-ark-0.7.6.tar.xz +sha512 a52623e07eef6fa12d77b1afc55bb74b21662b850515b3a32bbf5988dcea2e787b4eddf4e020279aa4e4ddba436505ca9298548406913031e0ed5edaac835491 xf86-video-ark-0.7.6.tar.xz # Locally calculated sha256 8ba9850fb0ecd9033bb1d25c1be85625cb53ca56ce76b71f78f4a034f7310bda COPYING diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk index 3f2a63609e11..6301a97300ff 100644 --- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk +++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.5 -XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.6 +XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.xz +XDRIVER_XF86_VIDEO_ARK_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_ARK_LICENSE = MIT XDRIVER_XF86_VIDEO_ARK_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xorgproto From 458c85990e5b364ffcb48c14a917a8157ee5e399 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 12:08:57 +0200 Subject: [PATCH 0419/2890] package/x11r7/xdriver_xf86-video-ati: bump version to 22.0.0 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003386.html Removed all patches because they were cherry-picked from upstream, update .checkpackageignore as well. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .checkpackageignore | 4 - .../0001-Fix-link-failure-with-gcc-10.patch | 35 -- ...terminology-to-use-primary-secondary.patch | 371 ------------------ ...-variable-priv-only-used-with-glamor.patch | 66 ---- ...dri-h-with-older-versions-of-xserver.patch | 32 -- .../xdriver_xf86-video-ati.hash | 8 +- .../xdriver_xf86-video-ati.mk | 6 +- 7 files changed, 6 insertions(+), 516 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch delete mode 100644 package/x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch delete mode 100644 package/x11r7/xdriver_xf86-video-ati/0003-Guard-local-variable-priv-only-used-with-glamor.patch delete mode 100644 package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch diff --git a/.checkpackageignore b/.checkpackageignore index 476a802770bc..fa35f2d39125 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1695,10 +1695,6 @@ package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch Ups package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch Upstream package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch Upstream package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch Upstream -package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch Upstream -package/x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch Upstream -package/x11r7/xdriver_xf86-video-ati/0003-Guard-local-variable-priv-only-used-with-glamor.patch Upstream -package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch Upstream package/x11r7/xdriver_xf86-video-fbturbo/0001-sunxi_x_g2d-drop-unused-dri2-include.patch Upstream package/x11r7/xdriver_xf86-video-fbturbo/0002-Use-own-thunk-functions-instead-of-fbdevHW-Weak.patch Upstream package/x11r7/xdriver_xf86-video-fbturbo/0003-Update-for-1.20-ABI.patch Upstream diff --git a/package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch b/package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch deleted file mode 100644 index ec9e49ebc75c..000000000000 --- a/package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f223035f4ffcff2a9296d1e907a5193f8e8845a3 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 4 Feb 2020 16:38:06 -0500 -Subject: [PATCH] Fix link failure with gcc 10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without the 'extern' this looks like a definition not just a -declaration, in every file that includes the header. gcc 10 is stricter -about this kind of multiple definition. - -Reviewed-by: Michel Dänzer -[backport from upstream: f223035f4ffcff2a9296d1e907a5193f8e8845a3] -Signed-off-by: Romain Naour ---- - src/drmmode_display.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/drmmode_display.h b/src/drmmode_display.h -index 96eaef0a..8cd8a0a6 100644 ---- a/src/drmmode_display.h -+++ b/src/drmmode_display.h -@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type, - uint64_t *ust, uint32_t *result_seq); - - --miPointerSpriteFuncRec drmmode_sprite_funcs; -+extern miPointerSpriteFuncRec drmmode_sprite_funcs; - - - #endif --- -2.25.4 - diff --git a/package/x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch b/package/x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch deleted file mode 100644 index ed8413b0cd34..000000000000 --- a/package/x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch +++ /dev/null @@ -1,371 +0,0 @@ -From d96815a32431e0f434964a786013083bc0d835fc Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Mon, 13 Jul 2020 09:11:28 +1000 -Subject: [PATCH] ati: cleanup terminology to use primary/secondary - -The X server changed some API/ABIs here. - -Based on amdgpu patch by Michel - -(cherry picked from commit 8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680) -Signed-off-by: Romain Naour ---- - man/radeon.man | 2 +- - src/compat-api.h | 6 ++++ - src/drmmode_display.c | 4 +-- - src/evergreen_state.h | 2 +- - src/r600_state.h | 2 +- - src/radeon.h | 10 +++--- - src/radeon_exa.c | 2 +- - src/radeon_glamor.c | 2 +- - src/radeon_kms.c | 74 +++++++++++++++++++++---------------------- - 9 files changed, 55 insertions(+), 49 deletions(-) - -diff --git a/man/radeon.man b/man/radeon.man -index dcebf537..247dcdb7 100644 ---- a/man/radeon.man -+++ b/man/radeon.man -@@ -290,7 +290,7 @@ on. If this option is set, the default value of the property is 'on' or 'off' - accordingly. If this option isn't set, the default value of the property is - .B auto, - which means that TearFree is on for rotated outputs, outputs with RandR --transforms applied and for RandR 1.4 slave outputs, otherwise off. -+transforms applied and for RandR 1.4 secondary outputs, otherwise off. - .TP - .BI "Option \*qAccelMethod\*q \*q" "string" \*q - Chooses between available acceleration architectures. Valid values are -diff --git a/src/compat-api.h b/src/compat-api.h -index f4e7524f..def6d3e4 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -34,4 +34,10 @@ - #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask - #endif - -+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) -+#define current_primary current_master -+#define primary_pixmap master_pixmap -+#define secondary_dst slave_dst -+#endif -+ - #endif -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index 0e9e2474..3dec91e8 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode, - xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, - ent) { - if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { -- dirty->slave_dst = -+ dirty->secondary_dst = - drmmode_crtc->scanout[scanout_id].pixmap; - break; - } -@@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix) - - xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) { - if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { -- PixmapStopDirtyTracking(dirty->src, dirty->slave_dst); -+ PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst); - break; - } - } -diff --git a/src/evergreen_state.h b/src/evergreen_state.h -index 7e54e1c7..34ba87b6 100644 ---- a/src/evergreen_state.h -+++ b/src/evergreen_state.h -@@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, - int *new_pitch); - extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv); - extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix); --extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p); -+extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p); - extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle); - - #endif -diff --git a/src/r600_state.h b/src/r600_state.h -index 34345996..567c3ca2 100644 ---- a/src/r600_state.h -+++ b/src/r600_state.h -@@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, - int *new_pitch); - extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv); - extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix); --extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p); -+extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p); - extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle); - #endif -diff --git a/src/radeon.h b/src/radeon.h -index 2c913466..85fd0217 100644 ---- a/src/radeon.h -+++ b/src/radeon.h -@@ -182,18 +182,18 @@ typedef enum { - - - static inline ScreenPtr --radeon_master_screen(ScreenPtr screen) -+radeon_primary_screen(ScreenPtr screen) - { -- if (screen->current_master) -- return screen->current_master; -+ if (screen->current_primary) -+ return screen->current_primary; - - return screen; - } - - static inline ScreenPtr --radeon_dirty_master(PixmapDirtyUpdatePtr dirty) -+radeon_dirty_primary(PixmapDirtyUpdatePtr dirty) - { -- return radeon_master_screen(dirty->slave_dst->drawable.pScreen); -+ return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen); - } - - static inline DrawablePtr -diff --git a/src/radeon_exa.c b/src/radeon_exa.c -index 268155ed..320ff992 100644 ---- a/src/radeon_exa.c -+++ b/src/radeon_exa.c -@@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv) - free(driverPriv); - } - --Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle) -+Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle) - { - struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix); - -diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c -index f1098381..ccf99941 100644 ---- a/src/radeon_glamor.c -+++ b/src/radeon_glamor.c -@@ -366,7 +366,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap) - - - static Bool --radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, -+radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary, - void **handle_p) - { - ScreenPtr screen = pixmap->drawable.pScreen; -diff --git a/src/radeon_kms.c b/src/radeon_kms.c -index b3db7c41..62962d61 100644 ---- a/src/radeon_kms.c -+++ b/src/radeon_kms.c -@@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty) - if (dirty->rotation != RR_Rotate_0) { - dstregion = transform_region(damageregion, - &dirty->f_inverse, -- dirty->slave_dst->drawable.width, -- dirty->slave_dst->drawable.height); -+ dirty->secondary_dst->drawable.width, -+ dirty->secondary_dst->drawable.height); - } else - #endif - { -@@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty) - - dstregion = RegionDuplicate(damageregion); - RegionTranslate(dstregion, -dirty->x, -dirty->y); -- PixmapRegionInit(&pixregion, dirty->slave_dst); -+ PixmapRegionInit(&pixregion, dirty->secondary_dst); - RegionIntersect(dstregion, dstregion, &pixregion); - RegionUninit(&pixregion); - } -@@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region) - if (RegionNil(region)) - goto out; - -- if (dirty->slave_dst->master_pixmap) -- DamageRegionAppend(&dirty->slave_dst->drawable, region); -+ if (dirty->secondary_dst->primary_pixmap) -+ DamageRegionAppend(&dirty->secondary_dst->drawable, region); - - #ifdef HAS_DIRTYTRACKING_ROTATION - PixmapSyncDirtyHelper(dirty); -@@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region) - #endif - - radeon_cs_flush_indirect(src_scrn); -- if (dirty->slave_dst->master_pixmap) -- DamageRegionProcessPending(&dirty->slave_dst->drawable); -+ if (dirty->secondary_dst->primary_pixmap) -+ DamageRegionProcessPending(&dirty->secondary_dst->drawable); - - out: - DamageEmpty(dirty->damage); -@@ -613,12 +613,12 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data) - void - radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr master_screen = radeon_dirty_master(dirty); -+ ScreenPtr primary_screen = radeon_dirty_primary(dirty); - PixmapDirtyUpdatePtr ent; - RegionPtr region; - -- xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) { -- if (!radeon_dirty_src_equals(dirty, ent->slave_dst)) -+ xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) { -+ if (!radeon_dirty_src_equals(dirty, ent->secondary_dst)) - continue; - - region = dirty_region(ent); -@@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) - #if HAS_SYNC_SHARED_PIXMAP - - static Bool --master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) -+primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr master_screen = radeon_dirty_master(dirty); -+ ScreenPtr primary_screen = radeon_dirty_primary(dirty); - -- return !!master_screen->SyncSharedPixmap; -+ return !!primary_screen->SyncSharedPixmap; - } - - static Bool --slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) -+secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen; -+ ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen; - -- return !!slave_screen->SyncSharedPixmap; -+ return !!secondary_screen->SyncSharedPixmap; - } - - static void - call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr master_screen = radeon_dirty_master(dirty); -+ ScreenPtr primary_screen = radeon_dirty_primary(dirty); - -- master_screen->SyncSharedPixmap(dirty); -+ primary_screen->SyncSharedPixmap(dirty); - } - - #else /* !HAS_SYNC_SHARED_PIXMAP */ - - static Bool --master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) -+primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) - { -- ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty)); -+ ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty)); - -- return master_scrn->driverName == scrn->driverName; -+ return primary_scrn->driverName == scrn->driverName; - } - - static Bool --slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) -+secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) - { -- ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen); -+ ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen); - -- return slave_scrn->driverName == scrn->driverName; -+ return secondary_scrn->driverName == scrn->driverName; - } - - static void -@@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) - static xf86CrtcPtr - radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr screen = dirty->slave_dst->drawable.pScreen; -+ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen; - ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - int c; - -- /* Find the CRTC which is scanning out from this slave pixmap */ -+ /* Find the CRTC which is scanning out from this secondary pixmap */ - for (c = 0; c < xf86_config->num_crtc; c++) { - xf86CrtcPtr xf86_crtc = xf86_config->crtc[c]; - drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private; -@@ -714,7 +714,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id) - if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { - RegionPtr region; - -- if (master_has_sync_shared_pixmap(scrn, dirty)) -+ if (primary_has_sync_shared_pixmap(scrn, dirty)) - call_sync_shared_pixmap(dirty); - - region = dirty_region(dirty); -@@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id) - radeon_cs_flush_indirect(scrn); - RegionCopy(&drmmode_crtc->scanout_last_region, region); - RegionTranslate(region, -crtc->x, -crtc->y); -- dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap; -+ dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap; - } - - redisplay_dirty(dirty, region); -@@ -754,7 +754,7 @@ radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t u - static void - radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr screen = dirty->slave_dst->drawable.pScreen; -+ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen; - ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); - xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty); -@@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty) - static void - radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent) - { -- ScreenPtr screen = ent->slave_dst->drawable.pScreen; -+ ScreenPtr screen = ent->secondary_dst->drawable.pScreen; - ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); - xf86CrtcPtr crtc = radeon_prime_dirty_to_crtc(ent); -@@ -893,11 +893,11 @@ radeon_dirty_update(ScrnInfoPtr scrn) - if (screen->isGPU) { - PixmapDirtyUpdatePtr region_ent = ent; - -- if (master_has_sync_shared_pixmap(scrn, ent)) { -- ScreenPtr master_screen = radeon_dirty_master(ent); -+ if (primary_has_sync_shared_pixmap(scrn, ent)) { -+ ScreenPtr primary_screen = radeon_dirty_primary(ent); - -- xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) { -- if (radeon_dirty_src_equals(ent, region_ent->slave_dst)) -+ xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) { -+ if (radeon_dirty_src_equals(ent, region_ent->secondary_dst)) - break; - } - } -@@ -921,7 +921,7 @@ radeon_dirty_update(ScrnInfoPtr scrn) - - RegionDestroy(region); - } else { -- if (slave_has_sync_shared_pixmap(scrn, ent)) -+ if (secondary_has_sync_shared_pixmap(scrn, ent)) - continue; - - region = dirty_region(ent); -@@ -1216,7 +1216,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL) - (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS); - pScreen->BlockHandler = RADEONBlockHandler_KMS; - -- if (!xf86ScreenToScrn(radeon_master_screen(pScreen))->vtSema) -+ if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema) - return; - - if (!pScreen->isGPU) -@@ -2584,7 +2584,7 @@ CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data) - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - int c; - -- if (xf86ScreenToScrn(radeon_master_screen(screen))->vtSema) -+ if (xf86ScreenToScrn(radeon_primary_screen(screen))->vtSema) - return 0; - - /* Unreference the all-black FB created by RADEONLeaveVT_KMS. After --- -2.31.1 - diff --git a/package/x11r7/xdriver_xf86-video-ati/0003-Guard-local-variable-priv-only-used-with-glamor.patch b/package/x11r7/xdriver_xf86-video-ati/0003-Guard-local-variable-priv-only-used-with-glamor.patch deleted file mode 100644 index 0a23c54cce1a..000000000000 --- a/package/x11r7/xdriver_xf86-video-ati/0003-Guard-local-variable-priv-only-used-with-glamor.patch +++ /dev/null @@ -1,66 +0,0 @@ -From a78e31b5fffadd73b00483f21e54bd144f1b439a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= -Date: Fri, 26 Mar 2021 17:42:10 +0100 -Subject: [PATCH] Guard local variable priv only used with glamor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes compile errors with glamor disabled: - -../../src/radeon_present.c: In function ‘radeon_present_check_flip’: -../../src/radeon_present.c:281:21: error: invalid use of undefined type ‘struct radeon_pixmap’ - 281 | if (priv && priv->fb_failed) - | ^~ -../../src/radeon_present.c:288:19: error: invalid use of undefined type ‘struct radeon_pixmap’ - 288 | if (priv && !priv->fb_failed) { - | ^~ -../../src/radeon_present.c:292:10: error: invalid use of undefined type ‘struct radeon_pixmap’ - 292 | priv->fb_failed = TRUE; - | ^~ - -(cherry picked from commit 3c7c84ed49564907a148ae99b03200e0be350060) -Signed-off-by: Romain Naour ---- - src/radeon_present.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/radeon_present.c b/src/radeon_present.c -index 494655c9..d010aa19 100644 ---- a/src/radeon_present.c -+++ b/src/radeon_present.c -@@ -254,7 +254,9 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap, - xf86CrtcPtr xf86_crtc = crtc->devPrivate; - ScreenPtr screen = window->drawable.pScreen; - ScrnInfoPtr scrn = xf86_crtc->scrn; -+#ifdef USE_GLAMOR - struct radeon_pixmap *priv = radeon_get_pixmap_private(pixmap); -+#endif - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); - RADEONInfoPtr info = RADEONPTR(scrn); - PixmapPtr screen_pixmap = screen->GetScreenPixmap(screen); -@@ -278,10 +280,13 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap, - return FALSE; - #endif - -+#ifdef USE_GLAMOR - if (priv && priv->fb_failed) - return FALSE; -+#endif - - if (!radeon_pixmap_get_fb(pixmap)) { -+#ifdef USE_GLAMOR - if (!priv) - priv = radeon_get_pixmap_private(pixmap); - -@@ -291,6 +296,7 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap, - "normal if using PRIME render offloading)\n"); - priv->fb_failed = TRUE; - } -+#endif - - return FALSE; - } --- -2.31.1 - diff --git a/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch b/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch deleted file mode 100644 index a969d61913ca..000000000000 --- a/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5eba006e4129e8015b822f9e1d2f1e613e252cda Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= -Date: Tue, 2 Feb 2021 12:45:54 +0100 -Subject: [PATCH] Only include dri.h with older versions of xserver - -Not needed anymore with current versions. - -Downloaded from upstream commit -https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/5eba006e4129e8015b822f9e1d2f1e613e252cda - -Signed-off-by: Bernd Kuhls ---- - src/drmmode_display.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index 3099a729..a58f24dd 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -45,7 +45,9 @@ - #include "radeon_glamor.h" - #include "radeon_reg.h" - -+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,99,1,0) - #include -+#endif - - #include "drmmode_display.h" - --- -GitLab - diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash index 1e7376cbfc81..74530c122f86 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-October/003027.html -md5 6e49d3c2839582af415ceded76e626e6 xf86-video-ati-19.1.0.tar.bz2 -sha1 aea1d11c05531b03f2eb67c6785cddf6d7f30e5f xf86-video-ati-19.1.0.tar.bz2 -sha256 659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49 xf86-video-ati-19.1.0.tar.bz2 -sha512 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6 xf86-video-ati-19.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003386.html +sha256 c8c8bb56d3f6227c97e59c3a3c85a25133584ceb82ab5bc05a902a743ab7bf6d xf86-video-ati-22.0.0.tar.xz +sha512 fba9ffc7b0eeb0c369eb1a6f8ef0bb3061cfeca26bc269baf6e3d16dcd943fbf4092f1e37adfb1bc71051cee0b7a0e6fb253f0b8bcd210732ccaf99e8f2356fe xf86-video-ati-22.0.0.tar.xz # Locally computed sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index e7f5852811ce..b663279c2086 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ATI_VERSION = 19.1.0 -XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_ATI_VERSION = 22.0.0 +XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.xz +XDRIVER_XF86_VIDEO_ATI_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT XDRIVER_XF86_VIDEO_ATI_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ From 9aa67d7409e0c33cdbc9a6b5103f287bc87b4be5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 12:10:29 +0200 Subject: [PATCH 0420/2890] package/x11r7/xdriver_xf86-video-savage: bump version to 2.4.0 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003381.html Removed all patches due to upstream commits: https://gitlab.freedesktop.org/xorg/driver/xf86-video-savage/-/commit/2ec88355123b1def99d8c79769f396ac97bc5008 https://gitlab.freedesktop.org/xorg/driver/xf86-video-savage/-/commit/0ece556daa8a88771b669d8104396abd9166d2d0 and update .checkpackageignore Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 -- .../0001-cross-compile.patch | 27 ------------------- .../0002-xorg-xserver120.patch | 23 ---------------- .../xdriver_xf86-video-savage.hash | 5 ++-- .../xdriver_xf86-video-savage.mk | 7 +++-- 5 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch delete mode 100644 package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch diff --git a/.checkpackageignore b/.checkpackageignore index fa35f2d39125..e80e2a845f6e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1708,8 +1708,6 @@ package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-pat package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch Upstream package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob Upstream package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch Upstream -package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob Upstream -package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch Upstream package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob Upstream package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch Upstream package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables diff --git a/package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch b/package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch deleted file mode 100644 index b9c296b6b5d7..000000000000 --- a/package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/configure.ac 2008-05-21 16:04:23.000000000 -0400 -+++ b/configure.ac 2008-06-23 11:41:50.000000000 -0400 -@@ -68,12 +68,18 @@ sdkdir=$(pkg-config --variable=sdkdir xo - AC_HEADER_STDC - - if test "$DRI" != no; then -- AC_CHECK_FILE([${sdkdir}/dri.h], -- [have_dri_h="yes"], [have_dri_h="no"]) -- AC_CHECK_FILE([${sdkdir}/sarea.h], -- [have_sarea_h="yes"], [have_sarea_h="no"]) -- AC_CHECK_FILE([${sdkdir}/dristruct.h], -- [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ if test "$cross_compiling" = "no" ; then -+ AC_CHECK_FILE([${sdkdir}/dri.h], -+ [have_dri_h="yes"], [have_dri_h="no"]) -+ AC_CHECK_FILE([${sdkdir}/sarea.h], -+ [have_sarea_h="yes"], [have_sarea_h="no"]) -+ AC_CHECK_FILE([${sdkdir}/dristruct.h], -+ [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch b/package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch deleted file mode 100644 index 4c695960d1a7..000000000000 --- a/package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix build with modular-xorg-server-1.20 - -Downloaded from -http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/x11/xf86-video-savage/patches/patch-src_savage__driver.c?rev=1.3&content-type=text/x-cvsweb-markup - -Patch was sent upstream by Thomas Klausner : -https://lists.x.org/archives/xorg-devel/2018-May/056952.html - -Signed-off-by: Bernd Kuhls - ---- a/src/savage_driver.c.orig 2017-01-17 22:43:40.000000000 +0000 -+++ b/src/savage_driver.c -@@ -2034,8 +2034,10 @@ static Bool SavagePreInit(ScrnInfoPtr pS - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected current MCLK value of %1.3f MHz\n", - mclk / 1000.0); - -+#if 0 - pScrn->maxHValue = 2048 << 3; /* 11 bits of h_total 8-pixel units */ - pScrn->maxVValue = 2048; /* 11 bits of v_total */ -+#endif - pScrn->virtualX = pScrn->display->virtualX; - pScrn->virtualY = pScrn->display->virtualY; - diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash index 661c8749f212..4482ff599119 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002760.html -sha256 2c93c4db1f71e725dda0caee5821253129d4b52d7aa0fd720593e7769bceec86 xf86-video-savage-2.3.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003381.html +sha256 b36cf02cfdd08a39423bb977c45397fbca5813267c727f0fd3c963ac38b601fd xf86-video-savage-2.4.0.tar.xz +sha512 a4db097c200f1430887e4c52bbe14aeaaa2c73dfc392beeed104c682114bd067f89b69994d649829cdc5d188cdbe7a41b22c82b0b49e3a02cdf366013ebbc161 xf86-video-savage-2.4.0.tar.xz # Locally calculated sha256 611f4020815e3d5011a39a58f0958262715cd3becd9cb1ef14cc166fd84ec5a6 COPYING diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk index 9e5bf61997f1..03983d5cdc4a 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk @@ -4,12 +4,11 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.3.9 -XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.4.0 +XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.xz +XDRIVER_XF86_VIDEO_SAVAGE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_SAVAGE_LICENSE = MIT XDRIVER_XF86_VIDEO_SAVAGE_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) From ab1955c112fcfbf4d56b1c9c9ee9eb9b3fff5dd0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 13:42:24 +0200 Subject: [PATCH 0421/2890] package/kodi-inputstream-adaptive: update license info Include all licenses mentioned in LICENSES/README.md and update the deprecated SPDX identifier for the GPL-2.0 license: https://spdx.org/licenses/GPL-2.0+.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-inputstream-adaptive.hash | 1 + .../kodi-inputstream-adaptive.mk | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 18df044c6282..f94c0455bb6c 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,4 @@ # Locally computed sha256 907915228335eeb9217e6f069cbb210fffce01095a6326908015cd89165a0328 kodi-inputstream-adaptive-20.3.6-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md +sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 1f3e86bb270e..31b04c9e89cd 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -6,8 +6,22 @@ KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.6-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) -KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ -KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.md +KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ + BSD-2-Clause-Views \ + BSD-3-Clause \ + google-patent-license-webm \ + GPL-2.0-or-later \ + RSA-MD5 + +KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = \ + LICENSE.md \ + LICENSES/README.md \ + LICENSES/BSD-2-Clause-Views \ + LICENSES/BSD-3-Clause \ + LICENSES/google-patent-license-webm \ + LICENSES/GPL-2.0-or-later \ + LICENSES/RSA-MD + KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = bento4 expat kodi $(eval $(cmake-package)) From 92b435cf4e6ca4de762e67b167b38534b7efd4eb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 13:42:22 +0200 Subject: [PATCH 0422/2890] package/bento4: bump version to 1.6.0-639-7-Omega Needed for the upcoming version bump of the Nexus version of kodi-inputstream-adaptive. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/bento4/bento4.hash | 2 +- package/bento4/bento4.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bento4/bento4.hash b/package/bento4/bento4.hash index 8e2033dc980b..b9391aed6aa8 100644 --- a/package/bento4/bento4.hash +++ b/package/bento4/bento4.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8afa4ae07a7629a65e0d5014750960ced33a8771d363652f3913261fb5d0c84f bento4-1.6.0-639-6-Nexus.tar.gz +sha256 4464cd47b597e6dedbfc231bb6eb097c45cfe5ee0051082460d9ac53e9d74dc3 bento4-1.6.0-639-7-Omega.tar.gz sha256 7daae92c8628ada28def8d096fe2fde298b72ec3e2d64a3c408afce38edb361b Documents/LICENSE.txt diff --git a/package/bento4/bento4.mk b/package/bento4/bento4.mk index a2e0805c174b..8aefc401ef55 100644 --- a/package/bento4/bento4.mk +++ b/package/bento4/bento4.mk @@ -4,7 +4,7 @@ # ################################################################################ -BENTO4_VERSION = 1.6.0-639-6-Nexus +BENTO4_VERSION = 1.6.0-639-7-Omega BENTO4_SITE = $(call github,xbmc,Bento4,$(BENTO4_VERSION)) BENTO4_INSTALL_STAGING = YES BENTO4_LICENSE = GPL-2.0+ From eb22e467c75c875542c3cfea9875f4d6cfa93fe1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 13:42:23 +0200 Subject: [PATCH 0423/2890] package/kodi-inputstream-adaptive: bump version to 20.3.7-Nexus Depends on bento4 version bump included in this patch series: https://github.com/xbmc/inputstream.adaptive/commit/55fbc78aaf081b63773fe98cfd03b1bbed8642a5 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index f94c0455bb6c..f562fe193ced 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 907915228335eeb9217e6f069cbb210fffce01095a6326908015cd89165a0328 kodi-inputstream-adaptive-20.3.6-Nexus.tar.gz +sha256 6454f40c6e89e7ce2a9492197954bbef856ee83e242ef610c905d42aed7484d7 kodi-inputstream-adaptive-20.3.7-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 31b04c9e89cd..f86438166bfa 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.6-Nexus +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.7-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ From 0ce2d42aa7f603f3441d3f7481372663b1a2090c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 13:25:25 +0200 Subject: [PATCH 0424/2890] package/kodi: update patch status Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...1-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch | 2 +- package/kodi/0002-cmake-modules-fix-python-detection.patch | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index e80e2a845f6e..cd0ccc1abd48 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -706,7 +706,6 @@ package/keyutils/0002-cifs.patch Sob Upstream package/kmod/0001-fix-O_CLOEXEC.patch Upstream package/kodi-texturepacker/0001-texturepacker.patch Upstream package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch Upstream -package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch Upstream package/kodi/S50kodi Shellcheck Variables package/latencytop/0001-makefile.patch Upstream package/lbase64/0001-retro-compatible-with-Lua-5.1.patch Upstream diff --git a/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch index 057d2254bcf0..4fb95c8b4aff 100644 --- a/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch +++ b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch @@ -8,7 +8,7 @@ When cross-compiling, the location at build time of the libraries is not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable is here to handle this difference, so use it in kodi-config.cmake. -Upstream status: Reverted (PR 17616) +Upstream: Reverted (PR 17616 and 18680) Signed-off-by: Thomas Petazzoni (rebased and simplified for Kodi 17.0-Krypton) diff --git a/package/kodi/0002-cmake-modules-fix-python-detection.patch b/package/kodi/0002-cmake-modules-fix-python-detection.patch index 92a4ac904dfc..fcf35b25b2a2 100644 --- a/package/kodi/0002-cmake-modules-fix-python-detection.patch +++ b/package/kodi/0002-cmake-modules-fix-python-detection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] cmake/modules: fix python detection Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN -Upstream: unknown +Upstream: https://github.com/xbmc/xbmc/pull/23230 --- cmake/modules/FindPython.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) From fa2700c4cd52e588249e5ce7c83956ce7fc4ec33 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 7 May 2023 14:32:09 +0200 Subject: [PATCH 0425/2890] package/kodi-inputstream-adaptive: add missing license hashes Commit 0ce2d42aa7f6 (package/kodi-inputstream-adaptive: update license info) did a last-minute update to add all the license files, but forgot to amend the hash file. Signed-off-by: Yann E. MORIN --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index f562fe193ced..89efd14222a3 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -2,3 +2,8 @@ sha256 6454f40c6e89e7ce2a9492197954bbef856ee83e242ef610c905d42aed7484d7 kodi-inputstream-adaptive-20.3.7-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md +sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views +sha256 db15ad8651cae3da082c555f3b5a84ffe2b697695ba5e4d9d391395c15f7af14 LICENSES/BSD-3-Clause +sha256 184867bbdccfe35775d9ce80ee9a5739d96a647d88b383f44351770c637a97f9 LICENSES/google-patent-license-webm +sha256 ac71e3e4eb5973038a48907ed1b036e0fcd486033b342e38445c246f12c46b47 LICENSES/GPL-2.0-or-later +sha256 44ed58e0d80f7d6261bba01aa5c8a59995ee0180512e1c2a47bfff1b5be240f2 LICENSES/RSA-MD From 8c86439b5d8fd23c4d1474d342b613e63ea005d2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 11:11:48 +0200 Subject: [PATCH 0426/2890] package/intel-mediadriver: bump version to 23.2.1 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 7425c388c26b..b4129eb3bff2 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c7f79f0534e9832d22faf0ab7efedac75fb8726698f49877ca965d8255a9c38d intel-media-23.2.0.tar.gz +sha256 3796fea4201e24310b3d100b64cfb288fb92b93ce9de54526efa43e2ea68853a intel-media-23.2.1.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index c0d30143fa26..6895d60be6ac 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 23.2.0 +INTEL_MEDIADRIVER_VERSION = 23.2.1 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From 25d2a13782302a181c268b4616f1eda158a955b0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 11:11:49 +0200 Subject: [PATCH 0427/2890] package/intel-mediasdk: bump version to 23.2.1 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index 4b5779169b62..a00748b66732 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6b33ec917ef0c6395fb66c7b93aae4ae31b3d1dedb5d7d39e0c69f45acb7c4fb intel-mediasdk-23.2.0.tar.gz +sha256 186bb82fc9fe23ed21be51a58036c66b109f64c49d923ebe8ac922133338991e intel-mediasdk-23.2.1.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index c09d81aa2d51..eb7703dbb321 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 23.2.0 +INTEL_MEDIASDK_VERSION = 23.2.1 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From f89b988d33c9bd65ab33023fafab80b69d767656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Sat, 29 Apr 2023 14:47:31 +0200 Subject: [PATCH 0428/2890] package/micropython: pass $TARGET_LDFLAGS to build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LDFLAGS need to be passed to the micropython build system via the LDFLAGS_EXTRA variable, which was so far missing. This patch adds it. Signed-off-by: Jonathan Neuschäfer Acked-by: Chris Packham Signed-off-by: Yann E. MORIN --- package/micropython/micropython.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 51b45e5e99d7..5f687c73b9b4 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -36,6 +36,7 @@ MICROPYTHON_MAKE_OPTS += \ MICROPY_PY_USSL=0 \ CROSS_COMPILE=$(TARGET_CROSS) \ CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \ + LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ CWARN= define MICROPYTHON_BUILD_CMDS From 8d6ddb7a290545dff5b9f07d042bd7512d258882 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 1 May 2023 20:42:10 -0700 Subject: [PATCH 0429/2890] package/rtl8812-aircrack-ng: bump to 2023-05-01 version to fix build failure with Linux 6.3 Signed-off-by: Christian Stewart Reviewed-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- .../0001-Fix-build-failure-on-PowerPC64.patch | 114 ------------------ .../rtl8812au-aircrack-ng.hash | 2 +- .../rtl8812au-aircrack-ng.mk | 2 +- 3 files changed, 2 insertions(+), 116 deletions(-) delete mode 100644 package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch diff --git a/package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch b/package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch deleted file mode 100644 index 488c21a4fc1c..000000000000 --- a/package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch +++ /dev/null @@ -1,114 +0,0 @@ -From d78bda8e60ad6382c1e5832d83d8e40c923628fa Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Tue, 14 Mar 2023 13:21:11 +0100 -Subject: [PATCH] Fix build failure on PowerPC64 - -get_ra() is defined in Linux kernel for PowerPC64 architecture and it -conflicts with local get_ra() definition so let's rename local definition -as rtl_get_ra(). - -[Upstream status: https://github.com/aircrack-ng/rtl8812au/pull/1054] -Signed-off-by: Giulio Benetti ---- - core/rtw_odm.c | 6 +++--- - core/rtw_recv.c | 4 ++-- - hal/hal_com.c | 2 +- - include/wifi.h | 2 +- - os_dep/linux/ioctl_cfg80211.c | 2 +- - 5 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/core/rtw_odm.c b/core/rtw_odm.c -index 7204181..a9a7604 100644 ---- a/core/rtw_odm.c -+++ b/core/rtw_odm.c -@@ -273,7 +273,7 @@ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys) - RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n" - , *phys & 0xf - , MAC_ARG(get_ta(wlanhdr)) -- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" -+ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" - , HDATA_RATE(attrib->data_rate) - , phys_t0->band, phys_t0->channel, phys_t0->rxsc - ); -@@ -389,7 +389,7 @@ type1_end: - RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, rf_mode:%u, l_rxsc:%u, ht_rxsc:%u) => %u,%u\n" - , *phys & 0xf - , MAC_ARG(get_ta(wlanhdr)) -- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" -+ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" - , HDATA_RATE(attrib->data_rate) - , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc - , pkt_cch, pkt_bw -@@ -407,7 +407,7 @@ type1_end: - RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n" - , *phys & 0xf - , MAC_ARG(get_ta(wlanhdr)) -- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" -+ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" - , HDATA_RATE(attrib->data_rate) - , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc - ); -diff --git a/core/rtw_recv.c b/core/rtw_recv.c -index ffd1ff9..05bede9 100644 ---- a/core/rtw_recv.c -+++ b/core/rtw_recv.c -@@ -4851,7 +4851,7 @@ void rx_query_phy_status( - wlanhdr = get_recvframe_data(precvframe); - - ta = get_ta(wlanhdr); -- ra = get_ra(wlanhdr); -+ ra = rtl_get_ra(wlanhdr); - is_ra_bmc = IS_MCAST(ra); - - if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) { -@@ -4991,7 +4991,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) - { - s32 ret = _SUCCESS; - u8 *pbuf = precvframe->u.hdr.rx_data; -- u8 *pda = get_ra(pbuf); -+ u8 *pda = rtl_get_ra(pbuf); - u8 ra_is_bmc = IS_MCAST(pda); - _adapter *primary_padapter = precvframe->u.hdr.adapter; - #ifdef CONFIG_CONCURRENT_MODE -diff --git a/hal/hal_com.c b/hal/hal_com.c -index dcf8edf..07b8a5e 100644 ---- a/hal/hal_com.c -+++ b/hal/hal_com.c -@@ -12569,7 +12569,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe) - - /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/ - if (psta) { -- if (IS_MCAST(get_ra(get_recvframe_data(prframe)))) -+ if (IS_MCAST(rtl_get_ra(get_recvframe_data(prframe)))) - psta_dframe_info = &psta->sta_dframe_info_bmc; - else - psta_dframe_info = &psta->sta_dframe_info; -diff --git a/include/wifi.h b/include/wifi.h -index f071dd0..b349bb9 100644 ---- a/include/wifi.h -+++ b/include/wifi.h -@@ -454,7 +454,7 @@ __inline static int IS_MCAST(const u8 *da) - return _FALSE; - } - --__inline static unsigned char *get_ra(unsigned char *pframe) -+__inline static unsigned char *rtl_get_ra(unsigned char *pframe) - { - unsigned char *ra; - ra = GetAddr1Ptr(pframe); -diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c -index 03f6240..a54125a 100644 ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -6468,7 +6468,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra - - indicate: - #if defined(RTW_DEDICATED_P2P_DEVICE) -- if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), get_ra(frame), &wdev)) -+ if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), rtl_get_ra(frame), &wdev)) - if (0) - RTW_INFO("redirect to pd_wdev:%p\n", wdev); - #endif --- -2.34.1 - diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index cdf5f3b4e2fc..ed75b0981600 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz +sha256 3545efb56ecba757e1e27a5479653835e3f5be4f5b49eb9e1e4ff87cbeb6e783 rtl8812au-aircrack-ng-35308f4dd73e77fa572c48867cce737449dd8548.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index ab3ebe207776..a666757449d8 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e +RTL8812AU_AIRCRACK_NG_VERSION = 35308f4dd73e77fa572c48867cce737449dd8548 RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From 65ff3e10ed14fe2e42eeacf6037981730b63177d Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 1 May 2023 18:26:19 +0200 Subject: [PATCH 0430/2890] configs/stm32f429_disco_xip_defconfig: fix runtime error due to low ram space and bump to linux version 6.1.27 After booting Linux the userspace is unusable since every command issued, that is a symlink to busybox, fails because of no free ram. So let's disable IIO in linux.config to give some more ram to userspace. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- board/stmicroelectronics/stm32f429-disco/linux.config | 4 ---- configs/stm32f429_disco_xip_defconfig | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/board/stmicroelectronics/stm32f429-disco/linux.config b/board/stmicroelectronics/stm32f429-disco/linux.config index 7b5c60f18062..02d9c2d1e094 100644 --- a/board/stmicroelectronics/stm32f429-disco/linux.config +++ b/board/stmicroelectronics/stm32f429-disco/linux.config @@ -95,10 +95,6 @@ CONFIG_STM32_MDMA=y CONFIG_SYNC_FILE=y # CONFIG_VIRTIO_MENU is not set # CONFIG_VHOST_MENU is not set -CONFIG_IIO=y -CONFIG_IIO_BUFFER=y -CONFIG_IIO_TRIGGERED_BUFFER=y -CONFIG_IIO_STM32_TIMER_TRIGGER=y # CONFIG_FILE_LOCKING is not set # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY_USER is not set diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index 872e4b6a306c..1aea741f7e25 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -6,7 +6,7 @@ BR2_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.27" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From a57c02a4ea48bdb3ffc8cdba2569d240275b1bc3 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 3 May 2023 00:04:51 +0200 Subject: [PATCH 0431/2890] package/busybox: disable sha1/sha256 hwaccel with x86 Buxybox's init segfault when built with x86 musl toolchain due to recent changes about sha1 and sha156 hwaccel support in Busybox 1.36.0. From Alpinelinux [1]: "main/busybox: disable sha hwaccel the flag check for this seems incorrect- it triggers sha_ni use when the instructions aren't available, but avx512vl/bw is - Elly on irc causes failures in github actions, which have avx512 but no sha_no" The flag check was supposed to be fixed upstream by commit [2]. But init still crash with the latest 1_36_stable (with backported patch) and master branch... The same workaround has been applied to openembedded-core [3], which states that they also have the issue with glibc. Disable hardware sha acceleration on x86 (not x86_64), to avoid the issue. Checked that qemu_x86_64_defconfig with musl for x86_64 for core2 boot as expected with sha hwaccel enabled. Fixes: https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/4202276721 [1] https://git.alpinelinux.org/aports/commit/main/busybox?id=ae2cfdf6f6da3dc46ee09d8ceafa26921f6e058e [2] https://git.busybox.net/busybox/commit/?id=bd76b75f72f717150b909e8c64edfda725cabe11 [3] https://github.com/openembedded/openembedded-core/commit/22f639d61127f4b82a79008c5305e44e090a3680 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/busybox/busybox.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 1633ca525d15..fd4f3c17c5ab 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -276,6 +276,15 @@ define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES endef endif +# Disable SHA1 and SHA256 HWACCEL to avoid segfault in init +# with some x86 toolchains (mostly musl?). +ifeq ($(BR2_i386),y) +define BUSYBOX_MUSL_DISABLE_SHA_HWACCEL + $(call KCONFIG_DISABLE_OPT,CONFIG_SHA1_HWACCEL) + $(call KCONFIG_DISABLE_OPT,CONFIG_SHA256_HWACCEL) +endef +endif + # Only install our logging scripts if no other package does it. ifeq ($(BR2_PACKAGE_SYSKLOGD)$(BR2_PACKAGE_RSYSLOG)$(BR2_PACKAGE_SYSLOG_NG),) define BUSYBOX_INSTALL_LOGGING_SCRIPT @@ -364,6 +373,7 @@ endef BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_ADD_TO_SHELLS define BUSYBOX_KCONFIG_FIXUP_CMDS + $(BUSYBOX_MUSL_DISABLE_SHA_HWACCEL) $(BUSYBOX_SET_MMU) $(BUSYBOX_PREFER_STATIC) $(BUSYBOX_SET_MDEV) From 3fed683035658ee354885f46f1ac1096c2d94e4b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 2 May 2023 23:11:58 +0200 Subject: [PATCH 0432/2890] package/gdb: disable gdb for or1k builds with musl libc The or1k musl port is incomplete, elf_gregset_t definition is missing (user.h is empty) [1]. It fail to build gdbserver and the full gdb. [1] https://git.musl-libc.org/cgit/musl/tree/arch/or1k/bits/user.h?h=v1.2.3 Fixes: https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/4202276569 Signed-off-by: Romain Naour Cc: Stafford Horne [yann.morin.1998@free.fr: simplify condition, add comment] Signed-off-by: Yann E. MORIN --- package/gdb/Config.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 80b1185b5e13..d1813fd7b969 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -4,6 +4,10 @@ config BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT) depends on !BR2_microblaze +comment "gdb needs a glibc or uclibc toolchain" + depends on BR2_or1k + depends on BR2_TOOLCHAIN_USES_MUSL + comment "gdb/gdbserver needs a toolchain w/ threads, threads debug" depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -17,6 +21,9 @@ config BR2_PACKAGE_GDB depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP + # The or1k musl port is incomplete, elf_gregset_t definition is missing: + # https://git.musl-libc.org/cgit/musl/tree/arch/or1k/bits/user.h?h=v1.2.3 + depends on !BR2_or1k || !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_ZLIB # When the external toolchain gdbserver is copied to the # target, we don't allow building a separate gdbserver. The From cd83fc695266f957c5033655a9fb038105af3a12 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 29 Apr 2023 23:45:09 +0300 Subject: [PATCH 0433/2890] configs: orangepi_one_defconfig: U-Boot requires OpenSSL Building U-Boot for OrangePi One now requires host OpenSSL. Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1383:12: fatal error: openssl/evp.h: No such file or directory 1383 | # include | ^~~~~~~~~~~~~~~ Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4187707115 Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- configs/orangepi_one_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index 3f383e337eb1..ea988e87ea9f 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -24,6 +24,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y From 50095a5da404320db1f9ab9ed96474c069426b24 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 29 Apr 2023 23:45:10 +0300 Subject: [PATCH 0434/2890] configs: orangepi_zero_defconfig: U-Boot requires OpenSSL Building U-Boot for OrangePi Zero requires host OpenSSL. Build error is masked only because Linux kernel is built before U-Boot for this specific image configuration were wireless driver is enabled. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- configs/orangepi_zero_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 40269db233ab..e286f0b7f13d 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -36,6 +36,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" From b31dad2fc872052ffc792f11952e71c0e197dec5 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 29 Apr 2023 23:45:11 +0300 Subject: [PATCH 0435/2890] configs: orangepi_pc_plus_defconfig: U-Boot requires OpenSSL Building U-Boot for OrangePi PC Plus requires host OpenSSL. Build error is masked only because Linux kernel is built before U-Boot for this specific image configuration were wireless driver is enabled. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- configs/orangepi_pc_plus_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index 73ba934b6985..9dbf808da76f 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -26,6 +26,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y From f7d0ed4a78f4aa3741f94c4bbb69efbe74c920a9 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Tue, 18 Apr 2023 22:19:23 +0300 Subject: [PATCH 0436/2890] package/cmake: (ctest) add support for riscv architecture Package binaries can be successfully built for and then executed on RISC-V platforms including RV32 and RV64 variants. Tested in QEMU. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- package/cmake/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 3c47fdcb497d..4ef5612b577e 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_CMAKE_ARCH_SUPPORTS BR2_mipsel || BR2_mips64el || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \ BR2_i386 || BR2_x86_64 || BR2_xtensa || \ - BR2_s390x + BR2_s390x || BR2_riscv config BR2_PACKAGE_CMAKE bool From 827bc83cb1aa891fbb41ea332a013d850a121760 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 18:05:23 +0200 Subject: [PATCH 0437/2890] package/libutp: bump version Needed for bumping transmission to version 4.0.1. Added configure option to fix build error with gcc-12. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libutp/libutp.hash | 2 +- package/libutp/libutp.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libutp/libutp.hash b/package/libutp/libutp.hash index f347dc3f2cc6..0312f42612a4 100644 --- a/package/libutp/libutp.hash +++ b/package/libutp/libutp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 484f802d044f774fa5f669476ecdd9cb6110c383781c39adc03bbf6575090771 libutp-059c9449a104e440e4f913756a5f560dd4ae76a9.tar.gz +sha256 d856fde68828d52eb39df40e15ad5dc4efaa9a51d4121bcbfbe47fed2163d20a libutp-c95738b1a6644b919e5b64d3ea9736cfc5894e0b.tar.gz sha256 73b400bf61dde52223dae1642205ca187f1a6b24a508dcce52bf386c27a0e58c LICENSE diff --git a/package/libutp/libutp.mk b/package/libutp/libutp.mk index 394c1e9cb9ff..df0617555d8e 100644 --- a/package/libutp/libutp.mk +++ b/package/libutp/libutp.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBUTP_VERSION = 059c9449a104e440e4f913756a5f560dd4ae76a9 +LIBUTP_VERSION = c95738b1a6644b919e5b64d3ea9736cfc5894e0b LIBUTP_SITE = $(call github,transmission,libutp,$(LIBUTP_VERSION)) LIBUTP_LICENSE = MIT LIBUTP_LICENSE_FILES = LICENSE LIBUTP_INSTALL_STAGING = YES +LIBUTP_CONF_OPTS = -DLIBUTP_ENABLE_WERROR=OFF $(eval $(cmake-package)) From 80793107a65d95f8dfd0317a726d3a737c78ef67 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 18:05:24 +0200 Subject: [PATCH 0438/2890] package/transmission: bump version to 4.0.3 This bump depends on bumping libutp to at least c95738b1a6644b919e5b64d3ea9736cfc5894e0b. Update license hash due to copyright year bump: https://github.com/transmission/transmission/commit/4b8cfa2e576feea6a6f2fd5ae5fe1a59449aca6f Switche buildsystem to cmake, reworked dependencies. Remove all patches, transmission now depends on the libutp package and uses cmake as build system. Upstream removed the configure option for lightweight build: https://github.com/transmission/transmission/commit/47ebb3f63a2f8983f9858bfbec6b72c42588a388 Remove the option to disable uTP support; although the option is still available in the CMAkeLists.txt, building without libutp causes a build failure. Since upstream is not keen on keeping the option, just remove it and always buld with libutp; see: https://github.com/transmission/transmission/commit/47ebb3f63a2f8983f9858bfbec6b72c42588a388 Added -latomic when needed to fix build errors on riscv32 and sparc. Signed-off-by: Bernd Kuhls [yann.morin.1998@free.fr: expand explanations on the libutp change] Signed-off-by: Yann E. MORIN --- package/transmission/0001-fix-utypes.patch | 30 ---------- .../transmission/0002-fix-utp-include.patch | 46 --------------- ...ac-fix-autoreconf-with-autoconf-2.70.patch | 42 ------------- package/transmission/Config.in | 32 +++++----- package/transmission/transmission.hash | 5 +- package/transmission/transmission.mk | 59 +++++++++---------- 6 files changed, 50 insertions(+), 164 deletions(-) delete mode 100644 package/transmission/0001-fix-utypes.patch delete mode 100644 package/transmission/0002-fix-utp-include.patch delete mode 100644 package/transmission/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch diff --git a/package/transmission/0001-fix-utypes.patch b/package/transmission/0001-fix-utypes.patch deleted file mode 100644 index 81efa884a797..000000000000 --- a/package/transmission/0001-fix-utypes.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix build error "conflicting types for 'UTP_Write'" - -Fetch from: http://www.adminsehow.com/2012/10/how-to-install-transmission-2-71-on-debian-6-0-squeeze/ - -The corresponding upstream bug report (unfixed) can be found here: -https://trac.transmissionbt.com/ticket/5232 - -Signed-off-by: Bernd Kuhls -[Fabrice: adapt to 3.00, which always uses stdbool.h] -Signed-off-by: Fabrice Fontaine -[yann.morin.1998@free.fr: - - don't comment-out dropped code, just drop it - - use CR-LF in replacement code, as used by upstream -] -Signed-off-by: Yann E. MORIN - ---- transmission-2.82.org/third-party/libutp/utypes.h 2013-08-09 04:47:43.000000000 +0200 -+++ transmission-2.82/third-party/libutp/utypes.h 2014-01-02 20:17:18.000000000 +0100 -@@ -35,8 +35,8 @@ - typedef const char * cstr; - typedef char * str; - --#ifndef __cplusplus --typedef uint8 bool; --#endif -+#ifndef __cplusplus -+#include -+#endif - - #endif //__UTYPES_H__ diff --git a/package/transmission/0002-fix-utp-include.patch b/package/transmission/0002-fix-utp-include.patch deleted file mode 100644 index db8b5ab39b3c..000000000000 --- a/package/transmission/0002-fix-utp-include.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix compilation when using system libminiupnpc with libutp disabled - -If transmission uses its own copy of libminiupnpc in third-party/ then -the configure script adds that path to CFLAGS: -https://trac.transmissionbt.com/browser/trunk/configure.ac#L455 - -This path is also added if transmission uses its own copy of libutp: -https://trac.transmissionbt.com/browser/trunk/configure.ac#L349 - -But if a system-provided libminiupnpc is used and utp-support is -disabled using --disable-utp the result is a build error, detected by -buildroot autobuilders: -http://autobuild.buildroot.net/results/b79/b79e51140cb0320554a58ce59dcb33f53cd9211a/build-end.log - -net.c:40:24: fatal error: libutp/utp.h: No such file or directory - -Patch proposed by Yann E. MORIN: -http://lists.busybox.net/pipermail/buildroot/2016-July/167896.html - -Patch sent upstream: https://trac.transmissionbt.com/ticket/6163 - -Signed-off-by: Bernd Kuhls - -diff -uNr transmission-2.92.org/configure.ac transmission-2.92/configure.ac ---- transmission-2.92.org/configure.ac 2016-03-06 21:23:45.336198393 +0100 -+++ transmission-2.92/configure.ac 2016-07-31 12:13:40.921660078 +0200 -@@ -358,6 +358,10 @@ - else - AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found") - fi -+else -+ # For the system libminiupnpc with UTC disabled, -+ # point to our bundled UTP headers -+ LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/" - fi - AC_SUBST(LIBUTP_CFLAGS) - AC_SUBST(LIBUTP_LIBS) -@@ -457,7 +461,7 @@ - LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a" - else - AC_DEFINE([SYSTEM_MINIUPNP]) -- LIBUPNP_CFLAGS="" -+ LIBUPNP_CFLAGS="${LIBUTP_CFLAGS}" - LIBUPNP_LIBS="-lminiupnpc" - LIBUPNP_LIBS_QT="-lminiupnpc" - fi diff --git a/package/transmission/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch b/package/transmission/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch deleted file mode 100644 index bfb0084bc439..000000000000 --- a/package/transmission/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 857ac91a03a096601f62b358fc61355d4cc25b9b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Oct 2021 18:51:13 +0200 -Subject: [PATCH] configure.ac: fix autoreconf with autoconf >= 2.70 - -Remove the whitespace before IT_PROG_INTLTOOL as suggested in -https://www.mail-archive.com/bug-autoconf@gnu.org/msg04851.html -to avoid the following build failure with autoconf >= 2.70: - -ERROR: 'IT_PROG_INTLTOOL' must appear in configure.ac for intltool to work. - -The problem has been introduced by upstream autoconf commit -http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=b3b3af821a0b9e82ebe56b77b1731d2fe58f52de - -Fixes: - - http://autobuild.buildroot.org/results/e8bea26f6b12adf16335b24836a7c5c31911af6a - -Signed-off-by: Fabrice Fontaine -[Upstream status: not upstreamable as upstream swicthed to cmake ( -https://github.com/transmission/transmission/issues/1573)] ---- - configure.ac | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fd1132fda..04e0e19bb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -555,9 +555,7 @@ dnl it should be safe to re-edit 0.40 back down to 0.23 - use_nls=no - if test "x$enable_nls" = "xyes" ; then - use_nls=yes -- m4_ifdef([IT_PROG_INTLTOOL], -- [IT_PROG_INTLTOOL([0.35.0],[no-xml])], -- [AC_MSG_ERROR("--enable-nls requires intltool to be installed.")]) -+IT_PROG_INTLTOOL([0.35.0],[no-xml]) - AC_CHECK_HEADERS([libintl.h]) - GETTEXT_PACKAGE=transmission-gtk - AC_SUBST(GETTEXT_PACKAGE) --- -2.33.0 - diff --git a/package/transmission/Config.in b/package/transmission/Config.in index 980b042e335a..84bd85eeffa4 100644 --- a/package/transmission/Config.in +++ b/package/transmission/Config.in @@ -1,12 +1,23 @@ config BR2_PACKAGE_TRANSMISSION bool "transmission" + depends on !BR2_BINFMT_FLAT # libnatpmp + depends on BR2_INSTALL_LIBSTDCPP # libutp + depends on !BR2_STATIC_LIBS # libnatpmp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL + depends on BR2_USE_WCHAR # libpsl + select BR2_PACKAGE_DHT + select BR2_PACKAGE_LIBB64 select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBDEFLATE select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBMINIUPNPC + select BR2_PACKAGE_LIBNATPMP + select BR2_PACKAGE_LIBPSL + select BR2_PACKAGE_LIBUTP + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_ZLIB help Transmission is a cross-platform BitTorrent client. @@ -14,15 +25,6 @@ config BR2_PACKAGE_TRANSMISSION if BR2_PACKAGE_TRANSMISSION -config BR2_PACKAGE_TRANSMISSION_UTP - bool "Transmission uTP support" - depends on BR2_INSTALL_LIBSTDCPP - help - Install support for uTorrent Transport Protocol - -comment "uTP needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - config BR2_PACKAGE_TRANSMISSION_CLI bool "transmission-cli" help @@ -43,6 +45,8 @@ comment "transmission-gtk needs NLS enabled" depends on BR2_PACKAGE_LIBGTK3 && !BR2_SYSTEM_ENABLE_NLS endif -comment "transmission needs a toolchain w/ threads" +comment "transmission needs a toolchain w/ dynamic library, threads, C++, gcc >= 7" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_BINFMT_FLAT + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_STATIC_LIBS diff --git a/package/transmission/transmission.hash b/package/transmission/transmission.hash index 13cbc969d349..e6775c47e70d 100644 --- a/package/transmission/transmission.hash +++ b/package/transmission/transmission.hash @@ -1,3 +1,4 @@ +# From https://transmissionbt.com/download +sha256 b6b01fd58e42bb14f7aba0253db932ced050fcd2bba5d9f8469d77ddd8ad545a transmission-4.0.3.tar.xz # Locally calculated -sha256 9144652fe742f7f7dd6657716e378da60b751aaeda8bef8344b3eefc4db255f2 transmission-3.00.tar.xz -sha256 2b16da5bd02790d1e4d332cfd42b9dfd7d1b0ed3a16a75dc7e76b6ed239fdba9 COPYING +sha256 f56732960a61ecf3b9637404eef1a39221d2006336a98792b7b65a79f155449c COPYING diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index 1660d2c2b984..f3a200ced31b 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -4,55 +4,54 @@ # ################################################################################ -TRANSMISSION_VERSION = 3.00 -TRANSMISSION_SITE = https://github.com/transmission/transmission-releases/raw/master +TRANSMISSION_VERSION = 4.0.3 TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz +TRANSMISSION_SITE = https://github.com/transmission/transmission/releases/download/$(TRANSMISSION_VERSION) TRANSMISSION_DEPENDENCIES = \ host-pkgconf \ - host-intltool \ + dht \ + libb64 \ libcurl \ + libdeflate \ libevent \ + libminiupnpc \ + libnatpmp \ + libpsl \ + libutp \ openssl \ zlib -TRANSMISSION_AUTORECONF = YES TRANSMISSION_CONF_OPTS = \ - --without-inotify \ - --enable-lightweight + -DENABLE_TESTS=OFF \ + -DRUN_CLANG_TIDY=OFF \ + -DUSE_SYSTEM_B64=ON \ + -DUSE_SYSTEM_DEFLATE=ON \ + -DUSE_SYSTEM_DHT=ON \ + -DUSE_SYSTEM_NATPMP=ON \ + -DUSE_SYSTEM_PSL=ON \ + -DWITH_INOTIFY=OFF TRANSMISSION_LICENSE = GPL-2.0 or GPL-3.0 with OpenSSL exception TRANSMISSION_LICENSE_FILES = COPYING TRANSMISSION_CPE_ID_VENDOR = transmissionbt -ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) -TRANSMISSION_DEPENDENCIES += libminiupnpc -endif - -ifeq ($(BR2_PACKAGE_LIBNATPMP),y) -TRANSMISSION_DEPENDENCIES += libnatpmp -TRANSMISSION_CONF_OPTS += --enable-external-natpmp -else -TRANSMISSION_CONF_OPTS += --disable-external-natpmp -endif - -ifeq ($(BR2_PACKAGE_TRANSMISSION_UTP),y) -TRANSMISSION_CONF_OPTS += --enable-utp -else -TRANSMISSION_CONF_OPTS += --disable-utp +# Uses __atomic_load_8 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +TRANSMISSION_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif ifeq ($(BR2_PACKAGE_TRANSMISSION_CLI),y) -TRANSMISSION_CONF_OPTS += --enable-cli +TRANSMISSION_CONF_OPTS += -DENABLE_CLI=ON else -TRANSMISSION_CONF_OPTS += --disable-cli +TRANSMISSION_CONF_OPTS += -DENABLE_CLI=OFF endif ifeq ($(BR2_PACKAGE_TRANSMISSION_DAEMON),y) -TRANSMISSION_CONF_OPTS += --enable-daemon +TRANSMISSION_CONF_OPTS += -DENABLE_DAEMON=ON ifeq ($(BR2_PACKAGE_SYSTEMD),y) TRANSMISSION_DEPENDENCIES += systemd -TRANSMISSION_CONF_OPTS += --with-systemd +TRANSMISSION_CONF_OPTS += -DWITH_SYSTEMD=ON else -TRANSMISSION_CONF_OPTS += --without-systemd +TRANSMISSION_CONF_OPTS += -DWITH_SYSTEMD=OFF endif define TRANSMISSION_USERS @@ -70,14 +69,14 @@ define TRANSMISSION_INSTALL_INIT_SYSTEMD endef else -TRANSMISSION_CONF_OPTS += --disable-daemon +TRANSMISSION_CONF_OPTS += -DENABLE_DAEMON=OFF endif ifeq ($(BR2_PACKAGE_TRANSMISSION_GTK),y) -TRANSMISSION_CONF_OPTS += --with-gtk +TRANSMISSION_CONF_OPTS += -DENABLE_GTK=ON TRANSMISSION_DEPENDENCIES += libgtk3 else -TRANSMISSION_CONF_OPTS += --without-gtk +TRANSMISSION_CONF_OPTS += -DENABLE_GTK=OFF endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) From 12bf326c258a52d6e96c9ddd2402a0bc9feb8857 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 3 May 2023 13:48:53 +0200 Subject: [PATCH 0439/2890] package/boost: bump to version 1.82.0 - add option for new library "url" - drop upstreamed patch - Math now requires C++14/gcc5 Signed-off-by: Michael Nosthoff [yann.morin.1998@free.fr: - propagate the new boost-math option to uhd - fix indentation in help for boost-url ] Signed-off-by: Yann E. MORIN --- .../0001-Improve-modfunc-performance.patch | 551 ------------------ package/boost/Config.in | 14 + package/boost/boost.hash | 4 +- package/boost/boost.mk | 5 +- package/uhd/Config.in | 6 +- 5 files changed, 23 insertions(+), 557 deletions(-) delete mode 100644 package/boost/0001-Improve-modfunc-performance.patch diff --git a/package/boost/0001-Improve-modfunc-performance.patch b/package/boost/0001-Improve-modfunc-performance.patch deleted file mode 100644 index a34d6bb4d547..000000000000 --- a/package/boost/0001-Improve-modfunc-performance.patch +++ /dev/null @@ -1,551 +0,0 @@ -From 825aedad557b7e3bb27614335b6ced16887103de Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= -Date: Mon, 7 Nov 2022 00:16:44 +0100 -Subject: [PATCH] Improve "modfunc" performance Fixes #79 - ("boost/intrusive/hashtable.hpp: build failure (undeclared indentifier)") - -Backport from Boost development branch to fix issues with some architectures -(64-bit with 128-bit processing, where size_t != unsigned long). In this case, -code is enabled that causes a build failure. - -Upstream: https://github.com/boostorg/intrusive/commit/825aedad557b7e3bb27614335b6ced16887103de -Issue: https://github.com/boostorg/intrusive/issues/79 -Fixes: http://autobuild.buildroot.net/results/6cb/6cbc0672f3c5046405793d8cdc8f961d2ffb1d3e - -Signed-off-by: Andreas Ziegler ---- - include/boost/intrusive/hashtable.hpp | 235 ++++++++++++++++---------- - 1 file changed, 145 insertions(+), 90 deletions(-) - -diff --git a/include/boost/intrusive/hashtable.hpp b/include/boost/intrusive/hashtable.hpp -index b8bc877..688fb9b 100644 ---- a/boost/intrusive/hashtable.hpp -+++ b/boost/intrusive/hashtable.hpp -@@ -2,6 +2,7 @@ - // - // (C) Copyright Ion Gaztanaga 2006-2022 - // (C) Copyright 2022 Joaquin M Lopez Munoz. -+// (C) Copyright 2022 Christian Mazakas - // - // Distributed under the Boost Software License, Version 1.0. - // (See accompanying file LICENSE_1_0.txt or copy at -@@ -84,11 +85,6 @@ namespace intrusive { - - /// @cond - --#if !defined(BOOST_NO_INT64_T)&&\ -- (defined(BOOST_HAS_INT128) || (defined(_MSC_VER) && defined(_WIN64))) --#define BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT --#endif -- - //We only support LLP64(Win64) or LP64(most Unix) data models - #ifdef _WIN64 //In 64 bit windows sizeof(size_t) == sizeof(unsigned long long) - # define BOOST_INTRUSIVE_SIZE_C(NUMBER) NUMBER##ULL -@@ -98,7 +94,6 @@ namespace intrusive { - # define BOOST_INTRUSIVE_64_BIT_SIZE_T (((((ULONG_MAX>>16)>>16)>>16)>>15) != 0) - #endif - -- - template - struct prime_list_holder - { -@@ -167,11 +162,11 @@ struct prime_list_holder - { return prime_list[std::ptrdiff_t(n)]; } - - template -- BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % prime_list[SizeIndex]; } -+ BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % SizeIndex; } - - static std::size_t(*const positions[])(std::size_t); - -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T - static const uint64_t inv_sizes32[]; - static const std::size_t inv_sizes32_size; - #endif -@@ -185,17 +180,20 @@ struct prime_list_holder - BOOST_INTRUSIVE_FORCEINLINE static std::size_t size(std::size_t size_index) - { return prime_list_holder<>::size_from_index(size_index); } - -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T - // https://github.com/lemire/fastmod - -- - BOOST_INTRUSIVE_FORCEINLINE static uint64_t mul128_u32(uint64_t lowbits, uint32_t d) - { - #if defined(_MSC_VER) -- return __umulh(lowbits, d); -+ return __umulh(lowbits, d); -+ #elif defined(BOOST_HAS_INT128) -+ return static_cast((uint128_type(lowbits) * d) >> 64); - #else -- __extension__ typedef unsigned __int128 ext_uint128_t; -- return (ext_uint128_t(lowbits) * d) >> 64; -+ uint64_t r1 = (lowbits & UINT32_MAX) * d; -+ uint64_t r2 = (lowbits >> 32) * d; -+ r2 += r1 >> 32; -+ return r2 >> 32; - #endif - } - -@@ -204,51 +202,67 @@ struct prime_list_holder - uint64_t lowbits = M * a; - return (uint32_t)(mul128_u32(lowbits, d)); - } -- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - - BOOST_INTRUSIVE_FORCEINLINE static std::size_t position(std::size_t hash,std::size_t size_index) - { -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) && BOOST_INTRUSIVE_64_BIT_SIZE_T -- const std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T -+ BOOST_CONSTEXPR_OR_CONST std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); - if(BOOST_LIKELY(size_index < sizes_under_32bit)){ - return fastmod_u32( uint32_t(hash)+uint32_t(hash>>32) - , inv_sizes32[size_index] - , uint32_t(prime_list[size_index]) ); - } - else{ -- return positions[size_index-sizes_under_32bit](hash); -+ return positions[size_index](hash); - } -- #elif defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -- return fastmod_u32(hash, inv_sizes32[size_index], uint32_t(sizes[size_index])); - #else - return positions[size_index](hash); -- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - } - }; - - template - std::size_t(* const prime_list_holder::positions[])(std::size_t) = - { -- #if !defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -- modfunc< 0>,modfunc< 1>,modfunc< 2>,modfunc< 3>,modfunc< 4>, -- modfunc< 5>,modfunc< 6>,modfunc< 7>,modfunc< 8>,modfunc< 9>, -- modfunc<10>,modfunc<11>,modfunc<12>,modfunc<13>,modfunc<14>, -- modfunc<15>,modfunc<16>,modfunc<17>,modfunc<18>,modfunc<19>, -- modfunc<20>,modfunc<21>,modfunc<22>,modfunc<23>,modfunc<24>, -- modfunc<25>,modfunc<26>,modfunc<27>,modfunc<28>,modfunc<29>, -- modfunc<30>, -- #endif -- # if BOOST_INTRUSIVE_64_BIT_SIZE_T -- modfunc<31>,modfunc<32>,modfunc<33>,modfunc<34>, -- modfunc<35>,modfunc<36>,modfunc<37>,modfunc<38>,modfunc<39>, -- modfunc<40>,modfunc<41>,modfunc<42>,modfunc<43>,modfunc<44>, -- modfunc<45>,modfunc<46>,modfunc<47>,modfunc<48>,modfunc<49>, -- modfunc<50>,modfunc<51>,modfunc<52>,modfunc<53>,modfunc<54>, -- modfunc<55>,modfunc<56>,modfunc<57>,modfunc<58>,modfunc<59>, -- modfunc<60>,modfunc<61>,modfunc<62>,modfunc<63> -- # else -- modfunc<31> -- # endif -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, //0-30 indexes -+#if BOOST_INTRUSIVE_64_BIT_SIZE_T -+ //Taken from Boost.MultiIndex code, thanks to Joaquin M. Lopez Munoz. -+ modfunc, //<- 32 bit values stop here (index 31) -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc //(index 63) -+#else -+ modfunc //<- 32 bit stops here (index 31) as ptrdiff_t is signed -+#endif - }; - - template -@@ -298,7 +312,7 @@ const std::size_t prime_list_holder::prime_list_size - = sizeof(prime_list) / sizeof(std::size_t); - - --#if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+#if BOOST_INTRUSIVE_64_BIT_SIZE_T - - template - const uint64_t prime_list_holder::inv_sizes32[] = { -@@ -340,7 +354,7 @@ template - const std::size_t prime_list_holder::inv_sizes32_size - = sizeof(inv_sizes32) / sizeof(uint64_t); - --#endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+#endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - - struct prime_fmod_size : prime_list_holder<> - { -@@ -785,9 +799,9 @@ BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_va - } - - template //fastmod_buckets --BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t bucket_cnt, std::size_t split, detail::true_) -+BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t , std::size_t split, detail::true_) - { -- return prime_fmod_size::position(hash_value, split); (void)bucket_cnt; -+ return prime_fmod_size::position(hash_value, split); - } - - //!This metafunction will obtain the type of a bucket -@@ -1473,6 +1487,10 @@ struct bucket_hash_t - , bucket_plus_vtraits_t(BOOST_MOVE_BASE(bucket_plus_vtraits_t, other)) - {} - -+ template -+ BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_hash(const K &k) const -+ { return this->base_t::operator()(k); } -+ - BOOST_INTRUSIVE_FORCEINLINE const hasher &priv_hasher() const - { return this->base_t::get(); } - -@@ -1747,8 +1765,17 @@ struct hashtable_size_wrapper - typedef const size_traits & size_traits_const_t; - typedef size_traits & size_traits_t; - -- BOOST_INTRUSIVE_FORCEINLINE size_traits_const_t priv_size_traits() const -- { return size_traits_; } -+ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const -+ { return size_traits_.get_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType s) -+ { size_traits_.set_size(s); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() -+ { size_traits_.increment(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() -+ { size_traits_.decrement(); } - - BOOST_INTRUSIVE_FORCEINLINE size_traits_t priv_size_traits() - { return size_traits_; } -@@ -1780,7 +1807,19 @@ struct hashtable_size_wrapper - typedef size_traits size_traits_const_t; - typedef size_traits size_traits_t; - -- BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() const -+ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const -+ { return 0u; } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType) -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() - { return size_traits(); } - }; - -@@ -1815,14 +1854,14 @@ struct hashdata_internal - public: - static const bool linear_buckets = 0 != (BoolFlags & hash_bool_flags::linear_buckets_pos); - typedef typename get_hashtable_size_wrapper_bucket -- ::type internal_type; -- -- typedef typename internal_type::key_equal key_equal; -- typedef typename internal_type::hasher hasher; -+ ::type split_bucket_hash_equal_t; -+ -+ typedef typename split_bucket_hash_equal_t::key_equal key_equal; -+ typedef typename split_bucket_hash_equal_t::hasher hasher; - typedef bucket_plus_vtraits - bucket_plus_vtraits_t; - typedef SizeType size_type; -- typedef typename internal_type::size_traits split_traits; -+ typedef typename split_bucket_hash_equal_t::size_traits split_traits; - typedef typename bucket_plus_vtraits_t::bucket_ptr bucket_ptr; - typedef typename bucket_plus_vtraits_t::const_value_traits_ptr const_value_traits_ptr; - typedef typename bucket_plus_vtraits_t::siterator siterator; -@@ -1866,23 +1905,20 @@ struct hashdata_internal - - hashdata_internal( const ValueTraits &val_traits, const bucket_traits &b_traits - , const hasher & h, const key_equal &e) -- : internal_type(val_traits, b_traits, h, e) -+ : split_bucket_hash_equal_t(val_traits, b_traits, h, e) - {} - - BOOST_INTRUSIVE_FORCEINLINE hashdata_internal(BOOST_RV_REF(hashdata_internal) other) -- : internal_type(BOOST_MOVE_BASE(internal_type, other)) -+ : split_bucket_hash_equal_t(BOOST_MOVE_BASE(split_bucket_hash_equal_t, other)) - {} - -- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_t priv_split_traits() -- { return this->priv_size_traits(); } -- -- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_const_t priv_split_traits() const -+ BOOST_INTRUSIVE_FORCEINLINE typename split_bucket_hash_equal_t::size_traits_t priv_split_traits() - { return this->priv_size_traits(); } - - ~hashdata_internal() - { this->priv_clear_buckets(); } - -- using internal_type::priv_clear_buckets; -+ using split_bucket_hash_equal_t::priv_clear_buckets; - - void priv_clear_buckets() - { -@@ -1907,7 +1943,17 @@ struct hashdata_internal - - //public functions - BOOST_INTRUSIVE_FORCEINLINE SizeType split_count() const BOOST_NOEXCEPT -- { return this->priv_split_traits().get_size(); } -+ { return this->split_bucket_hash_equal_t::get_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void split_count(SizeType s) BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::set_hashtable_size_wrapper_size(s); } -+ -+ //public functions -+ BOOST_INTRUSIVE_FORCEINLINE void inc_split_count() BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::inc_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_split_count() BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::dec_hashtable_size_wrapper_size(); } - - BOOST_INTRUSIVE_FORCEINLINE static SizeType initial_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT - { -@@ -1983,10 +2029,7 @@ struct hashdata_internal - { return (priv_hash_to_nbucket)(hash_value, fastmod_buckets_t()); } - - BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::true_) const //fastmod_buckets_t -- { -- return static_cast(hash_to_bucket_split -- (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::true_())); -- } -+ { return static_cast(prime_fmod_size::position(hash_value, this->split_count())); } - - BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::false_) const //!fastmod_buckets_t - { -@@ -1994,7 +2037,6 @@ struct hashdata_internal - (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::false_())); - } - -- - BOOST_INTRUSIVE_FORCEINLINE iterator iterator_to(reference value, detail::false_) BOOST_NOEXCEPT - { - return iterator( siterator(this->priv_value_to_node_ptr(value)) -@@ -2083,8 +2125,8 @@ struct hashdata_internal - , this->priv_value_traits_ptr()); - } - -- using internal_type::end; -- using internal_type::cend; -+ using split_bucket_hash_equal_t::end; -+ using split_bucket_hash_equal_t::cend; - - local_iterator end(size_type n) BOOST_NOEXCEPT - { return local_iterator(this->priv_bucket_lend(n), this->priv_value_traits_ptr()); } -@@ -2322,19 +2364,32 @@ class hashtable_impl - public: - typedef insert_commit_data_impl insert_commit_data; - -+ private: - void default_init_actions() - { - this->priv_set_sentinel_bucket(); - this->priv_init_buckets_and_cache(); -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - size_type bucket_sz = this->bucket_count(); - BOOST_INTRUSIVE_INVARIANT_ASSERT(bucket_sz != 0); - //Check power of two bucket array if the option is activated - BOOST_INTRUSIVE_INVARIANT_ASSERT - (!power_2_buckets || (0 == (bucket_sz & (bucket_sz - 1)))); -- this->priv_split_traits().set_size(this->initial_split_from_bucket_count(bucket_sz)); -+ this->split_count(this->initial_split_from_bucket_count(bucket_sz)); - } - -+ BOOST_INTRUSIVE_FORCEINLINE SizeType priv_size_count() const BOOST_NOEXCEPT -+ { return this->internal_type::get_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_count(SizeType s) BOOST_NOEXCEPT -+ { this->internal_type::set_hashtable_size_wrapper_size(s); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_inc() BOOST_NOEXCEPT -+ { this->internal_type::inc_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_dec() BOOST_NOEXCEPT -+ { this->internal_type::dec_hashtable_size_wrapper_size(); } -+ - public: - - //! Requires: buckets must not be being used by any other resource. -@@ -2403,10 +2458,10 @@ class hashtable_impl - { - this->priv_swap_cache(x); - x.priv_init_cache(); -- this->priv_size_traits().set_size(x.priv_size_traits().get_size()); -- x.priv_size_traits().set_size(size_type(0)); -- this->priv_split_traits().set_size(x.split_count()); -- x.priv_split_traits().set_size(size_type(0)); -+ this->priv_size_count(x.priv_size_count()); -+ x.priv_size_count(size_type(0)); -+ this->split_count(x.split_count()); -+ x.split_count(size_type(0)); - } - - //! Effects: Equivalent to swap. -@@ -2524,7 +2579,7 @@ class hashtable_impl - size_type size() const BOOST_NOEXCEPT - { - BOOST_IF_CONSTEXPR(constant_time_size) -- return this->priv_size_traits().get_size(); -+ return this->priv_size_count(); - else{ - std::size_t len = 0; - std::size_t bucket_cnt = this->bucket_count(); -@@ -2798,7 +2853,7 @@ class hashtable_impl - //! After a successful rehashing insert_commit_data remains valid. - iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT - { -- this->priv_size_traits().increment(); -+ this->priv_size_inc(); - node_ptr const n = this->priv_value_to_node_ptr(value); - BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || slist_node_algorithms::unique(n)); - node_functions_t::store_hash(n, commit_data.get_hash(), store_hash_t()); -@@ -2890,7 +2945,7 @@ class hashtable_impl - //Get the bucket number and local iterator for both iterators - const bucket_ptr bp = this->priv_get_bucket_ptr(i); - this->priv_erase_node(*bp, i.slist_it(), this->make_node_disposer(disposer), optimize_multikey_t()); -- this->priv_size_traits().decrement(); -+ this->priv_size_dec(); - this->priv_erasure_update_cache(bp); - } - -@@ -2931,7 +2986,7 @@ class hashtable_impl - size_type const num_erased = (size_type)this->priv_erase_node_range - ( before_first_local_it, first_bucket_num, last_local_it, last_bucket_num - , this->make_node_disposer(disposer), optimize_multikey_t()); -- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-num_erased)); -+ this->priv_size_count(size_type(this->priv_size_count()-num_erased)); - this->priv_erasure_update_cache_range(first_bucket_num, last_bucket_num); - } - } -@@ -3001,7 +3056,7 @@ class hashtable_impl - (this->priv_value_from_siterator(it), h, key, equal_func, compare_hash_t())); - slist_node_algorithms::unlink_after_and_dispose(prev.pointed_node(), it.pointed_node(), this->make_node_disposer(disposer)); - } -- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-cnt)); -+ this->priv_size_count(size_type(this->priv_size_count()-cnt)); - this->priv_erasure_update_cache(); - } - -@@ -3020,7 +3075,7 @@ class hashtable_impl - void clear() BOOST_NOEXCEPT - { - this->priv_clear_buckets_and_cache(); -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - } - - //! Requires: Disposer::operator()(pointer) shouldn't throw. -@@ -3045,7 +3100,7 @@ class hashtable_impl - --num_buckets; - slist_node_algorithms::detach_and_dispose(b->get_node_ptr(), d); - } -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - } - this->priv_init_cache(); - } -@@ -3339,7 +3394,7 @@ class hashtable_impl - //! - //! Note: the return value is in the range [0, this->bucket_count()). - BOOST_INTRUSIVE_FORCEINLINE size_type bucket(const key_type& k) const -- { return this->bucket(k, this->priv_hasher()); } -+ { return this->priv_hash_to_nbucket(this->priv_hash(k)); } - - //! Requires: "hash_func" must be a hash function that induces - //! the same hash values as the stored hasher. The difference is that -@@ -3520,7 +3575,7 @@ class hashtable_impl - if((ret = split_idx < bucket_cnt)){ - const std::size_t bucket_to_rehash = split_idx - bucket_cnt/2u; - bucket_type &old_bucket = this->priv_bucket(bucket_to_rehash); -- this->priv_split_traits().increment(); -+ this->inc_split_count(); - - //Anti-exception stuff: if an exception is thrown while - //moving elements from old_bucket to the target bucket, all moved -@@ -3553,7 +3608,7 @@ class hashtable_impl - bucket_type &target_bucket = this->priv_bucket(target_bucket_num); - bucket_type &source_bucket = this->priv_bucket(split_idx-1u); - slist_node_algorithms::transfer_after(target_bucket.get_node_ptr(), source_bucket.get_node_ptr()); -- this->priv_split_traits().decrement(); -+ this->dec_split_count(); - this->priv_insertion_update_cache(target_bucket_num); - } - return ret; -@@ -3763,8 +3818,8 @@ class hashtable_impl - ArrayDisposer rollback2(old_buckets[0], nd, old_bucket_count); - - //Put size in a safe value for rollback exception -- size_type const size_backup = this->priv_size_traits().get_size(); -- this->priv_size_traits().set_size(0); -+ size_type const size_backup = this->priv_size_count(); -+ this->priv_size_count(0); - //Put cache to safe position - this->priv_init_cache(); - this->priv_unset_sentinel_bucket(); -@@ -3826,8 +3881,8 @@ class hashtable_impl - } - } - -- this->priv_size_traits().set_size(size_backup); -- this->priv_split_traits().set_size(split); -+ this->priv_size_count(size_backup); -+ this->split_count(split); - if(&new_bucket_traits != &this->priv_bucket_traits()) - this->priv_bucket_traits() = new_bucket_traits; - this->priv_set_sentinel_bucket(); -@@ -3927,8 +3982,8 @@ class hashtable_impl - this->priv_hasher() = src.priv_hasher(); - this->priv_equal() = src.priv_equal(); - rollback.release(); -- this->priv_size_traits().set_size(src.priv_size_traits().get_size()); -- this->priv_split_traits().set_size(dst_bucket_count); -+ this->priv_size_count(src.priv_size_count()); -+ this->split_count(dst_bucket_count); - this->priv_set_cache_bucket_num(0u); - this->priv_erasure_update_cache(); - } -@@ -3946,7 +4001,7 @@ class hashtable_impl - , n, optimize_multikey_t()); - //Update cache and increment size if needed - this->priv_insertion_update_cache(bucket_num); -- this->priv_size_traits().increment(); -+ this->priv_size_inc(); - slist_node_algorithms::link_after(prev.pointed_node(), n); - return this->build_iterator(siterator(n), this->priv_bucket_ptr(bucket_num)); - } --- -2.34.1 - diff --git a/package/boost/Config.in b/package/boost/Config.in index b99b01f22ebe..60cc0a11a2ff 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -219,6 +219,7 @@ comment "boost-log needs a toolchain not affected by GCC bug 64735" config BR2_PACKAGE_BOOST_MATH bool "boost-math" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 help Boost.Math includes several contributions in the domain of mathematics: @@ -341,6 +342,19 @@ config BR2_PACKAGE_BOOST_TYPE_ERASURE comment "boost-type_erasure needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +config BR2_PACKAGE_BOOST_URL + bool "boost-url" + help + Boost.URL is a portable C++ library which provides containers + and algorithms which model a "URL," more formally described + using the Uniform Resource Identifier (URI) specification. + + This library understands the grammars related to URLs and + provides functionality to validate, parse, examine, and + modify urls, and apply normalization or resolution algorithms. + + To use the library "header-only" this option is not needed. + config BR2_PACKAGE_BOOST_WAVE bool "boost-wave" # limitation of assembler for coldfire diff --git a/package/boost/boost.hash b/package/boost/boost.hash index ab54a4b2fc09..36de2b9b0692 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_80_0.html -sha256 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 boost_1_80_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_82_0.html +sha256 a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 boost_1_82_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index bd1d32998252..d432ab48cc39 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.80.0 +BOOST_VERSION = 1.82.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES @@ -18,7 +18,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ python random serialization stacktrace test thread timer \ - type_erasure wave) + type_erasure url wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) @@ -50,6 +50,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_URL),,url) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave) BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) diff --git a/package/uhd/Config.in b/package/uhd/Config.in index 75554259d0e5..4316a2c18573 100644 --- a/package/uhd/Config.in +++ b/package/uhd/Config.in @@ -1,8 +1,9 @@ -comment "uhd needs a toolchain w/ C++, NPTL, wchar, dynamic library" +comment "uhd needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 5" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "uhd needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 @@ -16,6 +17,7 @@ config BR2_PACKAGE_UHD depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # use fork() depends on BR2_USE_WCHAR # boost + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # boost-math select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_CHRONO From dfefdea8e5a7b368616fc7733022c23a475b215f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 7 May 2023 18:54:07 +0200 Subject: [PATCH 0440/2890] .checkpackageignore: regenerate list Some patches were removed in recent version bumps: - 80793107a65d package/transmission: bump version to 4.0.3 - 8d6ddb7a2905 package/rtl8812-aircrack-ng: bump to 2023-05-01 version to fix build failure with Linux 6.3 Update the ignore list accordingly. Signed-off-by: Yann E. MORIN --- .checkpackageignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index cd0ccc1abd48..b753e1ecfc73 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1415,7 +1415,6 @@ package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.p package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch Upstream package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch Upstream package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch Upstream -package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch Upstream package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch Upstream package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch Upstream package/rtmpdump/0001-include-limits.h.patch Upstream @@ -1569,9 +1568,6 @@ package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch Upstream package/tovid/0001-manpage.patch Upstream package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch Upstream -package/transmission/0001-fix-utypes.patch Upstream -package/transmission/0002-fix-utp-include.patch Upstream -package/transmission/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch Upstream package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables package/triggerhappy/S10triggerhappy Indent Shellcheck Variables package/trinity/0001-Fix-build-with-GCC-10.patch Upstream From 00dc5ccd01b7dc981faeaf5aedef1d1f48df865b Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 7 May 2023 20:14:24 +0200 Subject: [PATCH 0441/2890] package/openblas: bump to version v0.3.23 This commit also: - adds the md5 from the release note in the package hash file, - rebase the patch on the new version tag, - adds the "Upstream:" tag in the patch. For change log since v0.3.22, see: - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.23 Signed-off-by: Julien Olivain [yann.morin.1998@free.fr: update .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...ile.system-don-t-specify-optimization-level-bui.patch | 9 +++++---- package/openblas/openblas.hash | 4 +++- package/openblas/openblas.mk | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index b753e1ecfc73..cdc12c232833 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1156,7 +1156,6 @@ package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch Upstream package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch Upstream package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch Upstream package/open2300/0001-fix-makefile.patch Upstream -package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch Upstream package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream package/openldap/0001-fix_cross_strip.patch Upstream package/openldap/0002-fix-bignum.patch Upstream diff --git a/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch index e0c738748a1f..ed3cae82ef4c 100644 --- a/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch +++ b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch @@ -1,4 +1,4 @@ -From d8ec4e4c6ef69165179f376e365034de10e6fee3 Mon Sep 17 00:00:00 2001 +From 89648b76e35dc4657942c861ed9dbfbfe5a3df28 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Fri, 5 Mar 2021 14:09:23 +0100 Subject: [PATCH] Makefile.system: don't specify optimization level @@ -11,16 +11,17 @@ The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives. Remove the optimization level specified in openblas itself. +Upstream: N/A, not upstreamable Signed-off-by: Thomas De Schampheleire --- Makefile.system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.system b/Makefile.system -index 438a8148..9de1bbd5 100644 +index 343b94bb3..c355ca5d9 100644 --- a/Makefile.system +++ b/Makefile.system -@@ -1519,11 +1519,11 @@ FCOMMON_OPT += -g +@@ -1585,11 +1585,11 @@ FCOMMON_OPT += -g endif ifndef COMMON_OPT @@ -35,5 +36,5 @@ index 438a8148..9de1bbd5 100644 override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) -- -2.35.1 +2.40.1 diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index a8b5527e81cd..2e5fa8865f71 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,5 @@ +# From https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.23 +md5 115634b39007de71eb7e75cf7591dfb2 openblas-0.3.23.tar.gz # Locally calculated -sha256 7fa9685926ba4f27cfe513adbf9af64d6b6b63f9dcabb37baefad6a65ff347a7 openblas-0.3.22.tar.gz +sha256 5d9491d07168a5d00116cdc068a40022c3455bf9293c7cb86a65b1054d7e5114 openblas-0.3.23.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 27f20654e73d..f7a50d7bc711 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.22 +OPENBLAS_VERSION = 0.3.23 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE From 771e120e8ea3b310db1506c9dbd1574df4922359 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 18:39:44 +0200 Subject: [PATCH 0442/2890] package/freetype: bump version to 2.13.0 Release notes: https://sourceforge.net/projects/freetype/files/freetype2/2.13.0/ Updated license hash due to upstream commits: "fix spelling err in LICENSE.txt" https://gitlab.freedesktop.org/freetype/freetype/-/commit/c0b4f6a8625a39ecd4c323d74ddec0e94fca214d [autofit] Don't depend on 'hb-ft'. https://gitlab.freedesktop.org/freetype/freetype/-/commit/ebe7e9128cdf81cb0a0d27fe293ecff96f6c98a8 Since we build freetype without harfbuzz support anyway, the affected files are not compiled (the code is entirely guarded), so no changes to the license information of this package are necessary. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/freetype/freetype.hash | 8 ++++---- package/freetype/freetype.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index a558a3e84627..60eb8dbb1d7a 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.12.1/ -sha1 5133eed28a7624ffabbf6d00aa3f68b841d62d80 freetype-2.12.1.tar.xz -sha256 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f freetype-2.12.1.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.13.0/ +sha1 6393c1451c2f1c5f83aed5ea92d280af078e27d9 freetype-2.13.0.tar.xz +sha256 5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c freetype-2.13.0.tar.xz # Locally calculated -sha256 c85e842b7ff04d95dab7d68e812773de0f8b67940e5449d35b42c66eb0f619fe LICENSE.TXT +sha256 2e3bbb7d7c5c396368dd0853a790ec29ce5b8647163dde42a0493fb0d6556b2b LICENSE.TXT sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 36ef3cb5270e..4d7c4cd0d5f2 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.12.1 +FREETYPE_VERSION = 2.13.0 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES From 8b584dbf0636c53ae743469ae604d1bb1b85ea2e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 18:39:45 +0200 Subject: [PATCH 0443/2890] package/fontconfig: bump version to 2.14.2 Removed patch included in upstream release, renumbered and reformatted Upstream: tag for remaining patch, updated .checkpackageignore. Updated license hash due to upstream commit: "Add line between licenses in COPYING." https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/23cede3e955fcdbc6d6d9b5a5974aaac5760c217 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 - ...x-the-build-issue-with-enable-static.patch | 133 ------------------ ...ead-as-a-dependency-of-a-static-lib.patch} | 3 +- package/fontconfig/fontconfig.hash | 6 +- package/fontconfig/fontconfig.mk | 8 +- 5 files changed, 8 insertions(+), 144 deletions(-) delete mode 100644 package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch rename package/fontconfig/{0002-add-pthread-as-a-dependency-of-a-static-lib.patch => 0001-add-pthread-as-a-dependency-of-a-static-lib.patch} (93%) diff --git a/.checkpackageignore b/.checkpackageignore index cdc12c232833..d42179bc3c3f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -500,8 +500,6 @@ package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch Upstream package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch Upstream package/fluent-bit/0003-fix-build-without-C.patch Upstream package/fluxbox/0001-fixes-bug-1138.patch Upstream -package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch Upstream -package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch Upstream package/freeipmi/0001-add-disable-doc.patch Upstream package/freeradius-client/0001-fix-for-nettle.patch Upstream package/freerdp/0001-Fix-variable-declaration-in-loop.patch Upstream diff --git a/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch b/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch deleted file mode 100644 index bf04bd95fc7c..000000000000 --- a/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 8208f99fa1676c42bfd8d74de3e9dac5366c150c Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Mon, 3 Sep 2018 04:56:16 +0000 -Subject: [PATCH] Fix the build issue with --enable-static - -Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/109 -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/8208f99fa1676c42bfd8d74de3e9dac5366c150c] ---- - doc/fcstring.fncs | 12 ++++++++++++ - fontconfig/fontconfig.h | 4 ++++ - src/fcint.h | 4 ---- - test/test-bz106632.c | 35 ++++++++++++----------------------- - 4 files changed, 28 insertions(+), 27 deletions(-) - -diff --git a/doc/fcstring.fncs b/doc/fcstring.fncs -index 0412bbd..d5ec043 100644 ---- a/doc/fcstring.fncs -+++ b/doc/fcstring.fncs -@@ -223,6 +223,18 @@ This is just a wrapper around free(3) which helps track memory usage of - strings within the fontconfig library. - @@ - -+@RET@ FcChar8 * -+@FUNC@ FcStrBuildFilename -+@TYPE1@ const FcChar8 * @ARG1@ path -+@TYPE2@ ... -+@PURPOSE@ Concatenate strings as a file path -+@DESC@ -+Creates a filename from the given elements of strings as file paths -+and concatenate them with the appropriate file separator. -+Arguments must be null-terminated. -+This returns a newly-allocated memory which should be freed when no longer needed. -+@@ -+ - @RET@ FcChar8 * - @FUNC@ FcStrDirname - @TYPE1@ const FcChar8 * @ARG1@ file -diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h -index bac1dda..af870d0 100644 ---- a/fontconfig/fontconfig.h -+++ b/fontconfig/fontconfig.h -@@ -1076,6 +1076,10 @@ FcUtf16Len (const FcChar8 *string, - int *nchar, - int *wchar); - -+FcPublic FcChar8 * -+FcStrBuildFilename (const FcChar8 *path, -+ ...); -+ - FcPublic FcChar8 * - FcStrDirname (const FcChar8 *file); - -diff --git a/src/fcint.h b/src/fcint.h -index de78cd8..a9d075a 100644 ---- a/src/fcint.h -+++ b/src/fcint.h -@@ -1282,10 +1282,6 @@ FcStrUsesHome (const FcChar8 *s); - FcPrivate FcBool - FcStrIsAbsoluteFilename (const FcChar8 *s); - --FcPrivate FcChar8 * --FcStrBuildFilename (const FcChar8 *path, -- ...); -- - FcPrivate FcChar8 * - FcStrLastSlash (const FcChar8 *path); - -diff --git a/test/test-bz106632.c b/test/test-bz106632.c -index daa0c1e..2d67c2e 100644 ---- a/test/test-bz106632.c -+++ b/test/test-bz106632.c -@@ -25,25 +25,26 @@ - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -+#include - #include -+#include - #include -+#include -+#include - #ifndef HAVE_STRUCT_DIRENT_D_TYPE - #include - #include --#include - #endif --#include "fcstr.c" --#undef FcConfigBuildFonts --#undef FcConfigCreate --#undef FcConfigGetCurrent --#undef FcConfigParseAndLoadFromMemory --#undef FcConfigUptoDate --#undef FcFontList --#undef FcInitReinitialize --#undef FcPatternCreate --#undef FcPatternDestroy - #include - -+#ifdef _WIN32 -+# define FC_DIR_SEPARATOR '\\' -+# define FC_DIR_SEPARATOR_S "\\" -+#else -+# define FC_DIR_SEPARATOR '/' -+# define FC_DIR_SEPARATOR_S "/" -+#endif -+ - #ifdef HAVE_MKDTEMP - #define fc_mkdtemp mkdtemp - #else -@@ -154,18 +155,6 @@ unlink_dirs (const char *dir) - return ret; - } - --FcChar8 * --FcLangNormalize (const FcChar8 *lang) --{ -- return NULL; --} -- --FcChar8 * --FcConfigHome (void) --{ -- return NULL; --} -- - int - main (void) - { --- -2.18.1 - diff --git a/package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch b/package/fontconfig/0001-add-pthread-as-a-dependency-of-a-static-lib.patch similarity index 93% rename from package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch rename to package/fontconfig/0001-add-pthread-as-a-dependency-of-a-static-lib.patch index eed9dba00565..c6aa51453415 100644 --- a/package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch +++ b/package/fontconfig/0001-add-pthread-as-a-dependency-of-a-static-lib.patch @@ -5,8 +5,7 @@ Subject: [PATCH] add pthread as a dependency of a static lib Downloaded from https://trac.netlabs.org/ports/changeset/2220 -Patch sent upstream: -https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/121 +Upstream: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/121 Signed-off-by: Bernd Kuhls --- diff --git a/package/fontconfig/fontconfig.hash b/package/fontconfig/fontconfig.hash index 844ee426d4f3..a4f87caf1ee6 100644 --- a/package/fontconfig/fontconfig.hash +++ b/package/fontconfig/fontconfig.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/fontconfig/2018-August/006324.html -sha256 f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 fontconfig-2.13.1.tar.bz2 +# From https://lists.freedesktop.org/archives/fontconfig/2023-January/006950.html +sha256 dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b fontconfig-2.14.2.tar.xz # Locally calculated -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 COPYING +sha256 51a51aa9823704fd90bccc616cdd17ebabb5b2b3e9cbde886ca02c7002288067 COPYING diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index e34acde534f9..d2eb76e40a37 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -4,10 +4,10 @@ # ################################################################################ -FONTCONFIG_VERSION = 2.13.1 -FONTCONFIG_SITE = http://fontconfig.org/release -FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2 -# 0002-add-pthread-as-a-dependency-of-a-static-lib.patch +FONTCONFIG_VERSION = 2.14.2 +FONTCONFIG_SITE = https://www.freedesktop.org/software/fontconfig/release +FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.xz +# 0001-add-pthread-as-a-dependency-of-a-static-lib.patch FONTCONFIG_AUTORECONF = YES FONTCONFIG_INSTALL_STAGING = YES FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf \ From ee348693531d581ad57a0c605dbebd8fba673ca3 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Wed, 3 May 2023 07:39:06 +0300 Subject: [PATCH 0444/2890] package/libgeos: bump version to 3.11.2 Changelog: https://github.com/libgeos/geos/releases/tag/3.11.2 Signed-off-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN --- package/libgeos/libgeos.hash | 2 +- package/libgeos/libgeos.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index cd0a4e03309a..54f53d19debd 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d0eb3cfa9f92d947731cc75f1750356b3bdfc07ea020553daf6af1c768e0be2 geos-3.11.1.tar.bz2 +sha256 b1f077669481c5a3e62affc49e96eb06f281987a5d36fdab225217e5b825e4cc geos-3.11.2.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index c6d470dc9710..5a7932bad2bd 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.11.1 +LIBGEOS_VERSION = 3.11.2 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 From c9e0b980b5ebe34100d0dc723b2bd945f75615e6 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Wed, 3 May 2023 07:45:32 +0300 Subject: [PATCH 0445/2890] package/timescaledb: bump version to 2.10.3 Release notes: https://github.com/timescale/timescaledb/blob/2.10.3/CHANGELOG.md Signed-off-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index b05c7802c28a..9ec92244a713 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fca72a6ed0f6d32d2b3523951ede73dc5f9b0077b38450a029a5f411fdb8c73 timescaledb-2.10.1.tar.gz +sha256 d3bd209ebe48f058fd3fa2aa0d6a74fbce2023d64dbb205e58e2c9ab62059cce timescaledb-2.10.3.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index bcda07f89350..cd02d8df50e4 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.10.1 +TIMESCALEDB_VERSION = 2.10.3 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 64f1f82385b2af1c690d64ae3d72856a707b177e Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 3 May 2023 12:37:10 +1000 Subject: [PATCH 0446/2890] boot/opensbi: Bump to version 1.2 Signed-off-by: Alistair Francis Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 - ...Makefile-Don-t-specify-mabi-or-march.patch | 37 ------------- ...Makefile-unconditionally-disable-SSP.patch | 53 ------------------- boot/opensbi/Config.in | 4 +- boot/opensbi/opensbi.hash | 2 +- 5 files changed, 3 insertions(+), 95 deletions(-) delete mode 100644 boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch delete mode 100644 boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch diff --git a/.checkpackageignore b/.checkpackageignore index d42179bc3c3f..d5bd3cd4abf1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -121,8 +121,6 @@ boot/lpc32xxcdl/0002-delete_redundant_files.patch Upstream boot/lpc32xxcdl/0003-libnosys_gnu.patch Upstream boot/lpc32xxcdl/0004-slashes.patch Upstream boot/mv-ddr-marvell/0001-Makefile-disable-stack-protection.patch Upstream -boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch Upstream -boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch Upstream boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch Upstream boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch Upstream boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch Upstream diff --git a/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch b/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch deleted file mode 100644 index 5f554a6c249b..000000000000 --- a/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Fri, 15 Feb 2019 14:57:41 -0800 -Subject: [PATCH] Makefile: Don't specify mabi or march - -To avoid - can't link double-float modules with soft-float modules -errors when building 32-bit openSBI don't specify mabi or march. - -Signed-off-by: Alistair Francis ---- - Makefile | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Makefile b/Makefile -index ae68f55..10851fc 100644 ---- a/Makefile -+++ b/Makefile -@@ -145,7 +145,6 @@ GENFLAGS += $(firmware-genflags-y) - CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 - CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - CFLAGS += -mno-save-restore -mstrict-align --CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) - CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) - CFLAGS += $(GENFLAGS) - CFLAGS += $(platform-cflags-y) -@@ -158,7 +157,6 @@ CPPFLAGS += $(firmware-cppflags-y) - ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ - ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - ASFLAGS += -mno-save-restore -mstrict-align --ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) - ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) - ASFLAGS += $(GENFLAGS) - ASFLAGS += $(platform-asflags-y) --- -2.20.1 - diff --git a/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch b/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch deleted file mode 100644 index c4edd37f1a9a..000000000000 --- a/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e389d5fbc296e496db15368b2b621e0f178f7f34 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 8 May 2021 21:28:10 +0200 -Subject: [PATCH] Makefile: unconditionally disable SSP - -Though -nostdlib is passed in {C,+AS,DTSCPP}FLAGS, -fno-stack-protector -must also be passed to avoid linking errors related to undefined -references to '__stack_chk_guard' and '__stack_chk_fail' if toolchain -enforces -fstack-protector. - -Fixes: - - https://gitlab.com/kubu93/buildroot/-/jobs/1247043359 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/riscv/opensbi/pull/211] ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index eeffe6b..1419360 100644 ---- a/Makefile -+++ b/Makefile -@@ -203,7 +203,7 @@ GENFLAGS += $(libsbiutils-genflags-y) - GENFLAGS += $(platform-genflags-y) - GENFLAGS += $(firmware-genflags-y) - --CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 -+CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-stack-protector -fno-strict-aliasing -O2 - CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - CFLAGS += -mno-save-restore -mstrict-align - CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) -@@ -217,7 +217,7 @@ CPPFLAGS += $(GENFLAGS) - CPPFLAGS += $(platform-cppflags-y) - CPPFLAGS += $(firmware-cppflags-y) - --ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ -+ASFLAGS = -g -Wall -nostdlib -fno-stack-protector -D__ASSEMBLY__ - ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - ASFLAGS += -mno-save-restore -mstrict-align - ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) -@@ -236,7 +236,7 @@ MERGEFLAGS += -r - MERGEFLAGS += -b elf$(PLATFORM_RISCV_XLEN)-littleriscv - MERGEFLAGS += -m elf$(PLATFORM_RISCV_XLEN)lriscv - --DTSCPPFLAGS = $(CPPFLAGS) -nostdinc -nostdlib -fno-builtin -D__DTS__ -x assembler-with-cpp -+DTSCPPFLAGS = $(CPPFLAGS) -nostdinc -nostdlib -fno-stack-protector -fno-builtin -D__DTS__ -x assembler-with-cpp - - # Setup functions for compilation - define dynamic_flags --- -2.30.2 - diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in index 86f848f17712..5e6b8d158ebf 100644 --- a/boot/opensbi/Config.in +++ b/boot/opensbi/Config.in @@ -19,7 +19,7 @@ choice Select the specific OpenSBI version you want to use config BR2_TARGET_OPENSBI_LATEST_VERSION - bool "0.9" + bool "1.2" config BR2_TARGET_OPENSBI_CUSTOM_VERSION bool "Custom version" @@ -57,7 +57,7 @@ endif config BR2_TARGET_OPENSBI_VERSION string - default "0.9" if BR2_TARGET_OPENSBI_LATEST_VERSION + default "1.2" if BR2_TARGET_OPENSBI_LATEST_VERSION default BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE \ if BR2_TARGET_OPENSBI_CUSTOM_VERSION default "custom" if BR2_TARGET_OPENSBI_CUSTOM_TARBALL diff --git a/boot/opensbi/opensbi.hash b/boot/opensbi/opensbi.hash index 3b6d97c42d12..dbc77e856fe3 100644 --- a/boot/opensbi/opensbi.hash +++ b/boot/opensbi/opensbi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 60f995cb3cd03e3cf5e649194d3395d0fe67499fd960a36cf7058a4efde686f0 opensbi-0.9.tar.gz +sha256 8fcbce598a73acc2c7f7d5607d46b9d5107d3ecbede8f68f42631dcfc25ef2b2 opensbi-1.2.tar.gz sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD From c110bb17ade18f446dd663c984dc3ef48b20fc64 Mon Sep 17 00:00:00 2001 From: James Knight Date: Thu, 4 May 2023 23:43:17 -0400 Subject: [PATCH 0447/2890] package/pkg-utils.mk: make kconfig set/disable operations quiet In a previous commit [1], the use of `KCONFIG_ENABLE_OPT` was tweaked in a way which no longer generates a default output unless the quiet flag is unset (`Q=`). The use of `KCONFIG_SET_OPT` and `KCONFIG_DISABLE_OPT` does not apply a quiet operation. In order to make all these kernel configuration defines operate in a consistent way, adjusting both `KCONFIG_SET_OPT` and `KCONFIG_DISABLE_OPT` to be default-quiet as well. [1]: 66d2ff25bad813659ed4541b3f4c6c2a09455bd7 Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/pkg-utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 0945e6ed318a..530638566c05 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -34,9 +34,9 @@ define KCONFIG_ENABLE_OPT fi endef # KCONFIG_SET_OPT (option, value [, file]) -KCONFIG_SET_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=$(2), $(3)) +KCONFIG_SET_OPT = $(Q)$(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=$(2), $(3)) # KCONFIG_DISABLE_OPT (option [, file]) -KCONFIG_DISABLE_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $(1) is not set, $(2)) +KCONFIG_DISABLE_OPT = $(Q)$(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $(1) is not set, $(2)) # Helper functions to determine the name of a package and its # directory from its makefile directory, using the $(MAKEFILE_LIST) From d06dca38bb0373a13736a349f7795713458a2188 Mon Sep 17 00:00:00 2001 From: James Knight Date: Thu, 4 May 2023 23:43:18 -0400 Subject: [PATCH 0448/2890] linux: cleanup kconfig fixup processing The following is an attempt o cleanup the output generated when fixing up a Linux's Kconfig: - Quiet the conditional check host-pahole to avoid having the message used to describe a failure generate in the output in its script form. - Move the initramfs fixups to their own conditional macros, and move the comments out of the macro (mainly for developers managing the implementation). - Adding a generic "Updating kernel config..." message, to help inform builders that the framework is actively processing Kconfig's (while users may be pondering why the closing of a `linux-menuconfig` is doing). Signed-off-by: James Knight [yann.morin.1998@free.fr: - introduce LINUX_KCONFIG_FIXUP_CMDS_ROOTFS_CPIO - use MESSAGE to display... a message... ] Signed-off-by: Yann E. MORIN --- linux/linux.mk | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 37797fc4f0e1..8027274c3229 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -127,7 +127,7 @@ ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE),y) LINUX_DEPENDENCIES += host-pahole else define LINUX_FIXUP_CONFIG_PAHOLE_CHECK - if grep -q "^CONFIG_DEBUG_INFO_BTF=y" $(KCONFIG_DOT_CONFIG); then \ + $(Q)if grep -q "^CONFIG_DEBUG_INFO_BTF=y" $(KCONFIG_DOT_CONFIG); then \ echo "To use CONFIG_DEBUG_INFO_BTF, enable host-pahole (BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE)" 1>&2; \ exit 1; \ fi @@ -366,7 +366,22 @@ define LINUX_FIXUP_CONFIG_ENDIANNESS endef endif +# As the kernel gets compiled before root filesystems are +# built, we create a fake cpio file. It'll be +# replaced later by the real cpio archive, and the kernel will be +# rebuilt using the linux-rebuild-with-initramfs target. +ifneq ($(BR2_TARGET_ROOTFS_INITRAMFS),) +define LINUX_KCONFIG_FIXUP_CMDS_ROOTFS_CPIO + @mkdir -p $(BINARIES_DIR) + $(Q)touch $(BINARIES_DIR)/rootfs.cpio + $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,"$${BR_BINARIES_DIR}/rootfs.cpio") + $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0) + $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0)) +endef +endif + define LINUX_KCONFIG_FIXUP_CMDS + @$(call MESSAGE,"Updating kernel config with fixups") $(if $(LINUX_NEEDS_MODULES), $(call KCONFIG_ENABLE_OPT,CONFIG_MODULES)) $(call KCONFIG_ENABLE_OPT,$(strip $(LINUX_COMPRESSION_OPT_y))) @@ -401,16 +416,7 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_ARM64_64K_PAGES)) $(if $(BR2_TARGET_ROOTFS_CPIO), $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD)) - # As the kernel gets compiled before root filesystems are - # built, we create a fake cpio file. It'll be - # replaced later by the real cpio archive, and the kernel will be - # rebuilt using the linux-rebuild-with-initramfs target. - $(if $(BR2_TARGET_ROOTFS_INITRAMFS), - mkdir -p $(BINARIES_DIR) - touch $(BINARIES_DIR)/rootfs.cpio - $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,"$${BR_BINARIES_DIR}/rootfs.cpio") - $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0) - $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0)) + $(LINUX_KCONFIG_FIXUP_CMDS_ROOTFS_CPIO) $(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),, $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS) $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT)) From 0a5d8d5f85506e0fe0633e192defab2ce32cb1c0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 7 May 2023 23:09:47 +0200 Subject: [PATCH 0449/2890] linux: use positive logic to define initramfs fixups Commit d06dca38bb03 (linux: cleanup kconfig fixup processing) introduced the conditional LINUX_KCONFIG_FIXUP_CMDS_ROOTFS_CPIO, using a negative logic condition. Switch that to use positive logic. Signed-off-by: Yann E. MORIN --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 8027274c3229..7c941fa339a9 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -370,7 +370,7 @@ endif # built, we create a fake cpio file. It'll be # replaced later by the real cpio archive, and the kernel will be # rebuilt using the linux-rebuild-with-initramfs target. -ifneq ($(BR2_TARGET_ROOTFS_INITRAMFS),) +ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) define LINUX_KCONFIG_FIXUP_CMDS_ROOTFS_CPIO @mkdir -p $(BINARIES_DIR) $(Q)touch $(BINARIES_DIR)/rootfs.cpio From 73e3a8f8a8d906627a15f4f5be81ce0ceca4aeb0 Mon Sep 17 00:00:00 2001 From: James Knight Date: Thu, 27 Apr 2023 21:33:35 -0400 Subject: [PATCH 0450/2890] package/libxkbcommon: enable wayland support Tweak the applied configuration options to flag support for Wayland if the wayland package is detected. This will allow the generation of the `interactive-wayland` utility (when `BR2_PACKAGE_LIBXKBCOMMON_TOOLS` is also configured). Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/libxkbcommon/Config.in | 1 + package/libxkbcommon/libxkbcommon.mk | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in index e9f61227a02b..c7fe188a0ed4 100644 --- a/package/libxkbcommon/Config.in +++ b/package/libxkbcommon/Config.in @@ -12,6 +12,7 @@ if BR2_PACKAGE_LIBXKBCOMMON config BR2_PACKAGE_LIBXKBCOMMON_TOOLS bool "tools" + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND help Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, xkbcli-interactive-evdev, xkbcli-interactive-x11, diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index 236bf4c5d94d..882791b91713 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -14,7 +14,6 @@ LIBXKBCOMMON_INSTALL_STAGING = YES LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex LIBXKBCOMMON_CONF_OPTS = \ -Denable-docs=false \ - -Denable-wayland=false \ -Denable-xkbregistry=false ifeq ($(BR2_PACKAGE_XORG7),y) @@ -30,4 +29,11 @@ else LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false endif +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS)$(BR2_PACKAGE_WAYLAND),yy) +LIBXKBCOMMON_CONF_OPTS += -Denable-wayland=true +LIBXKBCOMMON_DEPENDENCIES += wayland wayland-protocols +else +LIBXKBCOMMON_CONF_OPTS += -Denable-wayland=false +endif + $(eval $(meson-package)) From a1b98a6c2f21ea071aea7e25e02949cadf6f752e Mon Sep 17 00:00:00 2001 From: Leon Rinkel Date: Sun, 7 May 2023 20:48:42 +0000 Subject: [PATCH 0451/2890] package/bat: bump version to 0.23.0 Update hash for LICENSE-MIT, to account for an update in the copyright years: https://github.com/sharkdp/bat/commit/d43d241f5bac0fde7881b55f61644e0408181cf7 Signed-off-by: Leon Rinkel Signed-off-by: Yann E. MORIN --- package/bat/bat.hash | 4 ++-- package/bat/bat.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bat/bat.hash b/package/bat/bat.hash index f4d3e32c3478..a79cb8f9a3c6 100644 --- a/package/bat/bat.hash +++ b/package/bat/bat.hash @@ -1,4 +1,4 @@ # Locally generated -sha256 7940641baaa61cd3bcd1c3db4804d179609d6ccd955868928a129bf3f853e0b2 bat-0.19.0.tar.gz +sha256 b29af37f274019cf1a36d9483c6f30ff780d3be9d0a9e6a96a43737388b7e409 bat-0.23.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE -sha256 64de710b6309a7db5e44ad0af382300c7fb6f6d116d8ae32f0164e05db033068 LICENSE-MIT +sha256 dccda9eb9533f5c65624a1106536c6cfde46008d58e60b3faf154e8b9fd5b46e LICENSE-MIT diff --git a/package/bat/bat.mk b/package/bat/bat.mk index dc29a85429cb..395134df17da 100644 --- a/package/bat/bat.mk +++ b/package/bat/bat.mk @@ -4,7 +4,7 @@ # ################################################################################ -BAT_VERSION = 0.19.0 +BAT_VERSION = 0.23.0 BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) BAT_LICENSE = Apache-2.0 or MIT BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From b01a20694c7eae222a1dd64ffb458ce8d6e7ab4b Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 2 May 2023 17:47:08 +0200 Subject: [PATCH 0452/2890] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark Package optee-benchmark is no more maintained by OP-TEE community hence don't enable that package in qemu_arm_vexpress_tz_defconfig. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- configs/qemu_arm_vexpress_tz_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 576c44115490..b24fab5e4278 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -40,7 +40,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram" BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_NEEDS_DTC=y BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" -BR2_PACKAGE_OPTEE_BENCHMARK=y BR2_PACKAGE_OPTEE_EXAMPLES=y BR2_PACKAGE_OPTEE_TEST=y From 65647f7b426b05eeb8e13e3d098d0df7aed798e3 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 2 May 2023 17:47:09 +0200 Subject: [PATCH 0453/2890] boot/optee-os: bump to version 3.21.0 Bumps OP-TEE OS package version to OP-TEE release 3.21.0. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- boot/optee-os/Config.in | 4 ++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index a3cb8390b477..cc2c90b5aca1 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.19.0" + bool "3.21.0" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY help @@ -70,7 +70,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.19.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.21.0" if BR2_TARGET_OPTEE_OS_LATEST default "custom" if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index a87f21a9bfb2..cf3ee7a36ea0 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.19.0/optee-os-3.19.0.tar.gz -sha256 5e0c03bbc4d106f262a6bd33333c002c3380205ae6b82334aa7b644721ff7868 optee-os-3.19.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.21.0/optee-os-3.21.0.tar.gz +sha256 92a16e841b0bdb4bfcb1c20b6a1bd3309092203d534ed167dfdb5a5f395bf60b optee-os-3.21.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE From 8a56e501bba53748d4fdb7f6341b99e10cb75a5f Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 2 May 2023 17:47:10 +0200 Subject: [PATCH 0454/2890] package/optee-client: bump to version 3.21.0 Bumps OP-TEE client package version to OP-TEE release 3.21.0. Removes the 2 local patches that have been integrated into mainline repository before release tag 3.21.0. Signed-off-by: Etienne Carriere [yann.morin.1998@free.fr: regenerate .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 - ...condition-libteeacl-with-WITH_TEEACL.patch | 105 ------------------ ...-use-realloc-instead-of-reallocarray.patch | 34 ------ package/optee-client/optee-client.hash | 4 +- package/optee-client/optee-client.mk | 2 +- 5 files changed, 3 insertions(+), 144 deletions(-) delete mode 100644 package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch delete mode 100644 package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch diff --git a/.checkpackageignore b/.checkpackageignore index d5bd3cd4abf1..0d55748263e9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1189,8 +1189,6 @@ package/openvmtools/0012-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.pa package/openvmtools/shutdown Shellcheck package/openvpn/S60openvpn Indent Shellcheck Variables package/oprofile/0001-musl.patch Upstream -package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch Upstream -package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch Upstream package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch Upstream package/oracle-mysql/0000-ac_cache_check.patch Upstream package/oracle-mysql/0001-configure-ps-cache-check.patch Upstream diff --git a/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch b/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch deleted file mode 100644 index 4fdf9afc9441..000000000000 --- a/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch +++ /dev/null @@ -1,105 +0,0 @@ -From bbdf665aba39c29a3ce7bd06e4554c62a416ebaa Mon Sep 17 00:00:00 2001 -From: Etienne Carriere -Date: Thu, 10 Nov 2022 12:05:24 +0100 -Subject: [PATCH] libteeacl: condition libteeacl with WITH_TEEACL - -Build and embed libteeacl upon WITH_TEEACL=1 (default configuration). -This configuration switch allows one to build OP-TEE client without -dependencies on pkg-config and libuuid when OP-TEE ACL for -PKCS11 is not needed: - cmake -DWITH_TEEACL=0 ... -or - make WITH_TEEACL=0 ... - -With the comments below addressed, LGTM. - -Acked-by: Jerome Forissier -Acked-by: Jens Wiklander -Reviewed-by: Eero Aaltonen -[etienne.carriere@linaro.org: backport upstream commit] -Signed-off-by: Etienne Carriere -[yann.morin.1998@free.fr: actually do a backport of bbdf665] -Signed-off-by: Yann E. MORIN ---- - CMakeLists.txt | 9 ++++++--- - Makefile | 15 ++++++++++++--- - 2 files changed, 18 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0786752..9fb5c6a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,7 @@ project (optee_client C) - set (CMAKE_TOOLCHAIN_FILE CMakeToolchain.txt) - - set (CFG_WERROR 1 CACHE BOOL "Build with -Werror") -+option (WITH_TEEACL "Build libteeacl" TRUE) - - include(GNUInstallDirs) - -@@ -37,7 +38,9 @@ add_subdirectory (libteec) - add_subdirectory (tee-supplicant) - add_subdirectory (public) - add_subdirectory (libckteec) --find_package (PkgConfig REQUIRED) --pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid) --add_subdirectory (libteeacl) -+if(WITH_TEEACL) -+ find_package (PkgConfig REQUIRED) -+ pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid) -+ add_subdirectory (libteeacl) -+endif(WITH_TEEACL) - add_subdirectory (libseteec) -diff --git a/Makefile b/Makefile -index 90b487e..2ee5621 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,6 +16,8 @@ SBINDIR ?= /usr/sbin - LIBDIR ?= /usr/lib - INCLUDEDIR ?= /usr/include - -+WITH_TEEACL ?= 1 -+ - .PHONY: all build build-libteec build-libckteec build-libseteec \ - build-libteeacl check-libuuid install copy_export clean cscope \ - clean-cscope \ -@@ -35,8 +37,10 @@ build-tee-supplicant: build-libteec - @echo "Building tee-supplicant" - $(MAKE) --directory=tee-supplicant --no-print-directory --no-builtin-variables CFG_TEE_SUPP_LOG_LEVEL=$(CFG_TEE_SUPP_LOG_LEVEL) - --build: build-libteec build-tee-supplicant build-libckteec build-libseteec \ -- build-libteeacl -+build: build-libteec build-tee-supplicant build-libckteec build-libseteec -+ifeq ($(WITH_TEEACL),1) -+build: build-libteeacl -+endif - - build-libckteec: build-libteec - @echo "Building libckteec.so" -@@ -57,7 +61,10 @@ check-libuuid: - install: copy_export - - clean: clean-libteec clean-tee-supplicant clean-cscope clean-libckteec \ -- clean-libseteec clean-libteeacl -+ clean-libseteec -+ifeq ($(WITH_TEEACL),1) -+clean: clean-libteeacl -+endif - - clean-libteec: - @$(MAKE) --directory=libteec --no-print-directory clean -@@ -158,9 +165,11 @@ copy_export: build - cp libckteec/include/*.h $(DESTDIR)$(INCLUDEDIR) - cp -d ${O}/libckteec/libckteec.so* $(DESTDIR)$(LIBDIR) - cp -d ${O}/libckteec/libckteec.a $(DESTDIR)$(LIBDIR) -+ifeq ($(WITH_TEEACL),1) - cp libteeacl/include/*.h $(DESTDIR)$(INCLUDEDIR) - cp -d ${O}/libteeacl/libteeacl.so* $(DESTDIR)$(LIBDIR) - cp -d ${O}/libteeacl/libteeacl.a $(DESTDIR)$(LIBDIR) -+endif - cp libseteec/include/*.h $(DESTDIR)$(INCLUDEDIR) - cp -d ${O}/libseteec/libseteec.so* $(DESTDIR)$(LIBDIR) - cp -d ${O}/libseteec/libseteec.a $(DESTDIR)$(LIBDIR) --- -2.25.1 - diff --git a/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch deleted file mode 100644 index 88f5a4f87e02..000000000000 --- a/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dde6306458331371be5df15e3ca953697d2463ef Mon Sep 17 00:00:00 2001 -From: Eero Aaltonen -Date: Thu, 2 Feb 2023 17:22:29 +0200 -Subject: [PATCH] libteeacl: use realloc() instead of reallocarray() - -Use realloc() instead of reallocarray(), since uClibc apparently does -not implement reallocarray(). - -Fixes: https://github.com/OP-TEE/optee_client/issues/339 - -Signed-off-by: Eero Aaltonen -Reviewed-by: Jerome Forissier - -[Retrieved from: -https://github.com/OP-TEE/optee_client/commit/dde6306458331371be5df15e3ca953697d2463ef] -Signed-off-by: Fabrice Fontaine ---- - libteeacl/src/group.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libteeacl/src/group.c b/libteeacl/src/group.c -index 10965dd0..bd165a11 100644 ---- a/libteeacl/src/group.c -+++ b/libteeacl/src/group.c -@@ -72,7 +72,8 @@ enum rv_groupmember teeacl_user_is_member_of(const char *user, gid_t group) - if (ret == -1) { - p_groups = groups; - -- groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); -+ /* we use realloc, since uClibc does not implement reallocarray */ -+ groups = realloc(groups, grouplistsize * sizeof(gid_t)); - if (!groups) { - free(p_groups); - return E_MEMORY; diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index c067e26f4e62..69016eae1151 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.19.0/optee-client-3.19.0.tar.gz -sha256 5f0d02efa0e496964e86ca9dd2461ada923d1f9e11a4b9cafb5393bd08337644 optee-client-3.19.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.21.0/optee-client-3.21.0.tar.gz +sha256 368164a539b85557d2079fa6cd839ec444869109f96de65d6569e58b0615d026 optee-client-3.21.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index ef113c838f02..4b95842efac7 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.19.0 +OPTEE_CLIENT_VERSION = 3.21.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE From b2c399ec67ad7d35547b172fb25b86d7e5be25d2 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 2 May 2023 17:47:11 +0200 Subject: [PATCH 0455/2890] package/optee-test: bump to version 3.21.0 Bumps OP-TEE test package version to OP-TEE release 3.21.0. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 4da3807bb53f..08b3331374fe 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.19.0/optee-test-3.19.0.tar.gz -sha256 9435901e9329a25ef4de3904e27d80377b8bb4dd6b215e8fb29d66a7b76afa11 optee-test-3.19.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.21.0/optee-test-3.21.0.tar.gz +sha256 44c7dc3df48e9d73f12bbbef1cc2a4e22d859ab8a5e67a07923267f924175d65 optee-test-3.21.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index 7b065b6123e5..d306ef826909 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.19.0 +OPTEE_TEST_VERSION = 3.21.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md From c5e672d912f55dd02d62ccb80cb5d70ad3e4847c Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 2 May 2023 17:47:12 +0200 Subject: [PATCH 0456/2890] package/optee-examples: bump to version 3.21.0 Bumps OP-TEE examples package version to OP-TEE release 3.21.0. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index 937dd44c8cb5..c61c434c6054 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.19.0/optee-examples-3.19.0.tar.gz -sha256 545f9438885220e890a4f785249a586a957b22dacc31a3cbafa4656f8e9db349 optee-examples-3.19.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.21.0/optee-examples-3.21.0.tar.gz +sha256 9b965f829adc532b5228534d3b9b38ae1fc4f2ac55d73159a39d43e59749f3ed optee-examples-3.21.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index bb2b208583e8..c182bab4cc30 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.19.0 +OPTEE_EXAMPLES_VERSION = 3.21.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE From cf39b596e7a8256700eb0957d5ba22661b492243 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 2 May 2023 17:47:13 +0200 Subject: [PATCH 0457/2890] package/optee-benchmark: remove deprecated package Removes package optee-benchmark that is no more maintained as pointed by discussion thread [1]. Link: [1] https://github.com/OP-TEE/optee_os/issues/5909 Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- package/Config.in | 1 - package/optee-benchmark/Config.in | 20 -------------------- package/optee-benchmark/optee-benchmark.hash | 4 ---- package/optee-benchmark/optee-benchmark.mk | 14 -------------- 4 files changed, 39 deletions(-) delete mode 100644 package/optee-benchmark/Config.in delete mode 100644 package/optee-benchmark/optee-benchmark.hash delete mode 100644 package/optee-benchmark/optee-benchmark.mk diff --git a/package/Config.in b/package/Config.in index eaac32a01af3..53c2d3b07785 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2565,7 +2565,6 @@ menu "Security" source "package/apparmor/Config.in" source "package/checkpolicy/Config.in" source "package/ima-evm-utils/Config.in" - source "package/optee-benchmark/Config.in" source "package/optee-client/Config.in" source "package/optee-examples/Config.in" source "package/optee-test/Config.in" diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in deleted file mode 100644 index 2070582fbbbd..000000000000 --- a/package/optee-benchmark/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_OPTEE_BENCHMARK - bool "optee-benchmark" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client - depends on !BR2_STATIC_LIBS # optee-client - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client - select BR2_PACKAGE_OPTEE_CLIENT - select BR2_PACKAGE_LIBYAML - help - Enable the OP-TEE benchmark package that brings facilities - for profiling traversal and execution timings when - invoking OP-TEE. OP-TEE benchmark is a component delivered - by the OP-TEE project. - - http://github.com/linaro-swg/optee_benchmark - -comment "optee-benchmark needs a toolchain w/ threads, dynamic library, headers >= 4.3" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash deleted file mode 100644 index d74a24c8abe0..000000000000 --- a/package/optee-benchmark/optee-benchmark.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.19.0/optee-benchmark-3.19.0.tar.gz -sha256 32f41854bf07eb7bb89dfc702da023c3a99518c33fbe7edf0e1f004e29a8c90c optee-benchmark-3.19.0.tar.gz -# Locally computed -sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk deleted file mode 100644 index 338a51ada474..000000000000 --- a/package/optee-benchmark/optee-benchmark.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# optee-benchmark -# -################################################################################ - -OPTEE_BENCHMARK_VERSION = 3.19.0 -OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) -OPTEE_BENCHMARK_LICENSE = BSD-2-Clause -OPTEE_BENCHMARK_LICENSE_FILES = LICENSE - -OPTEE_BENCHMARK_DEPENDENCIES = optee-client libyaml - -$(eval $(cmake-package)) From fe0e4bf560273d104fc10b4b9b402fba5538d726 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 7 May 2023 23:34:43 +0200 Subject: [PATCH 0458/2890] Config.in.legacy: add entry for optee-benchmark Commit cf39b596e7a8 (package/optee-benchmark: remove deprecated package) forgot to add a legacy entry. Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Config.in.legacy b/Config.in.legacy index bce780e26e25..2a710c30dc78 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.05" +config BR2_PACKAGE_OPTEE_BENCHMARK + bool "optee-benchmark has been removed" + select BR2_LEGACY + help + optee-benchmark is no longer maintained upstream. + config BR2_PACAKGE_OPENFPGALOADER_CMSIS bool "openfpgaloader cmsis option name fixed" select BR2_LEGACY From b7de8417e1b8f36da2b002a7adb9a633cdcc0ac4 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sun, 7 May 2023 17:34:29 -0400 Subject: [PATCH 0459/2890] package/rpm: drop remnants of custom CFLAGS Drops the use of `RPM_CFLAGS`, which their use has been obsolete when this package bumped to v4.17 [1]. [1]: 429e247b869027f6ecd4efa0f31bccd2765e3875 Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/rpm/rpm.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index fc57a14fd651..08bcb85ae417 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -104,7 +104,6 @@ endif # ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`). RPM_CONF_ENV = \ ac_cv_prog_cc_c99='-std=gnu99' \ - CFLAGS="$(TARGET_CFLAGS) $(RPM_CFLAGS)" \ LIBS=$(TARGET_NLS_LIBS) $(eval $(autotools-package)) From 2a068781f1280f7f36d95678b3b359b1457f8dc9 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sun, 7 May 2023 17:34:30 -0400 Subject: [PATCH 0460/2890] package/rpm: add more disabling options Adding a series of feature-disable configurations of options introduced over the recent versions, but where never added. Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/rpm/rpm.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 08bcb85ae417..38e4ea2160c9 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -29,7 +29,10 @@ RPM_SELINUX_MODULES = rpm RPM_CONF_OPTS = \ --disable-python \ --disable-rpath \ - --with-gnu-ld + --with-gnu-ld \ + --without-fapolicyd \ + --without-fsverity \ + --without-imaevm ifeq ($(BR2_PACKAGE_ACL),y) RPM_DEPENDENCIES += acl From 233be1c216a8f7f923245791c6d9a897e10e5c63 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sun, 7 May 2023 17:34:31 -0400 Subject: [PATCH 0461/2890] package/rpm: bump to version 4.18.1 The most recent release of RPM is v4.18.1 [1]. Adding an upstream patch to prevent build failures for certain toolchains (0001-fix-var-declare-in-label-error.patch). Fix should be available next release. [1]: https://rpm.org/wiki/Releases/4.18.1 Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- .../0001-fix-var-declare-in-label-error.patch | 40 +++++++++++++++++++ package/rpm/rpm.hash | 4 +- package/rpm/rpm.mk | 2 +- 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 package/rpm/0001-fix-var-declare-in-label-error.patch diff --git a/package/rpm/0001-fix-var-declare-in-label-error.patch b/package/rpm/0001-fix-var-declare-in-label-error.patch new file mode 100644 index 000000000000..648040c66307 --- /dev/null +++ b/package/rpm/0001-fix-var-declare-in-label-error.patch @@ -0,0 +1,40 @@ +From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 +From: Florian Festi +Date: Thu, 16 Mar 2023 19:05:04 +0100 +Subject: [PATCH] Fix compiler error on clang + +Turns out variable declarations are not allowed after a label, even in +C99. And while some compilers don't seem to care others do. + +Moving the declaration of mayopen to the start of the function to avoid +this problem. + +Resolves: #2435 + +Upstream: b960c0b43a080287a7c13533eeb2d9f288db1414 +Signed-off-by: James Knight +--- + lib/fsm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/fsm.c b/lib/fsm.c +index 5671ac642d..183293edb0 100644 +--- a/lib/fsm.c ++++ b/lib/fsm.c +@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, + int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; + int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; + int firstlinkfile = -1; ++ int mayopen = 0; + char *tid = NULL; + struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); + struct filedata_s *firstlink = NULL; +@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, + + setmeta: + /* Special files require path-based ops */ +- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); ++ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); + if (!rc && fd == -1 && mayopen) { + int flags = O_RDONLY; + /* Only follow safe symlinks, and never on temporary files */ diff --git a/package/rpm/rpm.hash b/package/rpm/rpm.hash index dfe50303f7db..fd03f062bc7d 100644 --- a/package/rpm/rpm.hash +++ b/package/rpm/rpm.hash @@ -1,5 +1,5 @@ -# From https://rpm.org/wiki/Releases/4.18.0.html -sha256 2a17152d7187ab30edf2c2fb586463bdf6388de7b5837480955659e5e9054554 rpm-4.18.0.tar.bz2 +# From https://rpm.org/wiki/Releases/4.18.1.html +sha256 37f3b42c0966941e2ad3f10fde3639824a6591d07197ba8fd0869ca0779e1f56 rpm-4.18.1.tar.bz2 # Hash for license file sha256 171d94d9f1641316bff7f157a903237dc69cdb5fca405fed8c832c76ed8370f9 COPYING diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 38e4ea2160c9..2b289fcc9f8d 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -5,7 +5,7 @@ ################################################################################ RPM_VERSION_MAJOR = 4.18 -RPM_VERSION = $(RPM_VERSION_MAJOR).0 +RPM_VERSION = $(RPM_VERSION_MAJOR).1 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x RPM_DEPENDENCIES = \ From 38c4621df340ea7a76033f5955be1b277554920f Mon Sep 17 00:00:00 2001 From: James Knight Date: Sun, 7 May 2023 17:34:32 -0400 Subject: [PATCH 0462/2890] package/rpm: add python support When Python 3 support is detected, enable Python 3-related support. Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/rpm/rpm.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 2b289fcc9f8d..2964c6a51202 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -27,7 +27,6 @@ RPM_SELINUX_MODULES = rpm # --enable-openmp is provided and OpenMP is < 4.5: # https://github.com/rpm-software-management/rpm/pull/1433 RPM_CONF_OPTS = \ - --disable-python \ --disable-rpath \ --with-gnu-ld \ --without-fapolicyd \ @@ -83,6 +82,13 @@ else RPM_CONF_OPTS += --without-selinux endif +ifeq ($(BR2_PACKAGE_PYTHON3),y) +RPM_DEPENDENCIES += python3 +RPM_CONF_OPTS += --enable-python +else +RPM_CONF_OPTS += --disable-python +endif + ifeq ($(BR2_PACKAGE_SQLITE),y) RPM_DEPENDENCIES += sqlite RPM_CONF_OPTS += --enable-sqlite From aeff26d21dd72eb01a970dd392c06aa52268cfdc Mon Sep 17 00:00:00 2001 From: James Knight Date: Sun, 7 May 2023 17:34:33 -0400 Subject: [PATCH 0463/2890] package/rpm: add readline support When readline support is detected, enable readline support. Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/rpm/rpm.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 2964c6a51202..c66ce6992d9b 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -89,6 +89,13 @@ else RPM_CONF_OPTS += --disable-python endif +ifeq ($(BR2_PACKAGE_READLINE),y) +RPM_DEPENDENCIES += readline +RPM_CONF_OPTS += --with-readline +else +RPM_CONF_OPTS += --without-readline +endif + ifeq ($(BR2_PACKAGE_SQLITE),y) RPM_DEPENDENCIES += sqlite RPM_CONF_OPTS += --enable-sqlite From 9d392f43437e0ee0332cac66c9d0477230ed019f Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Sun, 7 May 2023 22:16:36 +0200 Subject: [PATCH 0464/2890] package/cairomm1_14: use official website The website [1] states that the released version can be downloaded from the cairo release area [2], which also features a sha1 hash, but only provides xz archives (no gz). [1]: https://www.cairographics.org/cairomm/ [2]: https://www.cairographics.org/releases/ Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/cairomm1_14/Config.in | 2 +- package/cairomm1_14/cairomm1_14.hash | 5 ++++- package/cairomm1_14/cairomm1_14.mk | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/cairomm1_14/Config.in b/package/cairomm1_14/Config.in index 6e767d242831..e369aa6f4ad2 100644 --- a/package/cairomm1_14/Config.in +++ b/package/cairomm1_14/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_CAIROMM1_14 This is the last version before the API and ABI change introduced in 1.16.0 which requires C++17. - http://www.gtkmm.org/ + https://www.cairographics.org/cairomm/ comment "cairomm (1.14.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU diff --git a/package/cairomm1_14/cairomm1_14.hash b/package/cairomm1_14/cairomm1_14.hash index 521e7cc54669..6d58de360abe 100644 --- a/package/cairomm1_14/cairomm1_14.hash +++ b/package/cairomm1_14/cairomm1_14.hash @@ -1,3 +1,6 @@ +# From https://www.cairographics.org/releases/cairomm-1.14.4.tar.xz.sha1 +sha1 a58419bb9792a2c998631704ce5671c38e0c82a1 cairomm-1.14.4.tar.xz + # Locally computed -sha256 ee12b920b2d47cea1b6e20c367690d726eb22b4ca9fc711db329d03adcc0c8e0 cairomm-1.14.4.tar.gz +sha256 4749d25a2b2ef67cc0c014caaf5c87fa46792fc4b3ede186fb0fc932d2055158 cairomm-1.14.4.tar.xz sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm1_14/cairomm1_14.mk b/package/cairomm1_14/cairomm1_14.mk index 5d076ddf0a4a..6502d34c5a4e 100644 --- a/package/cairomm1_14/cairomm1_14.mk +++ b/package/cairomm1_14/cairomm1_14.mk @@ -7,8 +7,8 @@ CAIROMM1_14_VERSION = 1.14.4 CAIROMM1_14_LICENSE = LGPL-2.0+ CAIROMM1_14_LICENSE_FILES = COPYING -CAIROMM1_14_SOURCE = cairomm-$(CAIROMM1_14_VERSION).tar.gz -CAIROMM1_14_SITE = https://gitlab.freedesktop.org/cairo/cairomm/-/archive/$(CAIROMM1_14_VERSION) +CAIROMM1_14_SOURCE = cairomm-$(CAIROMM1_14_VERSION).tar.xz +CAIROMM1_14_SITE = https://cairographics.org/releases CAIROMM1_14_INSTALL_STAGING = YES CAIROMM1_14_DEPENDENCIES = cairo libglib2 libsigc2 host-pkgconf CAIROMM1_14_CONF_OPTS = -Dbuild-examples=false -Dbuild-tests=false From c85f9f4a5e01c4b948c4ac0c915467f6c606942e Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Sun, 7 May 2023 22:22:58 +0200 Subject: [PATCH 0465/2890] package/cairomm: bump to version 1.16.2 The website [1] states that the released version can be downloaded from the cairo release area [2], which also features a sha1 hash, but only provides xz archives (no gz). [1]: https://www.cairographics.org/cairomm/ [2]: https://www.cairographics.org/releases/ Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/cairomm/Config.in | 2 +- package/cairomm/cairomm.hash | 5 ++++- package/cairomm/cairomm.mk | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/cairomm/Config.in b/package/cairomm/Config.in index 75f6692b8ab9..174f3967abdb 100644 --- a/package/cairomm/Config.in +++ b/package/cairomm/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_CAIROMM help The cairomm package is a set of C++ bindings for Cairo. - http://www.gtkmm.org/ + https://www.cairographics.org/cairomm/ comment "cairomm needs a toolchain w/ C++, wchar, threads, gcc >= 7" depends on BR2_USE_MMU diff --git a/package/cairomm/cairomm.hash b/package/cairomm/cairomm.hash index d14a65c2d6f7..254413af0907 100644 --- a/package/cairomm/cairomm.hash +++ b/package/cairomm/cairomm.hash @@ -1,3 +1,6 @@ +# From https://www.cairographics.org/releases/cairomm-1.16.2.tar.xz.sha1 +sha1 c24339d5962e2bcbbea85b2fc66347e71fd3db8c cairomm-1.16.2.tar.xz + # Locally computed -sha256 bb86d855041bd46d31b03e43ea355d233de44034b39d4200725b1e0947e63e67 cairomm-1.16.1.tar.gz +sha256 6a63bf98a97dda2b0f55e34d1b5f3fb909ef8b70f9b8d382cb1ff3978e7dc13f cairomm-1.16.2.tar.xz sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm/cairomm.mk b/package/cairomm/cairomm.mk index 856c9d67fc26..571512878e23 100644 --- a/package/cairomm/cairomm.mk +++ b/package/cairomm/cairomm.mk @@ -4,10 +4,11 @@ # ################################################################################ -CAIROMM_VERSION = 1.16.1 +CAIROMM_VERSION = 1.16.2 CAIROMM_LICENSE = LGPL-2.0+ CAIROMM_LICENSE_FILES = COPYING -CAIROMM_SITE = https://gitlab.freedesktop.org/cairo/cairomm/-/archive/$(CAIROMM_VERSION) +CAIROMM_SOURCE = cairomm-$(CAIROMM_VERSION).tar.xz +CAIROMM_SITE = https://cairographics.org/releases CAIROMM_INSTALL_STAGING = YES CAIROMM_DEPENDENCIES = cairo libglib2 libsigc host-pkgconf CAIROMM_CONF_OPTS = -Dbuild-examples=false -Dbuild-tests=false From d1757fdfb0010d29f20cd68cb6e16f019e236424 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Fri, 28 Apr 2023 09:59:16 +0200 Subject: [PATCH 0466/2890] package/at-spi2-core: bump to version 2.48.0 https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_48_0/NEWS - X11 is now optional. - libxml2 is no longer optional. - atk and at-spi2-atk have been merged into at-spi2-core. - atk introspection option added. - Added patch to which avoids requiring libsystemd when configured to use dbus-daemon. - Added check on dlopen. Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Reviewed-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- ...iring-libsystemd-when-configured-to-.patch | 93 +++++++++++++++++++ package/at-spi2-core/Config.in | 13 +-- package/at-spi2-core/at-spi2-core.hash | 4 +- package/at-spi2-core/at-spi2-core.mk | 18 +++- 4 files changed, 116 insertions(+), 12 deletions(-) create mode 100644 package/at-spi2-core/0001-meson-Avoid-requiring-libsystemd-when-configured-to-.patch diff --git a/package/at-spi2-core/0001-meson-Avoid-requiring-libsystemd-when-configured-to-.patch b/package/at-spi2-core/0001-meson-Avoid-requiring-libsystemd-when-configured-to-.patch new file mode 100644 index 000000000000..78d206ed79c7 --- /dev/null +++ b/package/at-spi2-core/0001-meson-Avoid-requiring-libsystemd-when-configured-to-.patch @@ -0,0 +1,93 @@ +From aeb14ffccaabe65a64e976576d71f30eb2165f43 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Mon, 24 Apr 2023 12:09:50 +0300 +Subject: [PATCH] meson: Avoid requiring libsystemd when configured to use + dbus-daemon + +Checks for dbus-daemon and dbus-broker only when they are chosen +with default_bus. This avoids requiring the systemd libraries if +one wants the built at-spi2-core to use dbus-daemon, but dbus-worker +is somehow available in the $PATH. A typical scenario is cross +compilation, where the build host may have a dbus-broker program +available, but the target system may not have it (or may not have +nor want to use the systemd libraries). + +Upstream: https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/134 +Signed-off-by: Thomas Devoogdt +--- + bus/meson.build | 53 ++++++++++++++++++++++++------------------------- + 1 file changed, 26 insertions(+), 27 deletions(-) + +diff --git a/bus/meson.build b/bus/meson.build +index 22a1bce6..2f3c5621 100644 +--- a/bus/meson.build ++++ b/bus/meson.build +@@ -46,39 +46,38 @@ launcher_args = [ + '-DDATADIR="@0@"'.format(atspi_datadir), + ] + +-if get_option('dbus_daemon') != 'default' +- launcher_args += '-DDBUS_DAEMON="@0@"'.format(get_option('dbus_daemon')) +-else +- dbus_daemon = find_program('dbus-daemon', +- '/sbin/dbus-daemon', +- '/usr/sbin/dbus-daemon', +- '/libexec/dbus-daemon', +- '/usr/libexec/dbus-daemon', +- '/usr/lib/dbus-daemon', +- '/usr/pkg/bin/dbus-daemon', +- required: false) +- if dbus_daemon.found() +- launcher_args += '-DDBUS_DAEMON="@0@"'.format(dbus_daemon.full_path()) +- endif +-endif +- + needs_systemd = false +-if get_option('dbus_broker') != 'default' +- launcher_args += '-DDBUS_BROKER="@0@"'.format(get_option('dbus_broker')) +- needs_systemd = true ++if get_option('default_bus') == 'dbus-daemon' ++ if get_option('dbus_daemon') != 'default' ++ launcher_args += '-DDBUS_DAEMON="@0@"'.format(get_option('dbus_daemon')) ++ else ++ dbus_daemon = find_program('dbus-daemon', ++ '/sbin/dbus-daemon', ++ '/usr/sbin/dbus-daemon', ++ '/libexec/dbus-daemon', ++ '/usr/libexec/dbus-daemon', ++ '/usr/lib/dbus-daemon', ++ '/usr/pkg/bin/dbus-daemon', ++ required: false) ++ if dbus_daemon.found() ++ launcher_args += '-DDBUS_DAEMON="@0@"'.format(dbus_daemon.full_path()) ++ endif ++ endif + else +- dbus_broker = find_program('dbus-broker-launch', +- required: false) +- if dbus_broker.found() +- launcher_args += '-DDBUS_BROKER="@0@"'.format(dbus_broker.full_path()) ++ launcher_args += '-DWANT_DBUS_BROKER' ++ if get_option('dbus_broker') != 'default' ++ launcher_args += '-DDBUS_BROKER="@0@"'.format(get_option('dbus_broker')) + needs_systemd = true ++ else ++ dbus_broker = find_program('dbus-broker-launch', ++ required: false) ++ if dbus_broker.found() ++ launcher_args += '-DDBUS_BROKER="@0@"'.format(dbus_broker.full_path()) ++ needs_systemd = true ++ endif + endif + endif + +-if get_option('default_bus') == 'dbus-broker' +- launcher_args += '-DWANT_DBUS_BROKER' +-endif +- + if needs_systemd + systemd_dep = dependency('libsystemd') + else +-- +2.34.1 + diff --git a/package/at-spi2-core/Config.in b/package/at-spi2-core/Config.in index f56c5b93c49c..2a1b21d375ed 100644 --- a/package/at-spi2-core/Config.in +++ b/package/at-spi2-core/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_AT_SPI2_CORE bool "at-spi2-core" - depends on BR2_PACKAGE_XORG7 # xlib-libxtst depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 depends on BR2_USE_MMU # glib2 depends on BR2_USE_WCHAR # glib2 + depends on !BR2_STATIC_LIBS # dlopen() select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_XORG7 # optionally for X11 help The At-Spi2 Core package is a part of the GNOME Accessibility Project. It provides a Service Provider @@ -16,10 +17,6 @@ config BR2_PACKAGE_AT_SPI2_CORE https://wiki.gnome.org/Accessibility -comment "at-spi2-core needs a toolchain w/ wchar, threads" +comment "at-spi2-core needs a toolchain w/ dynamic library, wchar, threads" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-core depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index 764e4c3661c5..9cf80d1cc077 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum -sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz +# From https://download.gnome.org/sources/at-spi2-core/2.48/at-spi2-core-2.48.0.sha256sum +sha256 905a5b6f1790b68ee803bffa9f5fab4ceb591fb4fae0b2f8c612c54f1d4e8a30 at-spi2-core-2.48.0.tar.xz # locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index f0b019c0edab..e4489f6f889a 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -4,17 +4,31 @@ # ################################################################################ -AT_SPI2_CORE_VERSION_MAJOR = 2.36 +AT_SPI2_CORE_VERSION_MAJOR = 2.48 AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES -AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \ +AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 libxml2 \ $(TARGET_NLS_DEPENDENCIES) AT_SPI2_CORE_CONF_OPTS = -Ddbus_daemon=/usr/bin/dbus-daemon +ifeq ($(BR2_PACKAGE_XORG7),y) +AT_SPI2_CORE_CONF_OPTS += -Dx11=enabled +AT_SPI2_CORE_DEPENDENCIES += xlib_libXtst +else +AT_SPI2_CORE_CONF_OPTS += -Dx11=disabled +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=enabled +AT_SPI2_CORE_DEPENDENCIES += gobject-introspection +else +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=disabled +endif + AT_SPI2_CORE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) From 2f43af1b997f5f0e9262159be3336d73bd4d0d21 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Fri, 28 Apr 2023 09:59:17 +0200 Subject: [PATCH 0467/2890] package/at-spi2-atk: remove package at-spi2-atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Reviewed-by: Adrian Perez de Castro [yann.morin.1998@free.fr: regenerate .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - Config.in.legacy | 6 +++ DEVELOPERS | 1 - package/Config.in | 1 - .../0001-meson-add-tests-option.patch | 43 ------------------- package/at-spi2-atk/Config.in | 22 ---------- package/at-spi2-atk/at-spi2-atk.hash | 5 --- package/at-spi2-atk/at-spi2-atk.mk | 19 -------- 8 files changed, 6 insertions(+), 92 deletions(-) delete mode 100644 package/at-spi2-atk/0001-meson-add-tests-option.patch delete mode 100644 package/at-spi2-atk/Config.in delete mode 100644 package/at-spi2-atk/at-spi2-atk.hash delete mode 100644 package/at-spi2-atk/at-spi2-atk.mk diff --git a/.checkpackageignore b/.checkpackageignore index 0d55748263e9..94a32e0531c7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -181,7 +181,6 @@ package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch Ups package/asterisk/0004-install-samples-need-the-data-files.patch Upstream package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch Upstream package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch Upstream -package/at-spi2-atk/0001-meson-add-tests-option.patch Upstream package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch Upstream package/at/S99at Indent Variables package/atest/0001-seq.h-fix-build-with-gcc-10.patch Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 2a710c30dc78..7837f5a58836 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.05" +config BR2_PACKAGE_AT_SPI2_ATK + bool "at-spi2-atk removed" + select BR2_LEGACY + help + at-spi2-atk is now part of at-spi2-core. + config BR2_PACKAGE_OPTEE_BENCHMARK bool "optee-benchmark has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 57b67e091e1c..5658dfa14b41 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1632,7 +1632,6 @@ F: support/testing/tests/package/test_avocado.py F: support/testing/tests/package/test_python_aexpect.py N: Joseph Kogut -F: package/at-spi2-atk/ F: package/at-spi2-core/ F: package/clang/ F: package/earlyoom/ diff --git a/package/Config.in b/package/Config.in index 53c2d3b07785..92ef7160d0b2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1554,7 +1554,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" - source "package/at-spi2-atk/Config.in" source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" diff --git a/package/at-spi2-atk/0001-meson-add-tests-option.patch b/package/at-spi2-atk/0001-meson-add-tests-option.patch deleted file mode 100644 index 3a2aefa0908a..000000000000 --- a/package/at-spi2-atk/0001-meson-add-tests-option.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 May 2020 10:29:36 +0200 -Subject: [PATCH] meson: add tests option - -Add tests option to allow the user to build at-spi2-atk without tests, -it is especially useful as one of the test requires libxml-2.0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/at-spi2-atk/-/merge_requests/22] ---- - meson.build | 4 +++- - meson_options.txt | 4 ++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9fce5d6..61bc93d 100644 ---- a/meson.build -+++ b/meson.build -@@ -61,4 +61,6 @@ install_data('at-spi2-atk.desktop', - - subdir('droute') - subdir('atk-adaptor') --subdir('tests') -+if get_option('tests') -+ subdir('tests') -+endif -diff --git a/meson_options.txt b/meson_options.txt -index 24c9228..a4abdc2 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -2,3 +2,7 @@ option('disable_p2p', - description: 'Disable peer-to-peer DBus connections', - type: 'boolean', - value: false) -+option('tests', -+ description: 'Whether to build tests', -+ type: 'boolean', -+ value: true) --- -2.26.2 - diff --git a/package/at-spi2-atk/Config.in b/package/at-spi2-atk/Config.in deleted file mode 100644 index 9a7cfde0af70..000000000000 --- a/package/at-spi2-atk/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_AT_SPI2_ATK - bool "at-spi2-atk" - depends on BR2_PACKAGE_XORG7 # at-spi2-core - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_USE_WCHAR # glib2 - select BR2_PACKAGE_ATK - select BR2_PACKAGE_AT_SPI2_CORE - select BR2_PACKAGE_LIBGLIB2 - help - The At-Spi2 Atk package contains a library that bridges - ATK to At-Spi2 D-Bus service. - - https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/ - -comment "at-spi2-atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-atk depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash deleted file mode 100644 index 9c564c32af75..000000000000 --- a/package/at-spi2-atk/at-spi2-atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum -sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz - -# locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk deleted file mode 100644 index 232b57723023..000000000000 --- a/package/at-spi2-atk/at-spi2-atk.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# at-spi2-atk -# -################################################################################ - -AT_SPI2_ATK_VERSION_MAJOR = 2.34 -AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2 -AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz -AT_SPI2_ATK_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) -AT_SPI2_ATK_LICENSE = LGPL-2.1+ -AT_SPI2_ATK_LICENSE_FILES = COPYING -AT_SPI2_ATK_CPE_ID_VENDOR = gnome -AT_SPI2_ATK_INSTALL_STAGING = YES -AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf -AT_SPI2_ATK_CONF_OPTS = -Dtests=false - -$(eval $(meson-package)) From 2c3ca7bea1de76163aeef432412eb14551ed0581 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Fri, 28 Apr 2023 09:59:18 +0200 Subject: [PATCH 0468/2890] package/atk: remove package atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Reviewed-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/atk/Config.in | 14 -------------- package/atk/atk.hash | 5 ----- package/atk/atk.mk | 25 ------------------------- package/atkmm/Config.in | 8 ++++---- package/atkmm/atkmm.mk | 2 +- package/atkmm2_28/Config.in | 8 ++++---- package/atkmm2_28/atkmm2_28.mk | 2 +- package/libglade/Config.in | 2 +- package/libglade/libglade.mk | 2 +- package/libgtk2/Config.in | 2 +- package/libgtk2/libgtk2.mk | 2 +- package/libgtk3/Config.in | 2 +- package/libgtk3/libgtk3.mk | 2 +- 15 files changed, 22 insertions(+), 61 deletions(-) delete mode 100644 package/atk/Config.in delete mode 100644 package/atk/atk.hash delete mode 100644 package/atk/atk.mk diff --git a/Config.in.legacy b/Config.in.legacy index 7837f5a58836..debe8428a562 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.05" +config BR2_PACKAGE_ATK + bool "atk removed" + select BR2_LEGACY + help + atk is now part of at-spi2-core. + config BR2_PACKAGE_AT_SPI2_ATK bool "at-spi2-atk removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 92ef7160d0b2..420ebaa370b7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1555,7 +1555,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" source "package/at-spi2-core/Config.in" - source "package/atk/Config.in" source "package/atkmm/Config.in" source "package/atkmm2_28/Config.in" source "package/bayer2rgb-neon/Config.in" diff --git a/package/atk/Config.in b/package/atk/Config.in deleted file mode 100644 index d9371b879bee..000000000000 --- a/package/atk/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_ATK - bool "atk" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - The ATK accessibility toolkit, needed to build GTK+-2.x. - - https://gitlab.gnome.org/GNOME/atk - -comment "atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/atk/atk.hash b/package/atk/atk.hash deleted file mode 100644 index d8cd69ff1fcd..000000000000 --- a/package/atk/atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.38/atk-2.38.0.sha256sum -sha256 ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36 atk-2.38.0.tar.xz - -# Hash for license file -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/atk/atk.mk b/package/atk/atk.mk deleted file mode 100644 index 2820fb486dfe..000000000000 --- a/package/atk/atk.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# atk -# -################################################################################ - -ATK_VERSION_MAJOR = 2.38 -ATK_VERSION = $(ATK_VERSION_MAJOR).0 -ATK_SOURCE = atk-$(ATK_VERSION).tar.xz -ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) -ATK_LICENSE = LGPL-2.0+ -ATK_LICENSE_FILES = COPYING -ATK_INSTALL_STAGING = YES -ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) - -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -ATK_CONF_OPTS += -Dintrospection=true -ATK_DEPENDENCIES += gobject-introspection -else -ATK_CONF_OPTS += -Dintrospection=false -endif - -ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) - -$(eval $(meson-package)) diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index 1f370356ea7b..571d7e69adf8 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -2,10 +2,10 @@ config BR2_PACKAGE_ATKMM bool "atkmm (latest)" depends on BR2_INSTALL_LIBSTDCPP # glibmm depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc - depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 - depends on BR2_USE_MMU # atk/glibmm -> libglib2 - depends on BR2_USE_WCHAR # atk/glibmm -> libglib2 - select BR2_PACKAGE_ATK + depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2 + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_GLIBMM select BR2_PACKAGE_LIBSIGC diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 8afd0586437b..ec63d8ecbcf3 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -11,6 +11,6 @@ ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) ATKMM_LICENSE_FILES = COPYING COPYING.tools ATKMM_INSTALL_STAGING = YES -ATKMM_DEPENDENCIES = atk glibmm libsigc host-pkgconf +ATKMM_DEPENDENCIES = at-spi2-core glibmm libsigc host-pkgconf $(eval $(meson-package)) diff --git a/package/atkmm2_28/Config.in b/package/atkmm2_28/Config.in index 2340465b2034..e88073b87a36 100644 --- a/package/atkmm2_28/Config.in +++ b/package/atkmm2_28/Config.in @@ -2,10 +2,10 @@ config BR2_PACKAGE_ATKMM2_28 bool "atkmm (2.28.x)" depends on BR2_INSTALL_LIBSTDCPP # glibmm depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 - depends on BR2_USE_MMU # atk/glibmm -> libglib2 - depends on BR2_USE_WCHAR # atk/glibmm -> libglib2 - select BR2_PACKAGE_ATK + depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2 + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_GLIBMM2_66 select BR2_PACKAGE_LIBSIGC2 diff --git a/package/atkmm2_28/atkmm2_28.mk b/package/atkmm2_28/atkmm2_28.mk index dc57363cf53b..b56da61ec089 100644 --- a/package/atkmm2_28/atkmm2_28.mk +++ b/package/atkmm2_28/atkmm2_28.mk @@ -11,6 +11,6 @@ ATKMM2_28_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM2_28_VERSION_MA ATKMM2_28_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) ATKMM2_28_LICENSE_FILES = COPYING COPYING.tools ATKMM2_28_INSTALL_STAGING = YES -ATKMM2_28_DEPENDENCIES = atk glibmm2_66 libsigc2 host-pkgconf +ATKMM2_28_DEPENDENCIES = at-spi2-core glibmm2_66 libsigc2 host-pkgconf $(eval $(meson-package)) diff --git a/package/libglade/Config.in b/package/libglade/Config.in index c97c9becd2c1..8d0d26f159ff 100644 --- a/package/libglade/Config.in +++ b/package/libglade/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBGLADE depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_LIBXML2 help Libglade allows you to load glade interface files in a program diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk index 21aed6060517..af73d8bd0083 100644 --- a/package/libglade/libglade.mk +++ b/package/libglade/libglade.mk @@ -9,7 +9,7 @@ LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4 LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2 LIBGLADE_SITE = https://download.gnome.org/sources/libglade/$(LIBGLADE_VERSION_MAJOR) LIBGLADE_INSTALL_STAGING = YES -LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2 +LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 at-spi2-core libxml2 LIBGLADE_LICENSE = LGPL-2.0+ LIBGLADE_LICENSE_FILES = COPYING diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index c75c37fb6370..f2888b2f5187 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 859925e8d3af..608c263e4da5 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -23,7 +23,7 @@ LIBGTK2_CONF_ENV = \ LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no -LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk \ +LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango at-spi2-core \ gdk-pixbuf $(TARGET_NLS_DEPENDENCIES) LIBGTK2_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 82ca68d2da25..34b8d49eb371 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -23,7 +23,7 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index b41049b0eeac..d1840ef112fa 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -14,7 +14,7 @@ LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ +LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 at-spi2-core libglib2 cairo pango \ gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) From 05f9c34ad0b6bb3ef719db3df5fb44e3d6a5c2aa Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 28 Apr 2023 09:59:19 +0200 Subject: [PATCH 0469/2890] package/libgtk3: re-enable atk-bridge The at-spi2-core and at-spi2-atk were merged, and are now built by default, so this patch is no longer required. Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Reviewed-by: Adrian Perez de Castro [yann.morin.1998@free.fr: - rename remaining patch, - update .checkpackageignore ] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 3 +- ...ndency-from-gtk-encode-symbolic-svg.patch} | 0 package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- 3 files changed, 1 insertion(+), 43 deletions(-) rename package/libgtk3/{0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch => 0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch} (100%) delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch diff --git a/.checkpackageignore b/.checkpackageignore index 94a32e0531c7..3ac032400bfd 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -772,8 +772,7 @@ package/libgpgme/0001-Fix-build-without-threads.patch Upstream package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch Upstream package/libgsm/0001-misc-fixes-from-archlinux.patch Upstream package/libgtk2/0001-reduce-dependencies.patch Upstream -package/libgtk3/0001-disable-atk-bridge.patch Upstream -package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch Upstream +package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch Upstream package/libhdhomerun/0001-dont-strip.patch Upstream package/libhid/0001-dont-fiddle-with-debug-flags.patch Upstream package/libhid/0002-no-newline-in-ldflags.patch Upstream diff --git a/package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch similarity index 100% rename from package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch rename to package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch deleted file mode 100644 index f3e9bff2ba7b..000000000000 --- a/package/libgtk3/0001-disable-atk-bridge.patch +++ /dev/null @@ -1,41 +0,0 @@ -Remove atk-bridge support. - -atk-bridge doesn't seem useful for now in Buildroot and requires to -add two new packages just for it: at-spi2-core and at-spi2-atk. - -Signed-off-by: Hadrien Boutteville - ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -37,10 +37,6 @@ - #include - #include - --#ifdef GDK_WINDOWING_X11 --#include --#endif -- - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, - guint n_param_values, - const GValue *param_values, -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) - _gtk_accessibility_override_atk_util (); - do_window_event_initialization (); - --#ifdef GDK_WINDOWING_X11 -- atk_bridge_adaptor_init (NULL, NULL); --#endif -- - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); - } ---- a/meson.build -+++ b/meson.build -@@ -564,7 +564,7 @@ if x11_enabled - xfixes_dep = dependency('xfixes', required: false) - xcomposite_dep = dependency('xcomposite', required: false) - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) - - backend_immodules += ['xim'] - From d2f45dea4c4e3548c8938d69acb254c902bdd928 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 28 Apr 2023 09:59:20 +0200 Subject: [PATCH 0470/2890] package/libgtk3: fix update-icon-cache on empty directory If both, hicolor-icon-theme (selected by libgtk3-demo) and adwaita-icon-theme is not selected, then the /usr/share/icons folder is empty, causing find to fail. Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Reviewed-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/libgtk3/libgtk3.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index d1840ef112fa..8291b8d356bb 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -146,8 +146,9 @@ endef # Create icon-theme.cache for each of the icon directories/themes # It's not strictly necessary but speeds up lookups define LIBGTK3_UPDATE_ICON_CACHE - find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ - -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; + [ ! -d $(TARGET_DIR)/usr/share/icons ] || \ + find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ + -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE From 3caf10cb0c384d189e800bc23b7d01b9c0c6a62c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 8 May 2023 20:18:50 +0200 Subject: [PATCH 0471/2890] DEVELOPERS: remove entry for optee-benchmark optee-benchmark package was removed in commit cf39b596e7 ("package/optee-benchmark: remove deprecated package") but forgot to remove the associated DEVELOPERS file entry. Using the get-developers script on any file generates a warning, for example: utils/get-developers DEVELOPERS WARNING: 'package/optee-benchmark/' doesn't match any file, line 865 git send-email --to buildroot@buildroot.org This commit fixes the issue by removing the entry. Cc: Etienne Carriere Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 5658dfa14b41..efb2907d1b75 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -862,7 +862,6 @@ F: package/python-kiwisolver/ N: Etienne Carriere F: boot/optee-os/ -F: package/optee-benchmark/ F: package/optee-client/ F: package/optee-examples/ F: package/optee-test/ From 37fd4ee80a408d8fa810eb1926cac111acbba811 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 8 May 2023 18:47:44 +0200 Subject: [PATCH 0472/2890] package/dav1d: bump version to 1.2.0 Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index cbeebc579db9..1af699dbe361 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From https://download.videolan.org/pub/videolan/dav1d/1.1.0/dav1d-1.1.0.tar.xz.sha256 -sha256 fb57aae7875f28c30fb3dbae4a3683d27e2f91dde09ce5c60c22cef9bc58dfd1 dav1d-1.1.0.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.2.0/dav1d-1.2.0.tar.xz.sha256 +sha256 231bed8bc1bb28a41d88da6b4c2c118de84b92e5f1d67caffa1b7f81aaea8c6e dav1d-1.2.0.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 5fe603fc1cac..f8d4464cd4fb 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 1.1.0 +DAV1D_VERSION = 1.2.0 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause From 9cc48fb94a4f3594f378f6fb5b6a98b0bbb80743 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 8 May 2023 19:03:42 +0200 Subject: [PATCH 0473/2890] package/libass: bump version to 0.17.1 Release notes: https://github.com/libass/libass/releases/tag/0.17.1 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libass/libass.hash | 2 +- package/libass/libass.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index beb7639b1f7f..bf9b8251d758 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 971e2e1db59d440f88516dcd1187108419a370e64863f70687da599fdf66cc1a libass-0.17.0.tar.xz +sha256 f0da0bbfba476c16ae3e1cfd862256d30915911f7abaa1b16ce62ee653192784 libass-0.17.1.tar.xz sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 1cc83103128c..8b14c899c4dc 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.17.0 +LIBASS_VERSION = 0.17.1 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. From a7e7ef2eadfd18c940718ac63a1614709451a398 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 8 May 2023 19:08:26 +0200 Subject: [PATCH 0474/2890] package/libvpx: bump version to 1.13.0 Changelog: https://github.com/webmproject/libvpx/blob/main/CHANGELOG Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libvpx/libvpx.hash | 2 +- package/libvpx/libvpx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvpx/libvpx.hash b/package/libvpx/libvpx.hash index 828718e71346..c88e6840cf1f 100644 --- a/package/libvpx/libvpx.hash +++ b/package/libvpx/libvpx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 f1acc15d0fd0cb431f4bf6eac32d5e932e40ea1186fe78e074254d6d003957bb libvpx-1.12.0.tar.gz +sha256 cb2a393c9c1fae7aba76b950bb0ad393ba105409fe1a147ccd61b0aaa1501066 libvpx-1.13.0.tar.gz sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS diff --git a/package/libvpx/libvpx.mk b/package/libvpx/libvpx.mk index c8a22b9ab2c0..67b25c910060 100644 --- a/package/libvpx/libvpx.mk +++ b/package/libvpx/libvpx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPX_VERSION = 1.12.0 +LIBVPX_VERSION = 1.13.0 LIBVPX_SITE = $(call github,webmproject,libvpx,v$(LIBVPX_VERSION)) LIBVPX_LICENSE = BSD-3-Clause LIBVPX_LICENSE_FILES = LICENSE PATENTS From 8d7471fcf1b018b8e93d2dfe5ca9e69b96c1f5cb Mon Sep 17 00:00:00 2001 From: Nasser Afshin Date: Mon, 8 May 2023 02:22:44 +0330 Subject: [PATCH 0475/2890] package/python-pycrate: bump to version 0.6.0 Signed-off-by: Nasser Afshin Signed-off-by: Yann E. MORIN --- package/python-pycrate/Config.in | 3 ++- package/python-pycrate/python-pycrate.hash | 6 +++--- package/python-pycrate/python-pycrate.mk | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-pycrate/Config.in b/package/python-pycrate/Config.in index 193a973f7ea6..bbd68739387a 100644 --- a/package/python-pycrate/Config.in +++ b/package/python-pycrate/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_PYCRATE bool "python-pycrate" help - A software suite to handle various data formats. + A software suite to handle various data and protocol + formats. https://github.com/P1sec/pycrate/ diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash index e37fd6743ac3..fd41274369ab 100644 --- a/package/python-pycrate/python-pycrate.hash +++ b/package/python-pycrate/python-pycrate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycrate/json -md5 075622d5d573274cd4dbfe268ca52f7f pycrate-0.5.5.tar.gz -sha256 59f09331890a389a6b98412f19f4fb021c5a75a35ab07bf5ba0d1e299a0967af pycrate-0.5.5.tar.gz -# Locally computed +md5 d51fd27d99481990ff85a1e418b1c938 pycrate-0.6.0.tar.gz +sha256 b49738c02a3f93ba9f76c0dac82b689a5341882814b36c714e9600e9f560daf7 pycrate-0.6.0.tar.gz +# Locally computed sha256 checksums sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 license.txt diff --git a/package/python-pycrate/python-pycrate.mk b/package/python-pycrate/python-pycrate.mk index 677943355610..2f947ab807de 100644 --- a/package/python-pycrate/python-pycrate.mk +++ b/package/python-pycrate/python-pycrate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRATE_VERSION = 0.5.5 +PYTHON_PYCRATE_VERSION = 0.6.0 PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz -PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/25/8f/b3d7e0b541aa04b2f0f7aa694a6946b572bfa2e2627cf1f12b5416d633df +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/fb/7f/5f354100270a5d41350e9806dc9950a33e00a30eb3a7ab5fc9db86326856 PYTHON_PYCRATE_SETUP_TYPE = setuptools PYTHON_PYCRATE_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/P1sec/pycrate/$(PYTHON_PYCRATE_VERSION)/license.txt PYTHON_PYCRATE_LICENSE = LGPL-2.1+ From 1a45c5f515d746adb09147f18585a78eb9a7557d Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Mon, 8 May 2023 07:41:34 +0200 Subject: [PATCH 0476/2890] package/libcamera: bump to version 0.0.5 Signed-off-by: Marcus Folkesson Signed-off-by: Yann E. MORIN --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index ea204aee9805..01505aa02e41 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 13e53b33652b16454264b6eff0a6f032aa9331f919b07b6d0e622917ed7f7dd8 libcamera-v0.0.4-br1.tar.gz +sha256 0cad66dc09520dddd47510603e053cc9913dc968db4cebe2ac5ddd43fd08fef6 libcamera-v0.0.5-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 01c4cb2ff263..2e30077e20cc 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.0.4 +LIBCAMERA_VERSION = v0.0.5 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ From feb16bd9878bcde7d690a1887604ddc861f5f30d Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Mon, 8 May 2023 10:25:42 +0200 Subject: [PATCH 0477/2890] package/glibmm2_66: bump to version 2.66.6 https://gitlab.gnome.org/GNOME/glibmm/-/raw/2.66.6/NEWS Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/glibmm2_66/glibmm2_66.hash | 4 ++-- package/glibmm2_66/glibmm2_66.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/glibmm2_66/glibmm2_66.hash b/package/glibmm2_66/glibmm2_66.hash index b7d19b261ce0..19272d2b9079 100644 --- a/package/glibmm2_66/glibmm2_66.hash +++ b/package/glibmm2_66/glibmm2_66.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.5.sha256sum -sha256 7b384662dd6ec3b86c0570331d32af05db2bd99a791602b767b4a0b2566ec149 glibmm-2.66.5.tar.xz +# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.6.sha256sum +sha256 5358742598181e5351d7bf8da072bf93e6dd5f178d27640d4e462bc8f14e152f glibmm-2.66.6.tar.xz # License files, locally calculated sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/glibmm2_66/glibmm2_66.mk b/package/glibmm2_66/glibmm2_66.mk index b58c7ca8df21..7f28342c525c 100644 --- a/package/glibmm2_66/glibmm2_66.mk +++ b/package/glibmm2_66/glibmm2_66.mk @@ -5,7 +5,7 @@ ################################################################################ GLIBMM2_66_VERSION_MAJOR = 2.66 -GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).5 +GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).6 GLIBMM2_66_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GLIBMM2_66_LICENSE_FILES = COPYING COPYING.tools GLIBMM2_66_SOURCE = glibmm-$(GLIBMM2_66_VERSION).tar.xz From 34e029eacf31be9c53c88d6ec16c13a239e2c43d Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Mon, 8 May 2023 16:35:06 +0200 Subject: [PATCH 0478/2890] package/dbus-cxx: bump version to 2.4.0 https://github.com/dbus-cxx/dbus-cxx/releases/tag/2.4.0 Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/dbus-cxx/dbus-cxx.hash | 2 +- package/dbus-cxx/dbus-cxx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash index 6a7a634cedba..4ed9d73bac7b 100644 --- a/package/dbus-cxx/dbus-cxx.hash +++ b/package/dbus-cxx/dbus-cxx.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 88d4bd1d9af8563bda03f24b26ffe4efbc555ca82ac664ced572b053928f739a dbus-cxx-2.3.1.tar.gz +sha256 c38456ed70023d93e6e689087e4bbe030f1650bbda9de7c035d6f4ebac788379 dbus-cxx-2.4.0.tar.gz sha256 99e5d0ad951d96567a6f9a17f3f17ac000c0582f53357c7f3601851c2dcbb786 COPYING sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 cmake-modules/LICENSE_1_0.txt sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 tools/libcppgenerate/LICENSE diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk index 554acaa67d91..8e2b4f70fae3 100644 --- a/package/dbus-cxx/dbus-cxx.mk +++ b/package/dbus-cxx/dbus-cxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_CXX_VERSION = 2.3.1 +DBUS_CXX_VERSION = 2.4.0 DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) DBUS_CXX_LICENSE = LGPL-3.0+ or BSD-3-Clause, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE From 441c44626f3c8b6181b7b4be0757d4eb2659dcee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Wed, 19 Apr 2023 14:51:59 +0200 Subject: [PATCH 0479/2890] package: busybox: backport fix for missing getrandom() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current Busybox version (1.36.0) fails to build with some libc/linux combinations where getrandom() is not available. Two fixes for glibc already exists upstream, so backport them here. A third one (submitted upstream, not part of the main branch yet) was needed to be able to compile with older musl and uClibc versions (or older kernels). This fixes the following build failure raised since commit d68b617993bd2f5c82a4936ed1e24e4fec6b94a2: miscutils/seedrng.c:45:24: fatal error: sys/random.h: No such file or directory #include Fixes: - http://autobuild.buildroot.net/results/44a0476b86c579e6aa658f156f0292958d40513c - http://autobuild.buildroot.net/results/ed028160db397581558fd8c96755621dd8298bb1 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624008 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624034 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624044 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624048 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624051 It also fixes the following (similar) build failure, raised since the same commit: miscutils/lib.a(seedrng.o): In function `seedrng_main': seedrng.c:(.text.seedrng_main+0x26c): undefined reference to `getrandom' seedrng.c:(.text.seedrng_main+0x2e8): undefined reference to `getrandom' collect2: error: ld returned 1 exit status Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624028 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624031 Signed-off-by: Raphaël Mélotte Signed-off-by: Yann E. MORIN --- ...r-glibc-2.24-not-providing-getrandom.patch | 39 +++++++ ...glibc-2.24-not-providing-random-head.patch | 60 ++++++++++ ...trandom-detection-for-non-glibc-libc.patch | 106 ++++++++++++++++++ 3 files changed, 205 insertions(+) create mode 100644 package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch create mode 100644 package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch create mode 100644 package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch diff --git a/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch new file mode 100644 index 000000000000..4a194612b466 --- /dev/null +++ b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch @@ -0,0 +1,39 @@ +From 200a9669fbf6f06894e4243cccc9fc11a1a6073a Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Mon, 10 Apr 2023 17:26:04 +0200 +Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing getrandom() + +Signed-off-by: Denys Vlasenko +Upstream: https://git.busybox.net/busybox/commit/?id=200a9669fbf6f06894e4243cccc9fc11a1a6073a +--- + miscutils/seedrng.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 967741dc7..7cc855141 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -45,6 +45,20 @@ + #include + #include + ++/* Fix up glibc <= 2.24 not having getrandom() */ ++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 ++#include ++# define getrandom(...) bb_getrandom(__VA_ARGS__) ++static ssize_t getrandom(void *buffer, size_t length, unsigned flags) ++{ ++# if defined(__NR_getrandom) ++ return syscall(__NR_getrandom, buffer, length, flags); ++# else ++ return ENOSYS; ++# endif ++} ++#endif ++ + #ifndef GRND_INSECURE + #define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ + #endif +-- +2.39.1 + diff --git a/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch new file mode 100644 index 000000000000..d7298848056f --- /dev/null +++ b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch @@ -0,0 +1,60 @@ +From cb57abb46f06f4ede8d9ccbdaac67377fdf416cf Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 10 Apr 2023 19:58:15 +0200 +Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing random header + + - dropped the wrong define (not sure why it was there) + - not available if glibc <= 2.24 + - GRND_NONBLOCK not defined if not included + - ret < 0 && errno == ENOSYS has to be true to get creditable set + +Signed-off-by: Thomas Devoogdt +Signed-off-by: Denys Vlasenko +Upstream: https://git.busybox.net/busybox/commit/?id=cb57abb46f06f4ede8d9ccbdaac67377fdf416cf +--- + miscutils/seedrng.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 7cc855141..3bf6e2ea7 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -42,25 +42,31 @@ + #include "libbb.h" + + #include +-#include + #include + + /* Fix up glibc <= 2.24 not having getrandom() */ + #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 + #include +-# define getrandom(...) bb_getrandom(__VA_ARGS__) + static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + { + # if defined(__NR_getrandom) + return syscall(__NR_getrandom, buffer, length, flags); + # else +- return ENOSYS; ++ errno = ENOSYS; ++ return -1; + # endif + } ++#else ++#include ++#endif ++ ++/* Apparently some headers don't ship with this yet. */ ++#ifndef GRND_NONBLOCK ++#define GRND_NONBLOCK 0x0001 + #endif + + #ifndef GRND_INSECURE +-#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ ++#define GRND_INSECURE 0x0004 + #endif + + #define DEFAULT_SEED_DIR "/var/lib/seedrng" +-- +2.39.1 + diff --git a/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch new file mode 100644 index 000000000000..90cace7968d7 --- /dev/null +++ b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch @@ -0,0 +1,106 @@ +From b8d32dba741daea2ed01a0da32083b1bc994aa04 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= +Date: Tue, 18 Apr 2023 15:54:43 +0200 +Subject: [PATCH] seedrng: fix getrandom() detection for non-glibc libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +glibc <= 2.24 does not provide getrandom(). A check for it has been +added in 200a9669fbf6f06894e4243cccc9fc11a1a6073a and fixed in +cb57abb46f06f4ede8d9ccbdaac67377fdf416cf. + +However, building with a libc other than glibc can lead to the same +problem as not every other libc has getrandom() either: + +- uClibc provides it from v1.0.2 onwards, but requires to define +_GNU_SOURCE (all versions - we already define it by default), and +stddef to be included first (when using uClibc < 1.0.35 - we already +include it through libbb.h). + +- musl libc has getrandom(), but only from version 1.1.20 onwards. As +musl does not provide __MUSL__ or version information, it's not +possible to check for it like we did for glibc. + +All of this makes it difficult (or impossible in case of musl) to +check what we need to do to have getrandom() based on each libc +versions. + +On top of that, getrandom() is also not available on older kernels. As +an example, when using a 3.10 kernel with uClibc 1.0.26, getrandom() +is declared so compiling works, but it fails at link time because +getrandom() is not defined. + +To make it easier, take a similar approach to what was done for the +crypt library: try to build a sample program to see if we have +getrandom(). + +Based on the new Makefile variable, we now either use the +libc-provided getrandom() when it's available, or use our own +implementation when it's not (like it was the case already for glibc < +2.25). + +This should fix compiling with many libc/kernel combinations. + +Signed-off-by: Raphaël Mélotte +Upstream: http://lists.busybox.net/pipermail/busybox/2023-April/090285.html +--- +Note that I was not able to test every single combination, but I could +confirm it builds successfully for: +uClibc 10.0.24, linux headers 3.10 (libc getrandom NOT used) +uClibc 1.0.36, linux headers 4.9 (libc getrandom used) +musl 1.1.16, linux headers 4.12 (libc getrandom NOT used) +musl 1.2.1, linux headers (libc getrandom used) +glibc 2.25, linux headers 4.10 (libc getrandom used) + + Makefile.flags | 7 +++++++ + miscutils/seedrng.c | 8 ++++---- + 2 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/Makefile.flags b/Makefile.flags +index 1cec5ba20..88c11862f 100644 +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -161,6 +161,13 @@ ifeq ($(RT_AVAILABLE),y) + LDLIBS += rt + endif + ++# Not all libc versions have getrandom, so check for it. ++HAVE_GETRANDOM := $(shell printf '#include \n#include \nint main(void){char buf[256];\ngetrandom(buf,sizeof(buf),GRND_NONBLOCK);}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -D_GNU_SOURCE -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c) ++ ++ifeq ($(HAVE_GETRANDOM),y) ++CFLAGS += -DHAVE_GETRANDOM ++endif ++ + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. + # However, on *other platforms* it fails when some of those flags +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 3bf6e2ea7..2f1e18c32 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -44,8 +44,10 @@ + #include + #include + +-/* Fix up glibc <= 2.24 not having getrandom() */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 ++/* Fix up some libc (e.g. glibc <= 2.24) not having getrandom() */ ++#if defined HAVE_GETRANDOM ++#include ++#else /* No getrandom */ + #include + static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + { +@@ -56,8 +58,6 @@ static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + return -1; + # endif + } +-#else +-#include + #endif + + /* Apparently some headers don't ship with this yet. */ +-- +2.39.1 + From 62962d175d3fbeb0289bce4440005b8129f21efe Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 30 Apr 2023 20:35:33 +0200 Subject: [PATCH 0480/2890] package/sysklogd: bump to v2.5.0 - Add support for -c and -cc to disable log compression A single -c disables compression for pipes, another -c (or -cc) disables compression for all other log targets - The default syslog.conf now logs debug messages again (disabled in v2.4.0) due to problems (confusion) reported in the field - Dropped not recommended KillMode=process from systemd unit file - Fix loss of early log messages running under systemd Full changelog: https://github.com/troglobit/sysklogd/releases/tag/v2.5.0 Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/sysklogd/sysklogd.hash | 2 +- package/sysklogd/sysklogd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index e370716bd93b..30ce6d9c0bd3 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 01f25931d1508c3e6be4e182f49356c993abc7d035d5835db35f9b61d5085549 sysklogd-2.4.4.tar.gz +sha256 e1d635944e5a6062c8ea18b9506668ebdaefacea1965147f60cf3fb3a25770e8 sysklogd-2.5.0.tar.gz # Locally calculated sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 68023c9ae20b..ebc9f89cf77d 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.4.4 +SYSKLOGD_VERSION = 2.5.0 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE From 683563da8095c2eb69e677402b9bef7217ae90d9 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Mon, 1 May 2023 09:21:10 +1200 Subject: [PATCH 0481/2890] package/syslog-ng: Bump version to 4.1.1 Bump version to 4.1.1 and update sample config. Signed-off-by: Chris Packham Signed-off-by: Yann E. MORIN --- package/syslog-ng/syslog-ng.conf | 2 +- package/syslog-ng/syslog-ng.hash | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index 69db9b4b78bc..f4b74dc8c143 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.38 +@version: 4.1 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 6fce7be9969b..8ab4d5ac3b66 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 5491f686d0b829b69b2e0fc0d66a62f51991aafaee005475bfa38fab399441f7 syslog-ng-3.38.1.tar.gz +sha256 d7df3cfa32d1a750818d94b8ea582dea54c37226e7b55a88c3d2f3a543d8f20e syslog-ng-4.1.1.tar.gz sha256 c75dcbfc17ccf742f12042a370f825a40951085d2352dfc9d07e715dae3ca9bd COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index a7176ad1295b..1c4cec6adb4f 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.38.1 +SYSLOG_NG_VERSION = 4.1.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt From 58884367da1787d4e23bdd223cf09407107ad486 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 28 Apr 2023 21:47:29 +0200 Subject: [PATCH 0482/2890] package/harfbuzz: bump version to 7.2.0 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 1e7a1cf5306f..88b90c8b394f 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b harfbuzz-7.1.0.tar.xz +sha256 fc5560c807eae0efd5f95b5aa4c65800c7a8eed6642008a6b1e7e3ffff7873cc harfbuzz-7.2.0.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 24c6f3ef27dc..23741ebace7d 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 7.1.0 +HARFBUZZ_VERSION = 7.2.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 6ea396aef272fa107775ea8e4903506d2ffc99e0 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 26 Apr 2023 10:08:24 +0200 Subject: [PATCH 0483/2890] package/mdio-tools: fix Config.in Add project's site and add a full stop at the end of the description. Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN --- package/mdio-tools/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/mdio-tools/Config.in b/package/mdio-tools/Config.in index 237f4454cc19..790c9c534a82 100644 --- a/package/mdio-tools/Config.in +++ b/package/mdio-tools/Config.in @@ -14,4 +14,6 @@ config BR2_PACKAGE_MDIO_TOOLS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 select BR2_PACKAGE_LIBMNL help - Low-level debug tools for MDIO devices + Low-level debug tools for MDIO devices. + + https://github.com/wkz/mdio-tools From e174343f6a55e2b6928d0f323116850287e015a2 Mon Sep 17 00:00:00 2001 From: Sebastian Weyer Date: Sat, 29 Apr 2023 00:40:51 +0200 Subject: [PATCH 0484/2890] configs/qemu: update defconfigs to Linux 6.1.26 Just updating all qemu defconfigs to the latest Kernel LTS version including first gcc 13.1 fixes [1] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.26&id=a93c20f5832221c2bf5f80199c4eaebc0ba28e16 Signed-off-by: Sebastian Weyer Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- configs/qemu_aarch64_ebbr_defconfig | 2 +- configs/qemu_aarch64_sbsa_defconfig | 4 ++-- configs/qemu_aarch64_virt_defconfig | 4 ++-- configs/qemu_arm_ebbr_defconfig | 2 +- configs/qemu_arm_versatile_defconfig | 4 ++-- configs/qemu_arm_vexpress_defconfig | 4 ++-- configs/qemu_arm_vexpress_tz_defconfig | 4 ++-- configs/qemu_m68k_mcf5208_defconfig | 4 ++-- configs/qemu_m68k_q800_defconfig | 4 ++-- configs/qemu_microblazebe_mmu_defconfig | 4 ++-- configs/qemu_microblazeel_mmu_defconfig | 4 ++-- configs/qemu_mips32r2_malta_defconfig | 4 ++-- configs/qemu_mips32r2el_malta_defconfig | 4 ++-- configs/qemu_mips32r6_malta_defconfig | 4 ++-- configs/qemu_mips32r6el_malta_defconfig | 4 ++-- configs/qemu_mips64_malta_defconfig | 4 ++-- configs/qemu_mips64el_malta_defconfig | 4 ++-- configs/qemu_mips64r6_malta_defconfig | 4 ++-- configs/qemu_mips64r6el_malta_defconfig | 4 ++-- configs/qemu_nios2_10m50_defconfig | 4 ++-- configs/qemu_or1k_defconfig | 4 ++-- configs/qemu_ppc64_e5500_defconfig | 4 ++-- configs/qemu_ppc64_pseries_defconfig | 4 ++-- configs/qemu_ppc64le_powernv8_defconfig | 4 ++-- configs/qemu_ppc64le_pseries_defconfig | 4 ++-- configs/qemu_ppc_bamboo_defconfig | 4 ++-- configs/qemu_ppc_e500mc_defconfig | 4 ++-- configs/qemu_ppc_g3beige_defconfig | 4 ++-- configs/qemu_ppc_mac99_defconfig | 4 ++-- configs/qemu_ppc_mpc8544ds_defconfig | 4 ++-- configs/qemu_riscv32_virt_defconfig | 4 ++-- configs/qemu_riscv64_nommu_virt_defconfig | 6 +++--- configs/qemu_riscv64_virt_defconfig | 4 ++-- configs/qemu_s390x_defconfig | 2 +- configs/qemu_sh4_r2d_defconfig | 4 ++-- configs/qemu_sh4eb_r2d_defconfig | 4 ++-- configs/qemu_sparc64_sun4u_defconfig | 4 ++-- configs/qemu_sparc_ss10_defconfig | 4 ++-- configs/qemu_x86_64_defconfig | 4 ++-- configs/qemu_x86_defconfig | 4 ++-- configs/qemu_xtensa_lx60_defconfig | 4 ++-- configs/qemu_xtensa_lx60_nommu_defconfig | 4 ++-- 42 files changed, 82 insertions(+), 82 deletions(-) diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index e3157089a972..099934324c0b 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 609444e787f5..1eff46893533 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-sbsa/a BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-sbsa/genimage.cfg" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 03df0ad9e209..74e6b8431a63 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index 8fbb3069bc6e..dbdde892be9b 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 4f43273a8211..10290311826d 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 2c813456f401..743dc0479a80 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2_SIZE="64M" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index b24fab5e4278..3cd666fb4d0f 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -17,12 +17,12 @@ BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 0490b9e29e85..bf6213634571 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 30d8982db3f9..50b61a8007d9 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 7bd2ae53b82c..96b9dce41cd5 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index cd8c5a3cb29d..5c2e4ba3d422 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index 49d84c308b50..bf4ce4f704f8 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 5363018c47ca..fadb94ad71e6 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index f77feb9b6d4b..e52b8a54080c 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index 575034441a6d..f9ed35eb9577 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index e9438fda1e11..8616d689e668 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index 4b1c8e22af7e..e7d1a730dfae 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 87ef7902af8f..e9bf26c08795 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 5774207f65d7..28de05345ba7 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 4b9c53e8debe..a9fbf4ce150c 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index b3d9d7915672..166e5ea5caa1 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -10,12 +10,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 6ad03c4c871b..0ab7e8e76f25 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -12,12 +12,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 50844dc93b02..92fe3a11f6b7 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index f6a5c3d409f3..cb086ba248b8 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 7ce5a9d31032..001d614c3b77 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index f4cc5589e7b4..83a657dcbdd2 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index 0a1877c44b42..124f6f247aa4 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 1c11bcf77d03..d2741d7dfb09 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index 2331041c2a88..eda116afd60b 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -6,12 +6,12 @@ BR2_powerpc_7400=y BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index b9a0812d5254..ca1a42916750 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index f354e303e5ce..03c871282e56 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index ee70beb20888..6d84844e8502 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -3,8 +3,8 @@ BR2_riscv=y BR2_RISCV_64=y # BR2_RISCV_USE_MMU is not set -# Linux headers same as kernel, a 5.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Busybox with hush BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index b3174a152c10..666500d88913 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 6bbcca0896de..ee18bdb011f9 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -17,7 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 0f12b7dfe9c1..f07e352367f1 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index d5ee371e79f1..9753ebc951a5 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 485b497e71a8..ccc6cce3c163 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 2ba04c08642b..7d1a424eef9d 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index cc505a85401d..0d1955291c4d 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 34b7e2d2926d..19eb9360df82 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index cb781060918d..6bfda227756b 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index 4be1b66edc54..80d17d3e5a4e 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From 3e60ea997233e9c5579a1d2327364396efc762d3 Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Fri, 28 Apr 2023 11:31:37 +0800 Subject: [PATCH 0485/2890] package/dhcpcd: bump to version 10.0.1 Switch to github as package site as announced here: https://roy.marples.name/downloads/dhcpcd/ Update license hash due to update in Copyright years. Signed-off-by: Xiangyu Chen Signed-off-by: Yann E. MORIN --- package/dhcpcd/dhcpcd.hash | 6 +++--- package/dhcpcd/dhcpcd.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash index 532fbd467e26..88032f05c1b8 100644 --- a/package/dhcpcd/dhcpcd.hash +++ b/package/dhcpcd/dhcpcd.hash @@ -1,4 +1,4 @@ -# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-9.4.1.tar.xz.distinfo -sha256 819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c dhcpcd-9.4.1.tar.xz +# sha256 from https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.0.1 +sha256 6e9f6a5c47fcd8a763cfa26f1ca6eedf1e534992224a01d6c1ab8abb154af972 dhcpcd-10.0.1.tar.xz # Locally calculated -sha256 4f21ce186859516dcab9b3197f3e9533a9bd1b87932015c87f539af4a48cd592 LICENSE +sha256 a7d6da3a202cdd38eaab0bcea4d25f60d002980f3785b3e896d9bf387f093ac8 LICENSE diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index 922d289b263e..82efe10ef916 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,9 +4,9 @@ # ################################################################################ -DHCPCD_VERSION = 9.4.1 +DHCPCD_VERSION = 10.0.1 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz -DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd +DHCPCD_SITE = https://github.com/NetworkConfiguration/dhcpcd/releases/download/v$(DHCPCD_VERSION) DHCPCD_DEPENDENCIES = host-pkgconf DHCPCD_LICENSE = BSD-2-Clause DHCPCD_LICENSE_FILES = LICENSE From 8a289667f5dba6fffb3a21faa14517e9b49726a4 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 26 Apr 2023 09:50:59 +0200 Subject: [PATCH 0486/2890] package/perl: bump to version 5.36.1 diff README: -Perl is Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, -2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 -by Larry Wall and others. +Perl is Copyright (C) 1993 - 2023 by Larry Wall and others. Signed-off-by: Francois Perrad [yann.morin.1998@free.fr: fix spaces in hash file] Signed-off-by: Yann E. MORIN --- package/perl/perl.hash | 14 +++++++------- package/perl/perl.mk | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index b21023f7303c..2165c8c60180 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,12 +1,12 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.36.0.tar.xz.{md5,sha1,sha256}.txt -md5 826e42da130011699172fd655e49cfa2 perl-5.36.0.tar.xz -sha1 938c56a77ae094eb7f5019318a5e4efb2d9c74fa perl-5.36.0.tar.xz -sha256 0f386dccbee8e26286404b2cca144e1005be65477979beb9b1ba272d4819bcf0 perl-5.36.0.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.36.1.tar.xz.{md5,sha1,sha256}.txt +md5 825f6b1d7e03b22522e0bdb992fbb728 perl-5.36.1.tar.xz +sha1 7b766266af08a6cef0487308e80b40d5d8069df7 perl-5.36.1.tar.xz +sha256 bd91217ea8a8c8b81f21ebbb6cefdf0d13ae532013f944cdece2cd51aef4b6a7 perl-5.36.1.tar.xz -# Hash from: https://github.com/arsv/perl-cross/releases/download/1.4/perl-cross-1.4.hash -sha256 be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91 perl-cross-1.4.tar.gz +# Hash from: https://github.com/arsv/perl-cross/releases/download/1.4.1/perl-cross-1.4.1.hash +sha256 3e14bb4f28c83586c668c5f9f6b4e57b138b4ec2fae0271086e29d4e352670ca perl-cross-1.4.1.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 06bab256e2e039c59d2ca3c5853425317b4a0f251fe4e5d5201a987b11fc4f78 README +sha256 810c97bea10842d2e47bc79e51acdfa1628cfee34fa0d89330f4eb3a44e3def9 README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 9be00e1b2c43..734e8efec6d8 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -6,7 +6,7 @@ # When updating the version here, also update utils/scancpan PERL_VERSION_MAJOR = 36 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.4 +PERL_CROSS_VERSION = 1.4.1 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz From a0484b888f8d1e30590758d8a8f6730e3a2890fa Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 8 May 2023 20:10:00 +0200 Subject: [PATCH 0487/2890] package/openblas: add a new option to install tests This option can be used for runtime testing or package debugging. Signed-off-by: Julien Olivain [yann.morin.1998@free.fr: tweak the comment] Signed-off-by: Yann E. MORIN --- package/openblas/Config.in | 5 +++++ package/openblas/openblas.mk | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/package/openblas/Config.in b/package/openblas/Config.in index 0144e93a3faf..58976e657a2f 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -94,4 +94,9 @@ config BR2_PACKAGE_OPENBLAS_USE_LOCKING function calls from multiple threads, then locking is mandatory for correct operation. +config BR2_PACKAGE_OPENBLAS_INSTALL_TESTS + bool "install tests" + help + Install C test programs on target. + endif diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index f7a50d7bc711..d8fcb4a2c647 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -77,4 +77,23 @@ define OPENBLAS_INSTALL_TARGET_CMDS -C $(@D) install PREFIX=$(TARGET_DIR)/usr endef +ifeq ($(BR2_PACKAGE_OPENBLAS_INSTALL_TESTS),y) +# Tests are always built, but are not installed, so we need to install +# them manually. The set of available tests may fluctuate depending on +# the architecture and other options, so only install whatever gets +# built. +define OPENBLAS_INSTALL_TESTS + mkdir -p $(TARGET_DIR)/usr/libexec/openblas/tests + find $(@D)/ctest \ + -type f -name "x[sdcz]cblat[123]" -perm -0100 \ + -exec $(INSTALL) -m 0755 {} \ + $(TARGET_DIR)/usr/libexec/openblas/tests \; + find $(@D)/ctest \ + -type f -name "[sdcz]in[123]" \ + -exec $(INSTALL) -m 0644 {} \ + $(TARGET_DIR)/usr/libexec/openblas/tests \; +endef +OPENBLAS_POST_INSTALL_TARGET_HOOKS += OPENBLAS_INSTALL_TESTS +endif + $(eval $(generic-package)) From 3686e16b5213431ee44d6599486d05d9c07854d1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 8 May 2023 20:10:01 +0200 Subject: [PATCH 0488/2890] support/testing/tests/package/test_openblas.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + .../testing/tests/package/test_openblas.py | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 support/testing/tests/package/test_openblas.py diff --git a/DEVELOPERS b/DEVELOPERS index efb2907d1b75..37c1f06ec1ad 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1748,6 +1748,7 @@ F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ +F: support/testing/tests/package/test_openblas.py F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py diff --git a/support/testing/tests/package/test_openblas.py b/support/testing/tests/package/test_openblas.py new file mode 100644 index 000000000000..9cfe08ef2c56 --- /dev/null +++ b/support/testing/tests/package/test_openblas.py @@ -0,0 +1,56 @@ +import os + +import infra.basetest + + +class TestOpenBLAS(infra.basetest.BRTest): + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.27" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_OPENBLAS=y + BR2_PACKAGE_OPENBLAS_INSTALL_TESTS=y + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-smp", "2", "-m", "512M", "-initrd", img]) + self.emulator.login() + + test_prefix = "/usr/libexec/openblas/tests" + + # BLAS data types: + blas_data_types = [ + "s", # Single precision (32bit) float + "d", # Double precision (64bit) double + "c", # Single precision (32bit) complex + "z" # Double precision (64bit) complex + ] + + # BLAS routine levels: + # Level 1: Vector operations, + # Level 2: Matrix-Vector operations, + # Level 3: Matrix-Matrix operations. + for blas_level in range(1, 4): + for blas_data_type in blas_data_types: + test_name = f"x{blas_data_type}cblat{blas_level}" + cmd = test_prefix + "/" + test_name + + if blas_level > 1: + cmd += f" < {test_prefix}/{blas_data_type}in{blas_level}" + + self.assertRunOk(cmd, timeout=30) From e5b8646c19937ce030598e0037df9da1c75be727 Mon Sep 17 00:00:00 2001 From: Yair Ben-Avraham Date: Tue, 25 Apr 2023 13:34:02 +0000 Subject: [PATCH 0489/2890] package/gloox: bump version to 1.0.27 Signed-off-by: Yair Ben-Avraham [yann.morin.1998@free.fr: regenerate .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...src-connectiontcpserver-cpp-fix-musl.patch | 25 ------------------- package/gloox/gloox.hash | 2 +- package/gloox/gloox.mk | 2 +- 4 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch diff --git a/.checkpackageignore b/.checkpackageignore index 3ac032400bfd..05459362eed8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -584,7 +584,6 @@ package/gli/0001-Optional-building-tests.patch Upstream package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch Upstream package/glmark2/0002-libmatrix-Add-missing-utility-include.patch Upstream package/glog/0001-added-emscripten-support.patch Upstream -package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch Upstream package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch Upstream diff --git a/package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch b/package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch deleted file mode 100644 index 56a2d4982cb7..000000000000 --- a/package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -src/connectiontcpserver.cpp: fix musl build - -Build on musl fails on: - -connectiontcpserver.cpp:131:13: error: 'strerror' was not declared in this scope - + strerror( err ) + " (errno: " + util::int2string( err ) + ")"; - ^~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/a61a91bb6e1156eff5fb756f9dccfc2bb6c0f277 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://bugs.camaya.net/ticket/?id=291] - -diff -Nuar gloox-1.0.23-orig/src/connectiontcpserver.cpp gloox-1.0.23/src/connectiontcpserver.cpp ---- gloox-1.0.23-orig/src/connectiontcpserver.cpp 2020-06-05 23:22:59.624018949 +0200 -+++ gloox-1.0.23/src/connectiontcpserver.cpp 2020-06-05 23:26:20.708027221 +0200 -@@ -36,6 +36,7 @@ - # include - # include - # include -+# include - # include - # include - # include diff --git a/package/gloox/gloox.hash b/package/gloox/gloox.hash index 6419db90f849..66a3c2d1be56 100644 --- a/package/gloox/gloox.hash +++ b/package/gloox/gloox.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ae1462be2a2eb8fe5cd054825143617c53c2c9c7195606cb5a5ba68c0f68f9c9 gloox-1.0.24.tar.bz2 +sha256 0b8b7371439bc58d9e51384b616c964b18b7b41b87af1b7855104380eda86ffb gloox-1.0.27.tar.bz2 sha256 40a20c41c8dabb8ba61bea983fa8f2f6989e67fac56bb62c2249053807fd26af LICENSE diff --git a/package/gloox/gloox.mk b/package/gloox/gloox.mk index b741d5ebc122..3495db96f0e3 100644 --- a/package/gloox/gloox.mk +++ b/package/gloox/gloox.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLOOX_VERSION = 1.0.24 +GLOOX_VERSION = 1.0.27 GLOOX_SOURCE = gloox-$(GLOOX_VERSION).tar.bz2 GLOOX_SITE = https://camaya.net/download GLOOX_LICENSE = GPL-3.0 with OpenSSL exception From b20eb56440fd2a7b8f578bf9eda89160c8053434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Tue, 25 Apr 2023 09:09:22 +0200 Subject: [PATCH 0490/2890] package/mupdf: fix building with zlib-ng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current mupdf version fails to build when zlib-ng is used as the zlib implementation. Add a patch to fix it. This fixes the following build failure raised since the bump to version 1.21.0 of the mupdf package in commit 3c2033cd2ace077e7dfaf58a2589b2a93a5fd7b0: source/fitz/encode-basic.c: In function 'deflate_write': source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function) 343 | newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n); | ^~~~~~~~ source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header ''; did you forget to '#include '? Fixes: http://autobuild.buildroot.net/results/87128e9967cff20078c65ab847877aa44cc409d9 Signed-off-by: Raphaël Mélotte Signed-off-by: Yann E. MORIN --- ...issing-limits.h-include-for-UINT_MAX.patch | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch diff --git a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch new file mode 100644 index 000000000000..95f2f86666d0 --- /dev/null +++ b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch @@ -0,0 +1,70 @@ +From ebce9f1b129ebc8f2b17afa02a4ffcb9453c11d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= +Date: Mon, 24 Apr 2023 17:27:35 +0200 +Subject: [PATCH] Add missing limits.h include for UINT_MAX +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +encode-basic.c uses 'UINT_MAX', which is available in the 'limits.h' +header. + +In some configurations that build with zlib from [1], by chance +limits.h gets indirectly included when including 'z-imp.h' (the +includes are: 'z-imp.h' -> 'zlib.h' -> 'zconf.h' -> 'limits.h'), so +the build succeeds. + +When using other zlib implementations however (for example from [2]), +limits.h is not necessarily included indirectly, which leads to the +build failing in the following way: + +source/fitz/encode-basic.c: In function 'deflate_write': +source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function) + 343 | newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n); + | ^~~~~~~~ +source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header ''; did you forget to '#include '? + +Add the missing include, so that the build succeeds no matter if zlib +indirectly includes 'limit.h' or not. + +Similarly, also add it in output-ps.c where it's also missing. + +[1]: https://zlib.net/ +[2]: https://github.com/zlib-ng/zlib-ng + +Signed-off-by: Raphaël Mélotte +Upstream: https://bugs.ghostscript.com/show_bug.cgi?id=706667 +--- + source/fitz/encode-basic.c | 2 ++ + source/fitz/output-ps.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/source/fitz/encode-basic.c b/source/fitz/encode-basic.c +index 03a4ff76b..84f0c35e6 100644 +--- a/source/fitz/encode-basic.c ++++ b/source/fitz/encode-basic.c +@@ -24,6 +24,8 @@ + + #include "z-imp.h" + ++#include ++ + struct ahx + { + fz_output *chain; +diff --git a/source/fitz/output-ps.c b/source/fitz/output-ps.c +index ef22c3cd6..3dc8ea17d 100644 +--- a/source/fitz/output-ps.c ++++ b/source/fitz/output-ps.c +@@ -24,6 +24,8 @@ + + #include "z-imp.h" + ++#include ++ + typedef struct ps_band_writer_s + { + fz_band_writer super; +-- +2.39.1 + From 4938d2d232496b58c1093664fe9a86b6ea62bc72 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 8 May 2023 23:40:48 +0200 Subject: [PATCH 0491/2890] Revert "package: busybox: backport fix for missing getrandom()" This casues build failures: ..../build/busybox-1.36.0/Makefile.flags:165: *** unterminated call to function 'shell': missing ')'. Stop. This reverts commit 441c44626f3c8b6181b7b4be0757d4eb2659dcee. Signed-off-by: Yann E. MORIN --- ...r-glibc-2.24-not-providing-getrandom.patch | 39 ------- ...glibc-2.24-not-providing-random-head.patch | 60 ---------- ...trandom-detection-for-non-glibc-libc.patch | 106 ------------------ 3 files changed, 205 deletions(-) delete mode 100644 package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch delete mode 100644 package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch delete mode 100644 package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch diff --git a/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch deleted file mode 100644 index 4a194612b466..000000000000 --- a/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 200a9669fbf6f06894e4243cccc9fc11a1a6073a Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Mon, 10 Apr 2023 17:26:04 +0200 -Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing getrandom() - -Signed-off-by: Denys Vlasenko -Upstream: https://git.busybox.net/busybox/commit/?id=200a9669fbf6f06894e4243cccc9fc11a1a6073a ---- - miscutils/seedrng.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c -index 967741dc7..7cc855141 100644 ---- a/miscutils/seedrng.c -+++ b/miscutils/seedrng.c -@@ -45,6 +45,20 @@ - #include - #include - -+/* Fix up glibc <= 2.24 not having getrandom() */ -+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 -+#include -+# define getrandom(...) bb_getrandom(__VA_ARGS__) -+static ssize_t getrandom(void *buffer, size_t length, unsigned flags) -+{ -+# if defined(__NR_getrandom) -+ return syscall(__NR_getrandom, buffer, length, flags); -+# else -+ return ENOSYS; -+# endif -+} -+#endif -+ - #ifndef GRND_INSECURE - #define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ - #endif --- -2.39.1 - diff --git a/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch deleted file mode 100644 index d7298848056f..000000000000 --- a/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch +++ /dev/null @@ -1,60 +0,0 @@ -From cb57abb46f06f4ede8d9ccbdaac67377fdf416cf Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 10 Apr 2023 19:58:15 +0200 -Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing random header - - - dropped the wrong define (not sure why it was there) - - not available if glibc <= 2.24 - - GRND_NONBLOCK not defined if not included - - ret < 0 && errno == ENOSYS has to be true to get creditable set - -Signed-off-by: Thomas Devoogdt -Signed-off-by: Denys Vlasenko -Upstream: https://git.busybox.net/busybox/commit/?id=cb57abb46f06f4ede8d9ccbdaac67377fdf416cf ---- - miscutils/seedrng.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c -index 7cc855141..3bf6e2ea7 100644 ---- a/miscutils/seedrng.c -+++ b/miscutils/seedrng.c -@@ -42,25 +42,31 @@ - #include "libbb.h" - - #include --#include - #include - - /* Fix up glibc <= 2.24 not having getrandom() */ - #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 - #include --# define getrandom(...) bb_getrandom(__VA_ARGS__) - static ssize_t getrandom(void *buffer, size_t length, unsigned flags) - { - # if defined(__NR_getrandom) - return syscall(__NR_getrandom, buffer, length, flags); - # else -- return ENOSYS; -+ errno = ENOSYS; -+ return -1; - # endif - } -+#else -+#include -+#endif -+ -+/* Apparently some headers don't ship with this yet. */ -+#ifndef GRND_NONBLOCK -+#define GRND_NONBLOCK 0x0001 - #endif - - #ifndef GRND_INSECURE --#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ -+#define GRND_INSECURE 0x0004 - #endif - - #define DEFAULT_SEED_DIR "/var/lib/seedrng" --- -2.39.1 - diff --git a/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch deleted file mode 100644 index 90cace7968d7..000000000000 --- a/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch +++ /dev/null @@ -1,106 +0,0 @@ -From b8d32dba741daea2ed01a0da32083b1bc994aa04 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= -Date: Tue, 18 Apr 2023 15:54:43 +0200 -Subject: [PATCH] seedrng: fix getrandom() detection for non-glibc libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -glibc <= 2.24 does not provide getrandom(). A check for it has been -added in 200a9669fbf6f06894e4243cccc9fc11a1a6073a and fixed in -cb57abb46f06f4ede8d9ccbdaac67377fdf416cf. - -However, building with a libc other than glibc can lead to the same -problem as not every other libc has getrandom() either: - -- uClibc provides it from v1.0.2 onwards, but requires to define -_GNU_SOURCE (all versions - we already define it by default), and -stddef to be included first (when using uClibc < 1.0.35 - we already -include it through libbb.h). - -- musl libc has getrandom(), but only from version 1.1.20 onwards. As -musl does not provide __MUSL__ or version information, it's not -possible to check for it like we did for glibc. - -All of this makes it difficult (or impossible in case of musl) to -check what we need to do to have getrandom() based on each libc -versions. - -On top of that, getrandom() is also not available on older kernels. As -an example, when using a 3.10 kernel with uClibc 1.0.26, getrandom() -is declared so compiling works, but it fails at link time because -getrandom() is not defined. - -To make it easier, take a similar approach to what was done for the -crypt library: try to build a sample program to see if we have -getrandom(). - -Based on the new Makefile variable, we now either use the -libc-provided getrandom() when it's available, or use our own -implementation when it's not (like it was the case already for glibc < -2.25). - -This should fix compiling with many libc/kernel combinations. - -Signed-off-by: Raphaël Mélotte -Upstream: http://lists.busybox.net/pipermail/busybox/2023-April/090285.html ---- -Note that I was not able to test every single combination, but I could -confirm it builds successfully for: -uClibc 10.0.24, linux headers 3.10 (libc getrandom NOT used) -uClibc 1.0.36, linux headers 4.9 (libc getrandom used) -musl 1.1.16, linux headers 4.12 (libc getrandom NOT used) -musl 1.2.1, linux headers (libc getrandom used) -glibc 2.25, linux headers 4.10 (libc getrandom used) - - Makefile.flags | 7 +++++++ - miscutils/seedrng.c | 8 ++++---- - 2 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/Makefile.flags b/Makefile.flags -index 1cec5ba20..88c11862f 100644 ---- a/Makefile.flags -+++ b/Makefile.flags -@@ -161,6 +161,13 @@ ifeq ($(RT_AVAILABLE),y) - LDLIBS += rt - endif - -+# Not all libc versions have getrandom, so check for it. -+HAVE_GETRANDOM := $(shell printf '#include \n#include \nint main(void){char buf[256];\ngetrandom(buf,sizeof(buf),GRND_NONBLOCK);}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -D_GNU_SOURCE -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c) -+ -+ifeq ($(HAVE_GETRANDOM),y) -+CFLAGS += -DHAVE_GETRANDOM -+endif -+ - # libpam may use libpthread, libdl and/or libaudit. - # On some platforms that requires an explicit -lpthread, -ldl, -laudit. - # However, on *other platforms* it fails when some of those flags -diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c -index 3bf6e2ea7..2f1e18c32 100644 ---- a/miscutils/seedrng.c -+++ b/miscutils/seedrng.c -@@ -44,8 +44,10 @@ - #include - #include - --/* Fix up glibc <= 2.24 not having getrandom() */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 -+/* Fix up some libc (e.g. glibc <= 2.24) not having getrandom() */ -+#if defined HAVE_GETRANDOM -+#include -+#else /* No getrandom */ - #include - static ssize_t getrandom(void *buffer, size_t length, unsigned flags) - { -@@ -56,8 +58,6 @@ static ssize_t getrandom(void *buffer, size_t length, unsigned flags) - return -1; - # endif - } --#else --#include - #endif - - /* Apparently some headers don't ship with this yet. */ --- -2.39.1 - From 511f28ae5ca0fbd3c997f5c460747a5d3e0ca24b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 24 Apr 2023 23:51:06 +0200 Subject: [PATCH 0492/2890] support/testing: new runtime test for bash Commit 2dff6e93ca2a (package/readline: add upstream patch to fix crash with invalid locale specification) fixed a regression in readline 8.2 [0], that could have been caught with a runtime test. readline is a library, so we need an executable that exercises readline. Since readline and bash are developped in tandem [1], it is only logical to use bash to test readline. Add a new runtime test for bash, that checks that we can indeed run an interactive shell, and that an non-existing locale does not cause the dreaded segfault. We do not use the default configuration, because it uses a uclibc toolchain, and we want to reproduce against a glibc one. [0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021109 [1] https://tiswww.case.edu/php/chet/readline/rltop.html#Bugs Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_bash.py | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 support/testing/tests/package/test_bash.py diff --git a/support/testing/tests/package/test_bash.py b/support/testing/tests/package/test_bash.py new file mode 100644 index 000000000000..f0ee8cadc120 --- /dev/null +++ b/support/testing/tests/package/test_bash.py @@ -0,0 +1,47 @@ +import os + +import infra.basetest + + +class TestBash(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_ENABLE_LOCALE_WHITELIST="" + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_BASH=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check that we are indeed not (yet) running bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "", "Already running bash instead of busybox' sh") + + self.assertRunOk("bash -il") + # Twist! The above command is still runing, it's just that + # bash did display the prompt we expect. Check we are indeed + # actually bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "/bin/bash", "Not running bash") + # Exit bash, back to busybox' shell + self.emulator.run("exit 0") + + # Check that we are indeed no longer running bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "", "Still running bash instead of busybox' sh") + + # Try to run with a non-available locale + self.assertRunOk("LC_ALL=en_US bash -il") + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "/bin/bash", "Not running bash") + self.emulator.run("exit 0") From cd02f96b871c9bed5fec92605806668b2aca2bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Tue, 9 May 2023 13:58:29 +0200 Subject: [PATCH 0493/2890] package: busybox: backport fix for missing getrandom() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current Busybox version (1.36.0) fails to build with some libc/linux combinations where getrandom() is not available. Two fixes for glibc already exists upstream, so backport them here. A third one (submitted upstream, not part of the main branch yet) was needed to be able to compile with older musl and uClibc versions (or older kernels). This fixes the following build failure raised since commit d68b617993bd2f5c82a4936ed1e24e4fec6b94a2: miscutils/seedrng.c:45:24: fatal error: sys/random.h: No such file or directory #include Fixes: - http://autobuild.buildroot.net/results/44a0476b86c579e6aa658f156f0292958d40513c - http://autobuild.buildroot.net/results/ed028160db397581558fd8c96755621dd8298bb1 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624008 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624034 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624044 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624048 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624051 It also fixes the following (similar) build failure, raised since the same commit: miscutils/lib.a(seedrng.o): In function `seedrng_main': seedrng.c:(.text.seedrng_main+0x26c): undefined reference to `getrandom' seedrng.c:(.text.seedrng_main+0x2e8): undefined reference to `getrandom' collect2: error: ld returned 1 exit status Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624028 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624031 Signed-off-by: Raphaël Mélotte Signed-off-by: Yann E. MORIN --- ...r-glibc-2.24-not-providing-getrandom.patch | 39 ++++++ ...glibc-2.24-not-providing-random-head.patch | 60 +++++++++ ...trandom-detection-for-non-glibc-libc.patch | 124 ++++++++++++++++++ 3 files changed, 223 insertions(+) create mode 100644 package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch create mode 100644 package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch create mode 100644 package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch diff --git a/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch new file mode 100644 index 000000000000..4a194612b466 --- /dev/null +++ b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch @@ -0,0 +1,39 @@ +From 200a9669fbf6f06894e4243cccc9fc11a1a6073a Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Mon, 10 Apr 2023 17:26:04 +0200 +Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing getrandom() + +Signed-off-by: Denys Vlasenko +Upstream: https://git.busybox.net/busybox/commit/?id=200a9669fbf6f06894e4243cccc9fc11a1a6073a +--- + miscutils/seedrng.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 967741dc7..7cc855141 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -45,6 +45,20 @@ + #include + #include + ++/* Fix up glibc <= 2.24 not having getrandom() */ ++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 ++#include ++# define getrandom(...) bb_getrandom(__VA_ARGS__) ++static ssize_t getrandom(void *buffer, size_t length, unsigned flags) ++{ ++# if defined(__NR_getrandom) ++ return syscall(__NR_getrandom, buffer, length, flags); ++# else ++ return ENOSYS; ++# endif ++} ++#endif ++ + #ifndef GRND_INSECURE + #define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ + #endif +-- +2.39.1 + diff --git a/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch new file mode 100644 index 000000000000..d7298848056f --- /dev/null +++ b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch @@ -0,0 +1,60 @@ +From cb57abb46f06f4ede8d9ccbdaac67377fdf416cf Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 10 Apr 2023 19:58:15 +0200 +Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing random header + + - dropped the wrong define (not sure why it was there) + - not available if glibc <= 2.24 + - GRND_NONBLOCK not defined if not included + - ret < 0 && errno == ENOSYS has to be true to get creditable set + +Signed-off-by: Thomas Devoogdt +Signed-off-by: Denys Vlasenko +Upstream: https://git.busybox.net/busybox/commit/?id=cb57abb46f06f4ede8d9ccbdaac67377fdf416cf +--- + miscutils/seedrng.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 7cc855141..3bf6e2ea7 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -42,25 +42,31 @@ + #include "libbb.h" + + #include +-#include + #include + + /* Fix up glibc <= 2.24 not having getrandom() */ + #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 + #include +-# define getrandom(...) bb_getrandom(__VA_ARGS__) + static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + { + # if defined(__NR_getrandom) + return syscall(__NR_getrandom, buffer, length, flags); + # else +- return ENOSYS; ++ errno = ENOSYS; ++ return -1; + # endif + } ++#else ++#include ++#endif ++ ++/* Apparently some headers don't ship with this yet. */ ++#ifndef GRND_NONBLOCK ++#define GRND_NONBLOCK 0x0001 + #endif + + #ifndef GRND_INSECURE +-#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ ++#define GRND_INSECURE 0x0004 + #endif + + #define DEFAULT_SEED_DIR "/var/lib/seedrng" +-- +2.39.1 + diff --git a/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch new file mode 100644 index 000000000000..140b27cae671 --- /dev/null +++ b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch @@ -0,0 +1,124 @@ +From b2d26d449ec855602b9a88f58c2eb675de0224f2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= +Date: Tue, 18 Apr 2023 15:54:43 +0200 +Subject: [PATCH v4] seedrng: fix getrandom() detection for non-glibc libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +glibc <= 2.24 does not provide getrandom(). A check for it has been +added in 200a9669fbf6f06894e4243cccc9fc11a1a6073a and fixed in +cb57abb46f06f4ede8d9ccbdaac67377fdf416cf. + +However, building with a libc other than glibc can lead to the same +problem as not every other libc has getrandom() either: + +- uClibc provides it from v1.0.2 onwards, but requires to define +_GNU_SOURCE (all versions - we already define it by default), and +stddef to be included first (when using uClibc < 1.0.35 - we already +include it through libbb.h). + +- musl libc has getrandom(), but only from version 1.1.20 onwards. As +musl does not provide __MUSL__ or version information, it's not +possible to check for it like we did for glibc. + +All of this makes it difficult (or impossible in case of musl) to +check what we need to do to have getrandom() based on each libc +versions. + +On top of that, getrandom() is also not available on older kernels. As +an example, when using a 3.10 kernel with uClibc 1.0.26, getrandom() +is declared so compiling works, but it fails at link time because +getrandom() is not defined. + +To make it easier, take a similar approach to what was done for the +crypt library: try to build a sample program to see if we have +getrandom(). To keep it compatible with different versions of +make (for reference see [1]), a variable for '#' is also introduced. + +Based on the new Makefile variable, we now either use the +libc-provided getrandom() when it's available, or use our own +implementation when it's not (like it was the case already for glibc < +2.25). + +This should fix compiling with many libc/kernel combinations. + +[1]: https://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b576b907b06aea5f4 + +Signed-off-by: Raphaël Mélotte +Upstream: http://lists.busybox.net/pipermail/busybox/2023-May/090317.html +--- +Changes v3 -> v4: + - use a variable for '#' for compatibility with GNU make 4.2.1 and earlier. + +Changes v2 -> v3: + - fix _GNU_SOURCE define location + +Changes v1 -> v2: + - move _GNU_SOURCE to bb_libtest.c + - remove GRND_NONBLOCK + +Note that I was not able to test every single combination, but I could +confirm it builds successfully for: +uClibc 10.0.24, linux headers 3.10 (libc getrandom NOT used) +uClibc 1.0.36, linux headers 4.9 (libc getrandom used) +musl 1.1.16, linux headers 4.12 (libc getrandom NOT used) +musl 1.2.1, linux headers (libc getrandom used) +glibc 2.25, linux headers 4.10 (libc getrandom used) + + Makefile.flags | 12 ++++++++++++ + miscutils/seedrng.c | 8 ++++---- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/Makefile.flags b/Makefile.flags +index 1cec5ba20..0d437303a 100644 +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -161,6 +161,18 @@ ifeq ($(RT_AVAILABLE),y) + LDLIBS += rt + endif + ++# GNU Make version 4.2.1 and earlier require number signs ('#') ++# inside function invocations to be escaped, while versions 4.3+ ++# require them to be unescaped. Use a variable for it so that it works ++# for both versions: ++C := \# ++# Not all libc versions have getrandom, so check for it: ++HAVE_GETRANDOM := $(shell printf '$Cdefine _GNU_SOURCE\n$Cinclude \n$Cinclude \nint main(void){char buf[256];\ngetrandom(buf,sizeof(buf),0);}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c) ++ ++ifeq ($(HAVE_GETRANDOM),y) ++CFLAGS += -DHAVE_GETRANDOM ++endif ++ + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. + # However, on *other platforms* it fails when some of those flags +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 3bf6e2ea7..2f1e18c32 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -44,8 +44,10 @@ + #include + #include + +-/* Fix up glibc <= 2.24 not having getrandom() */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 ++/* Fix up some libc (e.g. glibc <= 2.24) not having getrandom() */ ++#if defined HAVE_GETRANDOM ++#include ++#else /* No getrandom */ + #include + static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + { +@@ -56,8 +58,6 @@ static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + return -1; + # endif + } +-#else +-#include + #endif + + /* Apparently some headers don't ship with this yet. */ +-- +2.39.1 + From f228f98f8a0e30829eb43b7c963efd511c2bc43e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:42 -0700 Subject: [PATCH 0494/2890] package/libglib2/0003-disable-building-docs.patch: new patch If rst2html5 is installed on a host system, meson will attempt to build html5 documentation from the docs directory, resulting in the following error: /usr/local/bin/rst2html5.py Traceback (most recent call last): File "/usr/local/bin/rst2html5.py", line 27, in from docutils.core import publish_cmdline, default_description ModuleNotFoundError: No module named 'docutils' Backport an upstream that guards the build of the html documentation behind the existing ds_doc condition, which we already disable in Buildroot. Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: - as pointed out by James, backport an upstream commit rather than carry an non-upstreamable patch ] Signed-off-by: Yann E. MORIN --- ...documentation-generation-with-gtk_do.patch | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch diff --git a/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch b/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch new file mode 100644 index 000000000000..0fa15ad16438 --- /dev/null +++ b/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch @@ -0,0 +1,96 @@ +From 0fa17ec3c7152cf0e1cbf965acf1426ac203bb1d Mon Sep 17 00:00:00 2001 +From: James Knight +Date: Thu, 27 Apr 2023 20:23:30 -0400 +Subject: [PATCH] meson: wrap html documentation generation with gtk_doc option + +By default, if a host environment has the `rst2html5` application +available, builds will automatically perform some HTML documentation +generation from the documentation's glib reference content (e.g. +creating `gvariant-specification-1.0.html`). The creation of this +documentation is not required for all use cases. + +This commit tweaks the building of the HTML-based GLIB specification +document to be guarded by `gtk_doc`. + +Signed-off-by: James Knight +Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/0fa17ec3c7152cf0e1cbf965acf1426ac203bb1d +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: Yann E. MORIN +--- + docs/reference/glib/meson.build | 58 +++++++++++++++++---------------- + 1 file changed, 30 insertions(+), 28 deletions(-) + +diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build +index 114de49da..3cfff2f0b 100644 +--- a/docs/reference/glib/meson.build ++++ b/docs/reference/glib/meson.build +@@ -113,35 +113,37 @@ if get_option('man') + endforeach + endif + +-# GVariant specification is currently standalone +-rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false) ++if get_option('gtk_doc') ++ # GVariant specification is currently standalone ++ rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false) + +-if rst2html5.found() +- spec_path = glib_datadir / 'doc' / 'glib-2.0' ++ if rst2html5.found() ++ spec_path = glib_datadir / 'doc' / 'glib-2.0' + +- figures = files( +- 'gvariant-byte-boundaries.svg', +- 'gvariant-integer-and-string-structure.svg', +- 'gvariant-integer-array.svg', +- 'gvariant-string-array.svg', +- ) ++ figures = files( ++ 'gvariant-byte-boundaries.svg', ++ 'gvariant-integer-and-string-structure.svg', ++ 'gvariant-integer-array.svg', ++ 'gvariant-string-array.svg', ++ ) + +- custom_target('gvariant-specification-1.0', +- input: 'gvariant-specification-1.0.rst', +- output: 'gvariant-specification-1.0.html', +- command: [ +- rst2html5, +- '@INPUT@', +- ], +- capture: true, +- install: true, +- install_dir: spec_path, +- install_tag: 'doc', +- depend_files: figures, +- ) ++ custom_target('gvariant-specification-1.0', ++ input: 'gvariant-specification-1.0.rst', ++ output: 'gvariant-specification-1.0.html', ++ command: [ ++ rst2html5, ++ '@INPUT@', ++ ], ++ capture: true, ++ install: true, ++ install_dir: spec_path, ++ install_tag: 'doc', ++ depend_files: figures, ++ ) + +- install_data(figures, +- install_dir : spec_path, +- install_tag : 'doc', +- ) +-endif +\ No newline at end of file ++ install_data(figures, ++ install_dir : spec_path, ++ install_tag : 'doc', ++ ) ++ endif ++endif +-- +2.25.1 + From 03bb1a514652f6c3db51ab92683b5161a08f8ab4 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:43 -0700 Subject: [PATCH 0495/2890] package/python-pip: add host variant Some packages, like libselinux, use pip to perform the installation step of their python bindings. Those packages do have to use our host python when building, so that it matches the target python. So we need to have a host variant of pip that is usable with our host python. Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: reword commit log] Signed-off-by: Yann E. MORIN --- package/python-pip/python-pip.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 8cf3aaa3ecec..35ad7bede26d 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -14,3 +14,4 @@ PYTHON_PIP_CPE_ID_VENDOR = pypa PYTHON_PIP_CPE_ID_PRODUCT = pip $(eval $(python-package)) +$(eval $(host-python-package)) From 5e960f272b24d44efb2b362914d617ccb1c582d4 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:44 -0700 Subject: [PATCH 0496/2890] package/libsepol: bump to version 3.5 Change the license file to LICENSE. The hash remains the same. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/libsepol/libsepol.hash | 4 ++-- package/libsepol/libsepol.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index 039e4e3c7edb..c243aaae2b33 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 2d97df3eb8466169b389c3660acbb90c54200ac96e452eca9f41a9639f4f238b libsepol-3.3.tar.gz +sha256 78fdaf69924db780bac78546e43d9c44074bad798c2c415d0b9bb96d065ee8a2 libsepol-3.5.tar.gz # Hash for license file -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 8551a5de79e6..f7782542ec81 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.3 +LIBSEPOL_VERSION = 3.5 LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ -LIBSEPOL_LICENSE_FILES = COPYING +LIBSEPOL_LICENSE_FILES = LICENSE LIBSEPOL_CPE_ID_VENDOR = selinuxproject LIBSEPOL_INSTALL_STAGING = YES From e7dbd3cee0d71b30de63ef957f25225af6bcbc8f Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:45 -0700 Subject: [PATCH 0497/2890] package/libsemanage: bump to version 3.5 Change the license file to LICENSE. The hash remains the same. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/libsemanage/libsemanage.hash | 4 ++-- package/libsemanage/libsemanage.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 1f333aac30a8..73df34bde96c 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 84d0ec5afa34bbbb471f602d8c1bf317d12443d07852a34b60741d428d597ce8 libsemanage-3.3.tar.gz +sha256 f53534e50247538280ed0d76c6ce81d8fb3939bd64cadb89da10dba42e40dd9c libsemanage-3.5.tar.gz # Hash for license file -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index db9f16bb6a60..0fbdc5ae8ddf 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 3.3 +LIBSEMANAGE_VERSION = 3.5 LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION) LIBSEMANAGE_LICENSE = LGPL-2.1+ -LIBSEMANAGE_LICENSE_FILES = COPYING +LIBSEMANAGE_LICENSE_FILES = LICENSE LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux bzip2 LIBSEMANAGE_CPE_ID_VENDOR = selinuxproject LIBSEMANAGE_INSTALL_STAGING = YES From 1db27ce253fd2ea6a71c5051f5f1ba1fc0067277 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:46 -0700 Subject: [PATCH 0498/2890] package/libselinux: bump to version 3.5 - libselinux now requires pip, just to perform the install of the python bindings; it still uses setuptools to do the actual build; - rebase patches for version 3.5; - backport a fix for the install of the python bindings. Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: - backport upstream patch to fix installation of python bindings ] Signed-off-by: Yann E. MORIN --- package/libselinux/0001-fix-musl-build.patch | 4 +- ...T-and-rely-on-the-installed-file-nam.patch | 8 ++-- ...inux-set-CFLAGS-for-pip-installation.patch | 43 +++++++++++++++++++ package/libselinux/Config.in | 1 + package/libselinux/libselinux.hash | 2 +- package/libselinux/libselinux.mk | 16 +++++-- 6 files changed, 64 insertions(+), 10 deletions(-) create mode 100644 package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch diff --git a/package/libselinux/0001-fix-musl-build.patch b/package/libselinux/0001-fix-musl-build.patch index 44189e6400b1..b8b16be26f52 100644 --- a/package/libselinux/0001-fix-musl-build.patch +++ b/package/libselinux/0001-fix-musl-build.patch @@ -12,13 +12,13 @@ Domain, and we want to avoid license propagation, so this macro is completely written from scratch, and non-optimal. Signed-off-by: "Yann E. MORIN" -[Updated for 3.0] +[Updated for 3.5] Signed-off-by: Adam Duskett diff --git a/src/booleans.c b/src/booleans.c index ffa8d26..8569002 100644 --- a/src/booleans.c +++ b/src/booleans.c -@@ -65,6 +65,14 @@ int security_get_boolean_names(char ***names, int *len) +@@ -64,6 +64,14 @@ int security_get_boolean_names(char ***names, int *len) goto bad; } diff --git a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch index 18c79b3b4d01..c744ca40699a 100644 --- a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +++ b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch @@ -18,7 +18,7 @@ was installed. Signed-off-by: Antoine Tenart [Refreshed for 3.1] Signed-off-by: Thomas Petazzoni -[Refreshed for 3.0] +[Refreshed for 3.5] Signed-off-by: Adam Duskett --- src/Makefile | 3 +-- @@ -31,14 +31,14 @@ index 190016e2af34..7ee22fd35da3 100644 @@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX)) PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX)) - PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(plat_specific=1, prefix='$(PREFIX)'))") + PYTHONLIBDIR ?= $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '$(PREFIX)', 'base': '$(PREFIX)'}))") -PYCEXT ?= $(shell $(PYTHON) -c 'import importlib.machinery;print(importlib.machinery.EXTENSION_SUFFIXES[0])') RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') -@@ -184,7 +183,7 @@ install: all +@@ -189,7 +188,7 @@ install: all install-pywrap: pywrap - $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS) + $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py - ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) + ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/ diff --git a/package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch b/package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch new file mode 100644 index 000000000000..c08529c44f70 --- /dev/null +++ b/package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch @@ -0,0 +1,43 @@ +From c9b3cbb654ca1e834d47f52af9f170b9f38c857a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= +Date: Thu, 20 Apr 2023 18:27:00 +0200 +Subject: [PATCH] libselinux: set CFLAGS for pip installation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Explicitly set CFLAGS for the pip install command, similar to calling +setup.py, to ignore known compiler warnings treated as errors, e.g.: + + selinuxswig_python_wrap.c:3593:19: error: 'sidget' is deprecated [-Werror,-Wdeprecated-declarations] + result = (int)sidget(arg1); + ^ + selinuxswig_python_wrap.c:15024:1: error: no previous prototype for function 'PyInit__selinux' [-Werror,-Wmissing-prototypes] + SWIG_init(void) { + ^ + +Signed-off-by: Christian Göttsche +Acked-by: Petr Lautrbach +Upstream: https://github.com/SELinuxProject/selinux/commit/c9b3cbb654ca1e834d47f52af9f170b9f38c857a +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: Yann E. MORIN +--- + libselinux/src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile +index 36d57122..f9a1e5f5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -187,7 +187,7 @@ install: all + ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) + + install-pywrap: pywrap +- $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . ++ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . + install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py + ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) + +-- +2.25.1 + diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in index 3098fe3ea451..bc40e32a467e 100644 --- a/package/libselinux/Config.in +++ b/package/libselinux/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_PYTHON_SETUPTOOLS if BR2_PACKAGE_PYTHON3 help libselinux is the runtime SELinux library that provides interfaces (e.g. library functions for the SELinux kernel diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index a2e0083f7bc8..14bc627a80c7 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 acfdee27633d2496508c28727c3d41d3748076f66d42fccde2e6b9f3463a7057 libselinux-3.3.tar.gz +sha256 9a3a3705ac13a2ccca2de6d652b6356fead10f36fb33115c185c5ccdf29eec19 libselinux-3.5.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index db35da130f6d..b8de21edaa9b 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.3 +LIBSELINUX_VERSION = 3.5 LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE @@ -31,7 +31,11 @@ LIBSELINUX_MAKE_OPTS += FTS_LDLIBS=-lfts endif ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIBSELINUX_DEPENDENCIES += python3 host-swig +LIBSELINUX_DEPENDENCIES += \ + python3 \ + python-setuptools \ + host-python-pip \ + host-swig LIBSELINUX_MAKE_OPTS += \ $(PKG_PYTHON_DISTUTILS_ENV) \ @@ -77,7 +81,13 @@ define LIBSELINUX_INSTALL_TARGET_CMDS endef HOST_LIBSELINUX_DEPENDENCIES = \ - host-pkgconf host-libsepol host-pcre2 host-swig host-python3 + host-pkgconf \ + host-libsepol \ + host-pcre2 \ + host-swig \ + host-python3 \ + host-python-pip \ + host-python-setuptools HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ From e2b4398f410e3bb076662ced8fbd87ef42595b7e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:47 -0700 Subject: [PATCH 0499/2890] package/policycoreutils: bump to version 3.5 Change the license file to LICENSE. The hash remains the same. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- ...1-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch | 2 +- package/policycoreutils/policycoreutils.hash | 4 ++-- package/policycoreutils/policycoreutils.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch index aa75ca63c049..18f0001aef86 100644 --- a/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch +++ b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch @@ -32,7 +32,7 @@ index a3bbbe1..df675cf 100644 +AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y) CFLAGS ?= -g -Werror -Wall -W - override LDLIBS += -lselinux -lsepol + override LDLIBS += -lselinux -lsepol -lpthread -- 2.13.6 diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash index e7f006b02335..e29d192b1387 100644 --- a/package/policycoreutils/policycoreutils.hash +++ b/package/policycoreutils/policycoreutils.hash @@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 d1331c6fa766c547b071c491de90b9f343c8dbffdb119be8a5a7e491199b93a9 policycoreutils-3.2.tar.gz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 78453e1529fbbf800e88860094d555e781ce1fba11a7ef77b5aabb43e1173276 policycoreutils-3.5.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 8505dbca3fb6..61d91066d401 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -4,10 +4,10 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 3.2 +POLICYCOREUTILS_VERSION = 3.5 POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(POLICYCOREUTILS_VERSION) POLICYCOREUTILS_LICENSE = GPL-2.0 -POLICYCOREUTILS_LICENSE_FILES = COPYING +POLICYCOREUTILS_LICENSE_FILES = LICENSE POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) From d7ac206c52ecd7d37d8b5b6bea4876bc80f563af Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:48 -0700 Subject: [PATCH 0500/2890] package/checkpolicy: bump to version 3.5 Change the license file to LICENSE. The hash remains the same. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/checkpolicy/checkpolicy.hash | 4 ++-- package/checkpolicy/checkpolicy.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index 358638904740..fcfd81c554de 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 25c84edfa3a10ab8cb073b97bc55cb66377532d54a2723da9accdabd05431485 checkpolicy-3.3.tar.gz +sha256 7aa48ab2222a0b9881111d6d7f70c3014d3d9338827d9e02df105a68c0df5dbc checkpolicy-3.5.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index baf16fb8029f..024d306233a9 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,10 +4,10 @@ # ################################################################################ -CHECKPOLICY_VERSION = 3.3 +CHECKPOLICY_VERSION = 3.5 CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION) CHECKPOLICY_LICENSE = GPL-2.0 -CHECKPOLICY_LICENSE_FILES = COPYING +CHECKPOLICY_LICENSE_FILES = LICENSE CHECKPOLICY_DEPENDENCIES = libselinux flex host-flex host-bison From bebf552287cb4e224d706bb6820410cc6994eb17 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:49 -0700 Subject: [PATCH 0501/2890] package/restorecond: bump to version 3.5 Change the license file to LICENSE. The hash remains the same. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/restorecond/restorecond.hash | 4 ++-- package/restorecond/restorecond.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index b38c6dcf1433..215c9192f476 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 218c3d8873f31764e3c82d53ac713c0c9faaa07caf42ed7184e93ca2b27d8f27 restorecond-3.3.tar.gz +sha256 f00d8caddb6aba2793c65e69154d04671b52f3d37e081b0e96c1b443fe23c2fe restorecond-3.5.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index 7d6ed86f08e4..cd409052305f 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,10 +4,10 @@ # ################################################################################ -RESTORECOND_VERSION = 3.3 +RESTORECOND_VERSION = 3.5 RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION) RESTORECOND_LICENSE = GPL-2.0 -RESTORECOND_LICENSE_FILES = COPYING +RESTORECOND_LICENSE_FILES = LICENSE RESTORECOND_DEPENDENCIES = libglib2 libsepol libselinux dbus-glib From d803297732f4f85053ed16e88d8f26d197f31ae4 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:50 -0700 Subject: [PATCH 0502/2890] package/semodule-utils: bump to version 3.5 Change the license file to LICENSE. The hash remains the same. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/semodule-utils/semodule-utils.hash | 4 ++-- package/semodule-utils/semodule-utils.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index c252506df5a0..ac3357d3fab9 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 3098ec5e5f04a1dbbf4aa569b63a4570750a9fe0d4da14ce45954aa300a17063 semodule-utils-3.3.tar.gz +sha256 c9a550a737051ebaf2c102f665c7ec2f85e7232870980aa0067998459b414283 semodule-utils-3.5.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index a9388f7ee8e1..9a0f0841288b 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,10 +4,10 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 3.3 +SEMODULE_UTILS_VERSION = 3.5 SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SEMODULE_UTILS_VERSION) SEMODULE_UTILS_LICENSE = GPL-2.0 -SEMODULE_UTILS_LICENSE_FILES = COPYING +SEMODULE_UTILS_LICENSE_FILES = LICENSE SEMODULE_UTILS_DEPENDENCIES = libsepol SEMODULE_UTILS_MAKE_OPTS += \ From f9716cae47b868e833a5dc61d64b7e518a792a3f Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:51 -0700 Subject: [PATCH 0503/2890] package/audit: bump to version 3.1 Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/audit/audit.hash | 2 +- package/audit/audit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 6260f158d892..87c00ec241d7 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 8b4c78632a9301a1c7f859b0e38fc0b9c260b8214d6b7c771bf28b3d73a62597 audit-3.0.7.tar.gz +sha256 b5cf3cdabb2786c08b1de3599a3b1a547e55f7a9f9c1eb2078f5b44cf44e8378 audit-3.1.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 77e7c240001a..252f5865b5af 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 3.0.7 +AUDIT_VERSION = 3.1 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB From b42b4442ca2a6c4a4286fdc2ce9dbdaacf6f6368 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:52 -0700 Subject: [PATCH 0504/2890] package/selinux-python: bump to version 3.5 Also: - Change the license file to LICENSE. The hash remains the same. - Add 0001-python-sepolgen-fix-ausearch-path.patch as audit 3.1 installs ausearch to /usr/sbin not /sbin Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: rewrite 0001 into an upstreamable patch] Signed-off-by: Yann E. MORIN --- ...01-python-sepolgen-fix-ausearch-path.patch | 63 +++++++++++++++++++ package/selinux-python/selinux-python.hash | 4 +- package/selinux-python/selinux-python.mk | 4 +- 3 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 package/selinux-python/0001-python-sepolgen-fix-ausearch-path.patch diff --git a/package/selinux-python/0001-python-sepolgen-fix-ausearch-path.patch b/package/selinux-python/0001-python-sepolgen-fix-ausearch-path.patch new file mode 100644 index 000000000000..31c5013d69c2 --- /dev/null +++ b/package/selinux-python/0001-python-sepolgen-fix-ausearch-path.patch @@ -0,0 +1,63 @@ +From 8610efc1610a4e9d4cbfa19ed4a519a6425aee70 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Tue, 9 May 2023 22:28:36 +0200 +Subject: [PATCH] python?sepolgen: fix ausearch path + +ausearch is not always isntalled in /sbin; some systems install it in +/usr/sbin, or it can also be locally installed in /usr/local/sbin. + +The python doc [0] suggests using shutil.which() to find the path where +a command is. which() returns None if the command is not found. If +ausearch is not found, that would result in an exception being raised by +Popen(): + TypeError: expected str, bytes or os.PathLike object, not NoneType + +This is not very informative of what actually failed... + +However, the doc suggests so for portability. In our case, the python +tools are only ever going to run on a Linux host (by their virtue of +dealing with SELinux), so the search will be reliably done by looking in +PATH, so we can let Popen() bubble the resolving of an unqualified +command, down to execvpe() (or the similar actual syscall of the exec*() +familly). If ausearch is then not found, Popen() raises an exception +that is wy more informative then: + FileNotFoundError: [Errno 2] No such file or directory: 'ausearch' + +[0] https://docs.python.org/3/library/subprocess.html#subprocess.Popen + +Signed-off-by: Adam Duskett +[yann.morin.1998@free.fr: + - let Popen() resolve from PATH + - rewrite commit log +] +Signed-off-by: Yann E. MORIN +Upstream: not submitted +--- + python/sepolgen/src/sepolgen/audit.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/python/sepolgen/src/sepolgen/audit.py b/python/sepolgen/src/sepolgen/audit.py +index 4adb851f..5eafa587 100644 +--- a/sepolgen/src/sepolgen/audit.py ++++ b/sepolgen/src/sepolgen/audit.py +@@ -41,7 +41,7 @@ def get_audit_boot_msgs(): + s = time.localtime(time.time() - off) + bootdate = time.strftime("%x", s) + boottime = time.strftime("%X", s) +- output = subprocess.Popen(["/sbin/ausearch", "-m", "AVC,USER_AVC,MAC_POLICY_LOAD,DAEMON_START,SELINUX_ERR", "-ts", bootdate, boottime], ++ output = subprocess.Popen(["ausearch", "-m", "AVC,USER_AVC,MAC_POLICY_LOAD,DAEMON_START,SELINUX_ERR", "-ts", bootdate, boottime], + stdout=subprocess.PIPE).communicate()[0] + if util.PY3: + output = util.decode_input(output) +@@ -56,7 +56,7 @@ def get_audit_msgs(): + string contain all of the audit messages returned by ausearch. + """ + import subprocess +- output = subprocess.Popen(["/sbin/ausearch", "-m", "AVC,USER_AVC,MAC_POLICY_LOAD,DAEMON_START,SELINUX_ERR"], ++ output = subprocess.Popen(["ausearch", "-m", "AVC,USER_AVC,MAC_POLICY_LOAD,DAEMON_START,SELINUX_ERR"], + stdout=subprocess.PIPE).communicate()[0] + if util.PY3: + output = util.decode_input(output) +-- +2.25.1 + diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 6ada3fee363e..3592540703bc 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 8ad91061300387996ccb474962fb93dde263d924aa8f740618be16b22e2444ec selinux-python-3.3.tar.gz +sha256 8245bb4dae59333461f19ca0c79a829081f07972fa5e3ad4c2b2b917dd71d96b selinux-python-3.5.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 0cec602f3ddf..7505474aa461 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,10 +4,10 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 3.3 +SELINUX_PYTHON_VERSION = 3.5 SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) SELINUX_PYTHON_LICENSE = GPL-2.0 -SELINUX_PYTHON_LICENSE_FILES = COPYING +SELINUX_PYTHON_LICENSE_FILES = LICENSE SELINUX_PYTHON_DEPENDENCIES = python3 SELINUX_PYTHON_MAKE_OPTS += \ From 7d4f1fda8f8a5dc8b136367af73ecb0b97b84279 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:53 -0700 Subject: [PATCH 0505/2890] package/setools: bump to version 4.4.2 In addition: - Refresh 0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch - Update COPYING hash as the license file has been rewritten for clarity. However, the licenses have not been changed. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- ...e-setools.InfoFlowAnalysis-and-setoo.patch | 50 +++++++++---------- package/setools/setools.hash | 4 +- package/setools/setools.mk | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch b/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch index 3c3ae97dff89..36063a4e13e7 100644 --- a/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch +++ b/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch @@ -15,22 +15,22 @@ sedta and seinfoflow to require python3-networkx Signed-off-by: Antoine Tenart [Refreshed for 4.3.0] Signed-off-by: Adam Duskett -[Refreshed for 4.4.0] +[Refreshed for 4.4.2] --- sedta | 3 ++- seinfoflow | 5 +++-- setools/__init__.py | 4 ++-- setoolsgui/apol/dta.py | 2 +- setoolsgui/apol/infoflow.py | 2 +- - tests/dta.py | 2 +- - tests/infoflow.py | 2 +- + tests/test_dta.py | 2 +- + tests/test_infoflow.py | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sedta b/sedta -index 60861ca630a5..0056172a55e5 100755 +index ffd9ede..4c53825 100755 --- a/sedta +++ b/sedta -@@ -23,6 +23,7 @@ import logging +@@ -10,6 +10,7 @@ import logging import signal import setools @@ -38,7 +38,7 @@ index 60861ca630a5..0056172a55e5 100755 def print_transition(trans: setools.DomainTransition) -> None: -@@ -114,7 +115,7 @@ else: +@@ -104,7 +105,7 @@ else: try: p = setools.SELinuxPolicy(args.policy) @@ -48,10 +48,10 @@ index 60861ca630a5..0056172a55e5 100755 if args.shortest_path or args.all_paths: if args.shortest_path: diff --git a/seinfoflow b/seinfoflow -index f10c39de4d8e..fe733bbd0787 100755 +index 5f4e764..a27b781 100755 --- a/seinfoflow +++ b/seinfoflow -@@ -18,6 +18,7 @@ +@@ -5,6 +5,7 @@ # import setools @@ -59,7 +59,7 @@ index f10c39de4d8e..fe733bbd0787 100755 import argparse import sys import logging -@@ -102,8 +103,8 @@ elif args.booleans is not None: +@@ -91,8 +92,8 @@ elif args.booleans is not None: try: p = setools.SELinuxPolicy(args.policy) m = setools.PermissionMap(args.map) @@ -71,10 +71,10 @@ index f10c39de4d8e..fe733bbd0787 100755 if args.shortest_path or args.all_paths: if args.shortest_path: diff --git a/setools/__init__.py b/setools/__init__.py -index d72d343..4d5aaaa 100644 +index ad9b36a..2bde01b 100644 --- a/setools/__init__.py +++ b/setools/__init__.py -@@ -91,11 +91,11 @@ from .pcideviceconquery import PcideviceconQuery +@@ -77,11 +77,11 @@ from .pcideviceconquery import PcideviceconQuery from .devicetreeconquery import DevicetreeconQuery # Information Flow Analysis @@ -89,10 +89,10 @@ index d72d343..4d5aaaa 100644 # Policy difference from .diff import PolicyDifference diff --git a/setoolsgui/apol/dta.py b/setoolsgui/apol/dta.py -index 4608b9dbf34e..2cde44c142e9 100644 +index a78d960..e71c70a 100644 --- a/setoolsgui/apol/dta.py +++ b/setoolsgui/apol/dta.py -@@ -24,7 +24,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread +@@ -11,7 +11,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread from PyQt5.QtGui import QPalette, QTextCursor from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \ QTreeWidgetItem @@ -102,10 +102,10 @@ index 4608b9dbf34e..2cde44c142e9 100644 from ..logtosignal import LogHandlerToSignal from .analysistab import AnalysisSection, AnalysisTab diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py -index 7bca299d23fc..7fee2778f35f 100644 +index fb9b409..738f1b8 100644 --- a/setoolsgui/apol/infoflow.py +++ b/setoolsgui/apol/infoflow.py -@@ -26,7 +26,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread +@@ -13,7 +13,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread from PyQt5.QtGui import QPalette, QTextCursor from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \ QTreeWidgetItem @@ -114,11 +114,11 @@ index 7bca299d23fc..7fee2778f35f 100644 from setools.exception import UnmappedClass, UnmappedPermission from ..logtosignal import LogHandlerToSignal -diff --git a/tests/dta.py b/tests/dta.py -index a0cc9381469c..177e6fb0b961 100644 ---- a/tests/dta.py -+++ b/tests/dta.py -@@ -18,7 +18,7 @@ +diff --git a/tests/test_dta.py b/tests/test_dta.py +index 7f9bbc9..48338c5 100644 +--- a/tests/test_dta.py ++++ b/tests/test_dta.py +@@ -5,7 +5,7 @@ import os import unittest @@ -127,11 +127,11 @@ index a0cc9381469c..177e6fb0b961 100644 from setools import TERuletype as TERT from setools.exception import InvalidType from setools.policyrep import Type -diff --git a/tests/infoflow.py b/tests/infoflow.py -index aa0e44a7e4f8..fca2848aeca5 100644 ---- a/tests/infoflow.py -+++ b/tests/infoflow.py -@@ -18,7 +18,7 @@ +diff --git a/tests/test_infoflow.py b/tests/test_infoflow.py +index 5a8f745..e25993b 100644 +--- a/tests/test_infoflow.py ++++ b/tests/test_infoflow.py +@@ -5,7 +5,7 @@ import os import unittest diff --git a/package/setools/setools.hash b/package/setools/setools.hash index fdb0919f1173..c353e1f60901 100644 --- a/package/setools/setools.hash +++ b/package/setools/setools.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 202eac5f857475937bee8136cff278aa2b4a4b94a0dec63fbbbe18c9eb644a4e setools-4.4.0.tar.gz -sha256 2f7547e10f76a382c24c053595f38a5cc6dda9347f508f254ca490e0046a9624 COPYING +sha256 998d12d01852feed1889110a4ca81090a47a2d9b47368e4dfe2b94d68696c813 setools-4.4.2.tar.gz +sha256 0e58d74751e394f39748c7b7b4039d6a883b5def9711160668ba962b52e69e01 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/setools/setools.mk b/package/setools/setools.mk index ea355f10c8d7..b80d25a6b9fa 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SETOOLS_VERSION = 4.4.0 +SETOOLS_VERSION = 4.4.2 SETOOLS_SITE = $(call github,SELinuxProject,setools,$(SETOOLS_VERSION)) SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-python-cython host-swig SETOOLS_INSTALL_STAGING = YES From 6d1af313c3415e8bfb1bff6642d005ca51575dbb Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 25 Apr 2023 10:14:54 -0700 Subject: [PATCH 0506/2890] package/refpolicy: bump to version 2.20221101 Add an upstream patch in package/refpolicy/2.20221101 that makes dbus optional for the mount interface. The patch must go in the 2.20221101 directory or else the build system will automatically attempt to apply the patch to a custom git version of refpolicy if chosen. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- ...ount-dbus-interface-must-be-optional.patch | 33 +++++++++++++++++++ package/refpolicy/refpolicy.hash | 2 +- package/refpolicy/refpolicy.mk | 2 +- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 package/refpolicy/2.20221101/0001-mount-dbus-interface-must-be-optional.patch diff --git a/package/refpolicy/2.20221101/0001-mount-dbus-interface-must-be-optional.patch b/package/refpolicy/2.20221101/0001-mount-dbus-interface-must-be-optional.patch new file mode 100644 index 000000000000..adec7d98d0a3 --- /dev/null +++ b/package/refpolicy/2.20221101/0001-mount-dbus-interface-must-be-optional.patch @@ -0,0 +1,33 @@ +From 6c6be65ccf0891391681d4662cc11f508c0f4aeb Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Mon, 24 Apr 2023 14:24:49 -0700 +Subject: [PATCH] mount: dbus interface must be optional + +If DBus isn't built, the build process fails due to mount.te always using a +dbus interface even if the dbus module. Fix this by setting the dbus interface +as optional. + +Signed-off-by: Adam Duskett +Upstream: https://github.com/SELinuxProject/refpolicy/commit/207b09a656c2c3ac5c286d3f7eef085325e35408 +--- + policy/modules/system/mount.te | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/policy/modules/system/mount.te b/policy/modules/system/mount.te +index d028723..af84af0 100644 +--- a/policy/modules/system/mount.te ++++ b/policy/modules/system/mount.te +@@ -145,7 +145,9 @@ selinux_getattr_fs(mount_t) + + userdom_use_all_users_fds(mount_t) + +-dbus_dontaudit_write_system_bus_runtime_named_sockets(mount_t) ++optional_policy(` ++ dbus_dontaudit_write_system_bus_runtime_named_sockets(mount_t) ++') + + ifdef(`distro_redhat',` + optional_policy(` +-- +2.40.0 + diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash index b08c22ed4e5f..a09e59c27016 100644 --- a/package/refpolicy/refpolicy.hash +++ b/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ # From https://github.com/SELinuxProject/refpolicy/releases -sha256 965f98f0b68a24fd0b8e8d973d319332aea88973e1d6c455ef9c2a31aefaeaa6 refpolicy-2.20220106.tar.bz2 +sha256 44f88e62c8efcef54d019b9ca077520d5993de580926bd7575788cfa78515396 refpolicy-2.20221101.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index f11b72755aec..8fea7cc25419 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -23,7 +23,7 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) REFPOLICY_SITE_METHOD = git BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) else -REFPOLICY_VERSION = 2.20220106 +REFPOLICY_VERSION = 2.20221101 REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_$(subst .,_,$(REFPOLICY_VERSION)) endif From 70b37018400fe5d2c0efc19c34958220e965f689 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 9 May 2023 22:38:47 +0200 Subject: [PATCH 0507/2890] Update for 2023.02.1 Signed-off-by: Peter Korsgaard (cherry picked from commit 8025cfad1055ad23a5935b7a69580ebc2b003e1e) [Peter: drop Makefile hunk] Signed-off-by: Peter Korsgaard --- CHANGES | 36 ++++++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index c4bf9d0ad948..81533552a79e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,39 @@ +2023.02.1, released May 9th, 2023 + + Important / security related fixes. + + Infrastucture: + - go: Ensure go versions of os/user and net are used for + static builds so CGO is not used + + - rust / cargo: Correctly split up rust flags for host and + target builds + + Defconfigs: Olimex a20 olinuxino lime*: Bring up network at + boot, stmf469 disco sd: Lock U-Boot version + + Updated/fixed packages: agentpp, apache, bluez5_utils, + ca-certificates, containerd, coremark, dcron, dnsmasq, + docker-cli, docker-engine, efivar, eudev, ffmpeg, flann, + fluidsynth, git, go, gst-omx, gst1-devtools, gst1-libav, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, + gstreamer1, gstreamer1-editing-services, intel-microcode, + kexec, libcurl, libite, libgtk3, libmicrohttpd, libxml2, + linux-tools, lua, mali-driver, matio, mdadm, nginx, openocd, + openssh, php, poppler, postgresql, python-web2py, qt6base, + readline, rtl8189fs, rtl8723ds, rtl8812au-aircrack-ng, runc, + rust, rust-bin, s390-tools, samba4, sdl2, snmppp, sudo, + systemd, tcpdump, uclibc, vim, webkitgtk, wireshark, + wpewebkit, xr819-radio, xserver_xorg-server, zeek + + Issues resolved (http://bugs.uclibc.org): + + #14356: cronstamp jobs are not performed with bumped version of... + #15306: glibc build fails in Docker container + #15376: Libiconv config + #15461: QtVirtualKeyboard segfaults + 2023.02, released March 12th, 2023 Fixes all over the tree. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index a1de1707495a..d1b75ed405d2 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.02' +RELEASE='2023.02.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From 19f5a10f49c35cd392eea623102b2d280d7d2d9a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 10 May 2023 22:34:29 +0200 Subject: [PATCH 0508/2890] docs/website: update for 2023.02.1 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 5afc507c5249..3cf415de0e6f 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
        Download
        -

        Latest stable / long term support release: 2023.02

        +

        Latest stable / long term support release: 2023.02.1

        - +
        - +
        -

        buildroot-2023.02.tar.gz

        -

        PGP signature

        +

        buildroot-2023.02.1.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2023.02.tar.xz

        -

        PGP signature

        +

        buildroot-2023.02.1.tar.xz

        +

        PGP signature

        +

        Latest release candidate: 2023.05-rc1

        - +
        - +
        -

        buildroot-2023.02-rc3.tar.gz

        -

        PGP signature

        +

        buildroot-2023.05-rc1.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2023.02-rc3.tar.xz

        -

        PGP signature

        +

        buildroot-2023.05-rc1.tar.xz

        +

        PGP signature

        ---> + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
        diff --git a/docs/website/news.html b/docs/website/news.html index a47514735c84..92dd469f510c 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

        News

          +
        • +
          +
          +
          +

          2023.05-rc1 released

          +

          15 May 2023

          +
          +
          +

          We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

          + +

          Go to the downloads page to pick up the + 2023.05-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

          +
          +
          +
          • +
        • From 4f4fb695a47cb50a0645a68aa03e27bdb3d73afe Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Mon, 15 May 2023 09:35:02 +0200 Subject: [PATCH 0587/2890] package/sdl2_mixer: fix license hash b1b8d5b ("package/sdl2_mixer: bump version to 2.6.3") forgot to update the hash of the license file. In 2021 the file was renamed from COPYING.txt to LICENSE.txt in two commits ([0] and [1]). The copyright year was subsequently updated for 2022 [2] and 2023 [3]. License is still Zlib - no changes there. [0]: https://github.com/libsdl-org/SDL_mixer/commit/0f84f242643a913ba81bd6c260c39064c432afd3 [1]: https://github.com/libsdl-org/SDL_mixer/commit/371bf1575913828c46212e9220d4a4685ed66bb5 [2]: https://github.com/libsdl-org/SDL_mixer/commit/3f5a0502e0394aa967179d53e180f31cf038e032 [3]: https://github.com/libsdl-org/SDL_mixer/commit/6fdd4d469b4065ddfb701530d2ea602efaa772b2 Fixes: - http://autobuild.buildroot.net/results/302cbd0adc2c6190d8923b9449e26a3c519d2326 Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- package/sdl2_mixer/sdl2_mixer.hash | 2 +- package/sdl2_mixer/sdl2_mixer.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sdl2_mixer/sdl2_mixer.hash b/package/sdl2_mixer/sdl2_mixer.hash index 98c5fda6af50..4592014d7f30 100644 --- a/package/sdl2_mixer/sdl2_mixer.hash +++ b/package/sdl2_mixer/sdl2_mixer.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 7a6ba86a478648ce617e3a5e9277181bc67f7ce9876605eea6affd4a0d6eea8f SDL2_mixer-2.6.3.tar.gz -sha256 113727180e7956cb9718b03b41da85b63ea54743a33047071a623bf672895a10 COPYING.txt +sha256 1852c8549e3d154687197d46abababd3e8faae035f19991b2ca850fa3a43ad57 LICENSE.txt diff --git a/package/sdl2_mixer/sdl2_mixer.mk b/package/sdl2_mixer/sdl2_mixer.mk index 425380bf5dd5..074e28220549 100644 --- a/package/sdl2_mixer/sdl2_mixer.mk +++ b/package/sdl2_mixer/sdl2_mixer.mk @@ -8,7 +8,7 @@ SDL2_MIXER_VERSION = 2.6.3 SDL2_MIXER_SOURCE = SDL2_mixer-$(SDL2_MIXER_VERSION).tar.gz SDL2_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release SDL2_MIXER_LICENSE = Zlib -SDL2_MIXER_LICENSE_FILES = COPYING.txt +SDL2_MIXER_LICENSE_FILES = LICENSE.txt SDL2_MIXER_INSTALL_STAGING = YES SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf From 7e655f81d43c0776567c1fc6d3815cc3b63e93a0 Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Mon, 15 May 2023 08:59:14 +0900 Subject: [PATCH 0588/2890] DEVELOPERS: Update email address for Damien Le Moal Change my email address to dlemoal@kernel.org. Signed-off-by: Damien Le Moal Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index fef008f84b74..e76717e84530 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -662,7 +662,7 @@ N: Damien Lanson F: package/libvdpau/ F: package/log4cpp/ -N: Damien Le Moal +N: Damien Le Moal F: package/python-kflash/ F: board/canaan/ F: configs/canaan_kd233_defconfig From 9a560d6affaff0923e829ec0c608e7d1fdacaf70 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 15 May 2023 21:51:57 +0200 Subject: [PATCH 0589/2890] package/clamav: fix build on mips64el Fixes: http://autobuild.buildroot.net/results/b64/b640937f35b11ddb9f1e29f0e44040eda8850f26/ 'Could not find specification for target "mips64el-unknown-linux-gnu".' This patch changes -DRUST_COMPILER_TARGET=mips64el-unknown-linux-gnu to -DRUST_COMPILER_TARGET=mips64el-unknown-linux-gnuabi64 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/clamav/clamav.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 977b6010b34a..68a1799bfc97 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -54,7 +54,7 @@ CLAMAV_CONF_OPTS = \ -DENABLE_MILTER=OFF \ -DENABLE_TESTS=OFF \ -DHAVE_SYSTEM_LFS_FTS=ON \ - -DRUST_COMPILER_TARGET=$(ARCH)-unknown-$(TARGET_OS)-$(LIBC)$(ABI) \ + -DRUST_COMPILER_TARGET=$(RUSTC_TARGET_NAME) \ -Dtest_run_result=ON \ -Dtest_run_result__TRYRUN_OUTPUT=ON From 3ec773ba91acc4673a39afebbb904c800a534ebf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 16 May 2023 08:40:34 +0200 Subject: [PATCH 0590/2890] package/libssh: security bump to version 0.10.5 Fixes the following security issues: - CVE-2023-1667: Potential NULL dereference during rekeying with algorithm guessing https://www.libssh.org/security/advisories/CVE-2023-1667.txt - CVE-2023-2283: Authorization bypass in pki_verify_data_signature https://www.libssh.org/security/advisories/CVE-2023-2283.txt Signed-off-by: Peter Korsgaard --- package/libssh/libssh.hash | 4 ++-- package/libssh/libssh.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash index 90bc4c82d86e..0d6119184218 100644 --- a/package/libssh/libssh.hash +++ b/package/libssh/libssh.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.libssh.org/files/0.10/libssh-0.10.4.tar.xz.asc +# https://www.libssh.org/files/0.10/libssh-0.10.5.tar.xz.asc # with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D -sha256 07392c54ab61476288d1c1f0a7c557b50211797ad00c34c3af2bbc4dbc4bd97d libssh-0.10.4.tar.xz +sha256 b60e2ff7f367b9eee2b5634d3a63303ddfede0e6a18dfca88c44a8770e7e4234 libssh-0.10.5.tar.xz sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 5deb64b82e41..3be6c6adaf31 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSSH_VERSION_MAJOR = 0.10 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).4 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).5 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 From fd5afab7b643997e89e1804de686a3935f8dd724 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 16 May 2023 10:01:17 +0200 Subject: [PATCH 0591/2890] package/webkitgtk: fix GCC version in comment Commit 4c7fcbbe75de5c535e8d5dd7182900b6d09e2b03 should have set it to GCC 8. Signed-off-by: Thomas Devoogdt Reviewed-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 976341093e53..23c0bf41db84 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -21,7 +21,7 @@ comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU From e4ac14e09a57667168278187331cdf7238b80324 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 16 May 2023 06:15:00 +0100 Subject: [PATCH 0592/2890] package/bootgen: bump to xilinx_v2023.1 This patch bumps bootgen to version xilinx_v2023.1. The patch for build machines with modern flex is no longer needed. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...x-build-on-machines-with-modern-flex.patch | 133 ------------------ package/bootgen/bootgen.hash | 2 +- package/bootgen/bootgen.mk | 2 +- 4 files changed, 2 insertions(+), 136 deletions(-) delete mode 100644 package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch diff --git a/.checkpackageignore b/.checkpackageignore index 13f67695f517..81cf1afe6be3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -242,7 +242,6 @@ package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch Upstre package/bmx7/0002-Fix-linking-error.patch Upstream package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch Upstream package/boinc/S99boinc-client Indent Shellcheck Variables -package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch Upstream package/botan/0001-Add-superh-alias-needed-by-Debian.patch Upstream package/botan/0002-src-build-data-arch-superh.txt-add-sh4-eb-aeb.patch Upstream package/brickd/S70brickd Indent Shellcheck Variables diff --git a/package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch b/package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch deleted file mode 100644 index ea82f5e70cd9..000000000000 --- a/package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 7251dce3dc974c7372e7024ade3e8a455266cfd2 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Fri, 18 Mar 2022 09:02:31 +0100 -Subject: [PATCH] Fix build on machines with modern flex - -Bootgen embeds an old version of flex, but uses the system include syntax -(#include <>) to reference it, causing conflicts on systems with the -development headers for a modern flex version installed, leading to build -issues like: - -../bisonflex/bif.yy.cpp: In member function 'virtual int BIF::FlexScanner::yylex()': -../bisonflex/bif.yy.cpp:1608:18: error: no match for 'operator=' (operand types are 'std::istream' {aka 'std::basic_istream'} and 'std::istream*' {aka 'std::basic_istream*'}) - -Fix it by using normal local #include statements by: - -sed -i 's//"FlexLexer.h"/g' * - -Signed-off-by: Peter Korsgaard -[Submitted upstream: https://github.com/Xilinx/bootgen/pull/20] ---- - FlexLexer.h | 6 +++--- - bif.yy.cpp | 2 +- - bifscanner.h | 2 +- - cmdoptions.yy.cpp | 2 +- - cmdoptionsscanner.h | 2 +- - reginit.yy.cpp | 2 +- - reginitscanner.h | 2 +- - 7 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/FlexLexer.h b/FlexLexer.h -index b115b5d..1c0386f 100755 ---- a/FlexLexer.h -+++ b/FlexLexer.h -@@ -33,15 +33,15 @@ - // - // If you want to create multiple lexer classes, you use the -P flag - // to rename each yyFlexLexer to some other xxFlexLexer. You then --// include in your other sources once per lexer class: -+// include "FlexLexer.h" in your other sources once per lexer class: - // - // #undef yyFlexLexer - // #define yyFlexLexer xxFlexLexer --// #include -+// #include "FlexLexer.h" - // - // #undef yyFlexLexer - // #define yyFlexLexer zzFlexLexer --// #include -+// #include "FlexLexer.h" - // ... - - #ifndef __FLEX_LEXER_H -diff --git a/bif.yy.cpp b/bif.yy.cpp -index 7dd0841..9e09267 100644 ---- a/bif.yy.cpp -+++ b/bif.yy.cpp -@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; - - #define yytext_ptr yytext - --#include -+#include "FlexLexer.h" - - int yyFlexLexer::yywrap() { return 1; } - int yyFlexLexer::yylex() -diff --git a/bifscanner.h b/bifscanner.h -index a6ec9e4..ded78da 100755 ---- a/bifscanner.h -+++ b/bifscanner.h -@@ -28,7 +28,7 @@ - #if ! defined(yyFlexLexerOnce) - #undef yyFlexLexer - #define yyFlexLexer bifFlexLexer --#include -+#include "FlexLexer.h" - #endif - - // Override the interface for yylex since we namespaced it -diff --git a/cmdoptions.yy.cpp b/cmdoptions.yy.cpp -index 6ee80de..1acfcce 100644 ---- a/cmdoptions.yy.cpp -+++ b/cmdoptions.yy.cpp -@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; - - #define yytext_ptr yytext - --#include -+#include "FlexLexer.h" - - int yyFlexLexer::yywrap() { return 1; } - int yyFlexLexer::yylex() -diff --git a/cmdoptionsscanner.h b/cmdoptionsscanner.h -index a48af09..e02c1f1 100755 ---- a/cmdoptionsscanner.h -+++ b/cmdoptionsscanner.h -@@ -29,7 +29,7 @@ - - #undef yyFlexLexer - #define yyFlexLexer reginitFlexLexer --#include -+#include "FlexLexer.h" - #endif - - // Override the interface for yylex since we namespaced it -diff --git a/reginit.yy.cpp b/reginit.yy.cpp -index 8422867..ff088f9 100644 ---- a/reginit.yy.cpp -+++ b/reginit.yy.cpp -@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; - - #define yytext_ptr yytext - --#include -+#include "FlexLexer.h" - - int yyFlexLexer::yywrap() { return 1; } - int yyFlexLexer::yylex() -diff --git a/reginitscanner.h b/reginitscanner.h -index 4e78af9..23177be 100755 ---- a/reginitscanner.h -+++ b/reginitscanner.h -@@ -29,7 +29,7 @@ - - #undef yyFlexLexer - #define yyFlexLexer reginitFlexLexer --#include -+#include "FlexLexer.h" - #endif - - // Override the interface for yylex since we namespaced it --- -2.30.2 - diff --git a/package/bootgen/bootgen.hash b/package/bootgen/bootgen.hash index 5d77c164f3ec..937509c85986 100644 --- a/package/bootgen/bootgen.hash +++ b/package/bootgen/bootgen.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7e07c75aa3e3965c8e33faefde037877f78130451cebc2056b096db9c66acbb3 bootgen-xilinx_v2022.2.tar.gz +sha256 2fda35fac28f5753cfdd9c6d5c07fd2b018d55984681af79415a67ba5372ea8e bootgen-xilinx_v2023.1.tar.gz sha256 4da5f5eff0592e5d275f1871faf9e9a4fc0f6346027bfb777fa59d0aa6a59aa3 LICENSE diff --git a/package/bootgen/bootgen.mk b/package/bootgen/bootgen.mk index 88bc73b604f1..d83980d9257b 100644 --- a/package/bootgen/bootgen.mk +++ b/package/bootgen/bootgen.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOTGEN_VERSION = xilinx_v2022.2 +BOOTGEN_VERSION = xilinx_v2023.1 BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION)) HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf BOOTGEN_LICENSE = Apache-2.0 From fee9f199eea432c47c669ea61ef64f06d6592fd6 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 16 May 2023 06:40:51 +0100 Subject: [PATCH 0593/2890] configs/zynq_zc706_defconfig: bump to xilinx-v2023.1 This patch bumps the zynq_zc706_defconfig to xilinx-v2023.1 which includes the following updates: - Linux v6.1.5 - U-Boot v2023.01 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynq_zc706_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 3ad8cbafe39c..55e4d8ea2353 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -2,12 +2,12 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -19,11 +19,12 @@ BR2_TARGET_ROOTFS_EXT2_4=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_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc706" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" From c489bc3c289fc098f62d3333ee1118126aa78c1f Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 16 May 2023 06:40:52 +0100 Subject: [PATCH 0594/2890] configs/zynq_microzed_defconfig: bump to xilinx-v2023.1 This patch bumps the zynq_microzed_defconfig to xilinx-v2023.1 which includes the following updates: - Linux v6.1.5 - U-Boot v2023.01 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynq_microzed_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 459a3a40bc07..346738f665d8 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -2,12 +2,12 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -19,11 +19,12 @@ BR2_TARGET_ROOTFS_EXT2_4=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_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-microzed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" From a6599bc75384b4cd1052940297ba07d58346c97f Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 16 May 2023 06:40:53 +0100 Subject: [PATCH 0595/2890] configs/zynq_zed_defconfig: bump to xilinx-v2023.1 This patch bumps the zynq_zed_defconfig to xilinx-v2023.1 which includes the following updates: - Linux v6.1.5 - U-Boot v2023.01 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynq_zed_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index a39911b757bb..dc167e3bc176 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -2,12 +2,12 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -19,11 +19,12 @@ BR2_TARGET_ROOTFS_EXT2_4=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_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" From 603df32a0cd416caa2d2688008cb87f14ad68ef3 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 14 May 2023 16:45:12 +0200 Subject: [PATCH 0596/2890] package/lua: bump to version 5.4.6 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- .checkpackageignore | 6 +++--- package/lua/5.4.5/lua.hash | 5 ----- package/lua/{5.4.5 => 5.4.6}/0001-root-path.patch | 0 package/lua/{5.4.5 => 5.4.6}/0002-shared-libs-for-lua.patch | 0 package/lua/{5.4.5 => 5.4.6}/0011-linenoise.patch | 0 package/lua/5.4.6/lua.hash | 5 +++++ package/lua/lua.mk | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 package/lua/5.4.5/lua.hash rename package/lua/{5.4.5 => 5.4.6}/0001-root-path.patch (100%) rename package/lua/{5.4.5 => 5.4.6}/0002-shared-libs-for-lua.patch (100%) rename package/lua/{5.4.5 => 5.4.6}/0011-linenoise.patch (100%) create mode 100644 package/lua/5.4.6/lua.hash diff --git a/.checkpackageignore b/.checkpackageignore index 13f67695f517..947f4606aae7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -949,9 +949,9 @@ package/lua/5.1.5/0012-fix-reader-at-eoz.patch Upstream package/lua/5.3.6/0001-root-path.patch Upstream package/lua/5.3.6/0002-shared-libs-for-lua.patch Upstream package/lua/5.3.6/0003-linenoise.patch Upstream -package/lua/5.4.5/0001-root-path.patch Upstream -package/lua/5.4.5/0002-shared-libs-for-lua.patch Upstream -package/lua/5.4.5/0011-linenoise.patch Upstream +package/lua/5.4.6/0001-root-path.patch Upstream +package/lua/5.4.6/0002-shared-libs-for-lua.patch Upstream +package/lua/5.4.6/0011-linenoise.patch Upstream package/luajit/0001-no-bin-symlink.patch Upstream package/luajit/0002-install-inc.patch Upstream package/luasyslog/0001-remove-AX_LUA_LIBS.patch Upstream diff --git a/package/lua/5.4.5/lua.hash b/package/lua/5.4.5/lua.hash deleted file mode 100644 index 5526cd51255f..000000000000 --- a/package/lua/5.4.5/lua.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hashes from: https://www.lua.org/ftp/ -sha256 59df426a3d50ea535a460a452315c4c0d4e1121ba72ff0bdde58c2ef31d6f444 lua-5.4.5.tar.gz - -# Locally computed -sha256 0d4ee721cf740f9cd878ef82ef75f4f2724dcf0403e56cd0b5643ad88f9de337 doc/readme.html diff --git a/package/lua/5.4.5/0001-root-path.patch b/package/lua/5.4.6/0001-root-path.patch similarity index 100% rename from package/lua/5.4.5/0001-root-path.patch rename to package/lua/5.4.6/0001-root-path.patch diff --git a/package/lua/5.4.5/0002-shared-libs-for-lua.patch b/package/lua/5.4.6/0002-shared-libs-for-lua.patch similarity index 100% rename from package/lua/5.4.5/0002-shared-libs-for-lua.patch rename to package/lua/5.4.6/0002-shared-libs-for-lua.patch diff --git a/package/lua/5.4.5/0011-linenoise.patch b/package/lua/5.4.6/0011-linenoise.patch similarity index 100% rename from package/lua/5.4.5/0011-linenoise.patch rename to package/lua/5.4.6/0011-linenoise.patch diff --git a/package/lua/5.4.6/lua.hash b/package/lua/5.4.6/lua.hash new file mode 100644 index 000000000000..0b03fd563c6b --- /dev/null +++ b/package/lua/5.4.6/lua.hash @@ -0,0 +1,5 @@ +# Hashes from: https://www.lua.org/ftp/ +sha256 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 lua-5.4.6.tar.gz + +# Locally computed +sha256 8f1bff27c5b0585ab679dbe4e37e75a1014af0f79732f42a79f86728321a0c6d doc/readme.html diff --git a/package/lua/lua.mk b/package/lua/lua.mk index ecb86c11ed37..93d4803812a8 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_4),y) -LUA_VERSION = 5.4.5 +LUA_VERSION = 5.4.6 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else From 1e0e8540eb221aa4946274ee8e63dac32c8d4637 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sat, 20 May 2023 13:58:44 -0400 Subject: [PATCH 0597/2890] package/libpqxx: needs C++17 libpqxx's v7.x series requires C++17 support. Adjust the configuration selection to require a newer toolchain, as well as force a C++17 standard to ensure libpqxx's custom C++ standard check [1] passes. Fixes: - http://autobuild.buildroot.net/results/a79cb93aec74acc8e32809530c09e26bebaf16e4/ - http://autobuild.buildroot.net/results/ae1a02b5238b650cdc79edb298c398b078882cfc/ [1]: https://github.com/jtv/libpqxx/blob/7.7.5/configure.ac#L106-L124 Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/libpqxx/Config.in | 6 +++--- package/libpqxx/libpqxx.mk | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libpqxx/Config.in b/package/libpqxx/Config.in index d06451d7928e..f5fe2b38079f 100644 --- a/package/libpqxx/Config.in +++ b/package/libpqxx/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBPQXX bool "libpqxx" depends on BR2_PACKAGE_POSTGRESQL depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_INSTALL_LIBSTDCPP help libpqxx is the official C++ client API for PostgreSQL, the @@ -10,8 +10,8 @@ config BR2_PACKAGE_LIBPQXX http://pqxx.org/development/libpqxx/ -comment "libpqxx needs toolchain w/ C++, gcc >= 4.9, threads" +comment "libpqxx needs toolchain w/ C++, gcc >= 7, threads" depends on BR2_PACKAGE_POSTGRESQL depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libpqxx/libpqxx.mk b/package/libpqxx/libpqxx.mk index b280f5a52a15..434cefd06950 100644 --- a/package/libpqxx/libpqxx.mk +++ b/package/libpqxx/libpqxx.mk @@ -11,6 +11,8 @@ LIBPQXX_DEPENDENCIES = postgresql LIBPQXX_LICENSE = BSD-3-Clause LIBPQXX_LICENSE_FILES = COPYING -LIBPQXX_CONF_ENV += ac_cv_path_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config +LIBPQXX_CONF_ENV = \ + ac_cv_path_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config \ + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++17" $(eval $(autotools-package)) From 4944ff2878733f4f6f837ee0d417423420c663ce Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 29 Apr 2023 01:06:18 +0200 Subject: [PATCH 0598/2890] support/config-fragments/autobuild/br-arm-internal-glibc: update to bleeding edge components The br-arm-internal-glibc.config used to be generally used as a configuration to test the bleeding edge versions of components. However, it has been lagging behind somewhat and produce invalid configuration since binutils 2.36 removal in d08639e6b9e5... so let's bring it up-to-date: - Binutils 2.39.x - GCC 12.x Since Buildroot 2022.02, the autobuilders doesn't use the csv file anymore but the test-pkg script still use it. Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .../config-fragments/autobuild/br-arm-internal-glibc.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/config-fragments/autobuild/br-arm-internal-glibc.config b/support/config-fragments/autobuild/br-arm-internal-glibc.config index fb930cbef7cc..cd148f32e63b 100644 --- a/support/config-fragments/autobuild/br-arm-internal-glibc.config +++ b/support/config-fragments/autobuild/br-arm-internal-glibc.config @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a8=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_BINUTILS_VERSION_2_36_X=y -BR2_GCC_VERSION_11_X=y +BR2_BINUTILS_VERSION_2_39_X=y +BR2_GCC_VERSION_12_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y From 62b64c56b8714e159d9f4812fb05e6442d2837f2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 18 May 2023 23:30:53 +0200 Subject: [PATCH 0599/2890] package/mesa3d: fix glxinfo crash when gles1 is disabled mesa3d 23.1 introduced a regression crashing glxinfo (and some piglit tests) when gles1 is disabled. See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9038 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4287983490 Signed-off-by: Romain Naour Cc: Bernd Kuhls [yann.morin.1998@free.fr: fix Upstream tag as noticed by Baruch] Signed-off-by: Yann E. MORIN --- ...arly-when-trying-to-create-an-unsupp.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/mesa3d/0005-mesa-main-Exit-early-when-trying-to-create-an-unsupp.patch diff --git a/package/mesa3d/0005-mesa-main-Exit-early-when-trying-to-create-an-unsupp.patch b/package/mesa3d/0005-mesa-main-Exit-early-when-trying-to-create-an-unsupp.patch new file mode 100644 index 000000000000..278d75e64ac5 --- /dev/null +++ b/package/mesa3d/0005-mesa-main-Exit-early-when-trying-to-create-an-unsupp.patch @@ -0,0 +1,50 @@ +From 2a6908ff4c94284b39c3cd4c97e1069876720eb7 Mon Sep 17 00:00:00 2001 +From: Jordan Justen +Date: Tue, 16 May 2023 18:46:50 -0700 +Subject: [PATCH] mesa/main: Exit early when trying to create an unsupported + context API + +Fixes: adbe8b6c17a ("mesa: optimize out _mesa_is_desktop_gl*() and _mesa_is_gles*() calls when not built") +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9038 +Signed-off-by: Jordan Justen +Reviewed-by: Eric Engestrom +Part-of: +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8bb1ecaa02177720758255bdd7ec34a5d15feca4 +[Romain: backport to 23.1] +Signed-off-by: Romain Naour +--- + src/mesa/main/context.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c +index d8eea2ea867..2b810b0d863 100644 +--- a/src/mesa/main/context.c ++++ b/src/mesa/main/context.c +@@ -996,6 +996,24 @@ _mesa_initialize_context(struct gl_context *ctx, + struct gl_shared_state *shared; + int i; + ++ switch (api) { ++ case API_OPENGL_COMPAT: ++ case API_OPENGL_CORE: ++ if (!HAVE_OPENGL) ++ return GL_FALSE; ++ break; ++ case API_OPENGLES2: ++ if (!HAVE_OPENGL_ES_2) ++ return GL_FALSE; ++ break; ++ case API_OPENGLES: ++ if (!HAVE_OPENGL_ES_1) ++ return GL_FALSE; ++ break; ++ default: ++ return GL_FALSE; ++ } ++ + ctx->API = api; + ctx->DrawBuffer = NULL; + ctx->ReadBuffer = NULL; +-- +2.40.1 + From 735354d58726875109fb73a669565b4e4dd3e858 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 21 May 2023 22:09:51 +0200 Subject: [PATCH 0600/2890] package/kodi-pvr-vbox: needs tinyxml2 Upstream added the tinyxml2 dependency in the Nexus bump: https://github.com/kodi-pvr/pvr.vbox/commit/99ae08a5fd10771773b9d35c180674c8c8cb3e9d Buildroot commit 7f3762ae1579 (package/kodi-pvr-*: mass version bump to Nexus) forgot to add this dependency causing a configure error. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-vbox/Config.in | 1 + package/kodi-pvr-vbox/kodi-pvr-vbox.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/kodi-pvr-vbox/Config.in b/package/kodi-pvr-vbox/Config.in index 202e3c66e8ed..590877e1d7bc 100644 --- a/package/kodi-pvr-vbox/Config.in +++ b/package/kodi-pvr-vbox/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_PVR_VBOX bool "kodi-pvr-vbox" + select BR2_PACKAGE_TINYXML2 help Kodi PVR addon for interfacing with VBox Communications XTi TV Gateway diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk index 60a8a819b035..e5e86274fc28 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk @@ -8,6 +8,6 @@ KODI_PVR_VBOX_VERSION = 20.4.2-Nexus KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION)) KODI_PVR_VBOX_LICENSE = GPL-2.0+ KODI_PVR_VBOX_LICENSE_FILES = LICENSE.md -KODI_PVR_VBOX_DEPENDENCIES = kodi +KODI_PVR_VBOX_DEPENDENCIES = kodi tinyxml2 $(eval $(cmake-package)) From f0795bd104248c5d5af71769e4b657dc9fd3ade8 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 18 May 2023 12:22:22 +0200 Subject: [PATCH 0601/2890] package/llvm: fix host compile with gcc-13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add upstream patch to fix host compile error on openSUSE Tumbleweed (gcc-13.0.1). Fixes: .../build/host-llvm-11.1.0/include/llvm/Support/Signals.h:117:8: error: variable or field ‘CleanupOnSignal’ declared void 117 | void CleanupOnSignal(uintptr_t Context); | ^~~~~~~~~~~~~~~ .../build/host-llvm-11.1.0/include/llvm/Support/Signals.h:117:24: error: ‘uintptr_t’ was not declared in this scope 117 | void CleanupOnSignal(uintptr_t Context); | ^~~~~~~~~ .../build/host-llvm-11.1.0/include/llvm/Support/Signals.h:18:1: note: ‘uintptr_t’ is defined in header ‘’; did you forget to ‘#include ’? 17 | #include +++ |+#include 18 | Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...-missing-cstdint-header-to-Signals.h.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch diff --git a/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch b/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch new file mode 100644 index 000000000000..c798f585d685 --- /dev/null +++ b/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch @@ -0,0 +1,34 @@ +From c6c71ab47d658ab8f84e6a6066d476fd9632bbca Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 23 May 2022 08:03:23 +0100 +Subject: [PATCH] Add missing header to Signals.h + +Without the change llvm build fails on this week's gcc-13 snapshot as: + + [ 0%] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Signals.cpp.o + In file included from llvm/lib/Support/Signals.cpp:14: + llvm/include/llvm/Support/Signals.h:119:8: error: variable or field 'CleanupOnSignal' declared void + 119 | void CleanupOnSignal(uintptr_t Context); + | ^~~~~~~~~~~~~~~ + +Upstream: https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch +Signed-off-by: Peter Seiderer +--- + include/llvm/Support/Signals.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/llvm/Support/Signals.h b/include/llvm/Support/Signals.h +index e0a18e72..148216b8 100644 +--- a/include/llvm/Support/Signals.h ++++ b/include/llvm/Support/Signals.h +@@ -14,6 +14,7 @@ + #ifndef LLVM_SUPPORT_SIGNALS_H + #define LLVM_SUPPORT_SIGNALS_H + ++#include + #include + + namespace llvm { +-- +2.40.1 + From ddcefbcfd81b104f881a0194be69f013722ba852 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 23 May 2023 19:31:42 +0200 Subject: [PATCH 0602/2890] package/libmnl: fix build failure The rtnl-link-can application requires kernel headers of at least version 4.11. Since the `make check` command compiles all examples, their compilation is enabled only if the condition regarding the kernel headers is satisfied. Fixes: - http://autobuild.buildroot.net/results/36c1619c8b02efeaf9caebae8bb5c3eb8a26238b/ - http://autobuild.buildroot.net/results/15f6dc103eec7bdeb5020acbc0ae99dc97c00e4e/ Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/libmnl/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libmnl/Config.in b/package/libmnl/Config.in index b4a4195751ec..434778bf5547 100644 --- a/package/libmnl/Config.in +++ b/package/libmnl/Config.in @@ -10,7 +10,11 @@ if BR2_PACKAGE_LIBMNL config BR2_PACKAGE_LIBMNL_EXAMPLES bool "install examples" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 help Install binary examples. +comment "examples needs a toolchain w/ headers >= 4.11" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 + endif From f32ddbbcf3f1d96290d1130be999b13eea006f71 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 19:57:14 +0200 Subject: [PATCH 0603/2890] package/libcurl: security bump version to 8.1.1 Changelog: https://curl.se/changes.html Version 8.1.0 fixes the following CVEs: CVE-2023-28319: https://curl.se/docs/CVE-2023-28319.html CVE-2023-28320: https://curl.se/docs/CVE-2023-28320.html CVE-2023-28321: https://curl.se/docs/CVE-2023-28321.html CVE-2023-28322: https://curl.se/docs/CVE-2023-28322.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 8a29e7b977ca..12d356118b72 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.0.1.tar.xz.asc +# https://curl.se/download/curl-8.1.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0 curl-8.0.1.tar.xz +sha256 08a948e061929645597c1ef7194e07b308b22084ff03fa7400b465e6c05149e5 curl-8.1.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 0f7ae640f64d..93e839798bf1 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.0.1 +LIBCURL_VERSION = 8.1.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From e418a2c06a1bdc7a5fc65ce58400ed0a9c9e28bb Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Wed, 24 May 2023 10:16:01 +0700 Subject: [PATCH 0604/2890] toolchain-external-custom: Describe BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX "Toolchain prefix" option apparently doesn't have any help describing it, which causes confusion when using external toolchain. Leaving this option at default prefix name ("$(ARCH)-linux") when external toolchain components are called with different prefix (e.g. "$(ARCH)-unknown-linux-gnu") may cause build failure unless the prefix symlink is already in place (e.g. when using Buildroot-generated toolchain as external toolchain). Describe the option to clarify. Signed-off-by: Bagas Sanjaya Reviewed-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .../toolchain-external-custom/Config.in.options | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 0fd8841e5b6c..8ca66ab7b660 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -24,6 +24,21 @@ config BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX string "Toolchain prefix" default "$(ARCH)-linux" + help + Component name prefix used by your external toolchain. + + Typically, this is the target tuple, e.g. something that + looks like: $(ARCH)-unknown-linux-gnu. + + If unsure, look at the "bin" directory of your toolchain and + note the part of component name before the last dash, i.e. if + you call the toolchain's gcc as $(ARCH)-unknown-linux-gnu-gcc, + the prefix is $(ARCH)-unknown-linux-gnu. + + Note that Buildroot toolchains have shorter aliases that look + like $(ARCH)-linux, as symlinks to the full-tuple components, + so you can leave this option at default value if you use them + as external toolchain. choice bool "External toolchain gcc version" From ad4775fb2f6a51e1d88110c520e98147deb752ab Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 May 2023 11:49:08 +0200 Subject: [PATCH 0605/2890] configs/qemu_ppc_mpc8544ds_defconfig: remove kernel patch The ppc-mpc8544ds is the only qemu configuration that requires a kernel patch: board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch But this patch doesn't apply after a backport between v6.1.20 and v6.1.21 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=da0beae2449376326086e9f57468fd2b64736d2a So the patch 0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch doesn't seem required anymore. Welcome to Buildroot buildroot login: root # uname -a Linux buildroot 6.1.28 #1 Wed May 24 09:08:27 UTC 2023 ppc GNU/Linux # cat /proc/cpuinfo processor : 0 cpu : e500v2 clock : 400.000000MHz revision : 3.0 (pvr 8021 0030) bogomips : 800.00 timebase : 400000000 platform : MPC8544 DS model : MPC8544DS Memory : 128 MB Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4306895282 https://bugs.busybox.net/show_bug.cgi?id=15581 Signed-off-by: Romain Naour Cc: Jan-Benedict Glaw Cc: Sebastian Weyer Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...x-mcpu-options-for-SPE-only-compiler.patch | 53 ------------------- configs/qemu_ppc_mpc8544ds_defconfig | 1 - 3 files changed, 55 deletions(-) delete mode 100644 board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch diff --git a/.checkpackageignore b/.checkpackageignore index 947f4606aae7..f2dea0dfd9b1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -74,7 +74,6 @@ board/pine64/rockpro64/post-build.sh Shellcheck board/qemu/aarch64-sbsa/assemble-flash-images Shellcheck board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch Upstream board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch Upstream -board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch Upstream board/qemu/x86/post-build.sh Shellcheck board/qemu/x86_64/post-build.sh Shellcheck board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch Upstream diff --git a/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch b/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch deleted file mode 100644 index b8c8a7258788..000000000000 --- a/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a0919e3177295f4aaa9006915adcddc31788d809 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Wed, 26 Dec 2018 00:00:40 +0000 -Subject: [PATCH] powerpc: Fix -mcpu= options for SPE-only compiler - -GCC for Debian's "powerpcspe" architecture only supports 32-bit -SPE targets, and using -mcpu=powerpc or -mcpu=powerpc64 is a fatal -error. - -* Change the test for a biarch compiler to pass both the -m32 and -m64 - options, so that it doesn't catch 32-bit-only compilers -* Add an ifdef CONFIG_PPC64 around the 64-bit CPU option definitions - -Signed-off-by: Ben Hutchings -[Romain: Patch from Debian repository: -https://salsa.debian.org/kernel-team/linux/-/blob/buster/debian/patches/bugfix/powerpc/powerpc-fix-mcpu-options-for-spe-only-compiler.patch] -Signed-off-by: Romain Naour ---- - arch/powerpc/Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile -index 5c8c06215dd4..e3dbea6d7ae0 100644 ---- a/arch/powerpc/Makefile -+++ b/arch/powerpc/Makefile -@@ -12,7 +12,7 @@ - # Rewritten by Cort Dougan and Paul Mackerras - # - --HAS_BIARCH := $(call cc-option-yn, -m32) -+HAS_BIARCH := $(call cc-option-yn, -m32 -m64) - - # Set default 32 bits cross compilers for vdso and boot wrapper - CROSS32_COMPILE ?= -@@ -164,6 +164,7 @@ CFLAGS-$(CONFIG_PPC32) += $(call cc-option, $(MULTIPLEWORD)) - - CFLAGS-$(CONFIG_PPC32) += $(call cc-option,-mno-readonly-in-sdata) - -+ifdef CONFIG_PPC64 - ifdef CONFIG_PPC_BOOK3S_64 - ifdef CONFIG_CPU_LITTLE_ENDIAN - CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8 -@@ -175,6 +176,7 @@ endif - else - CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64 - endif -+endif - - ifdef CONFIG_FUNCTION_TRACER - CC_FLAGS_FTRACE := -pg --- -2.17.1 - diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index ca1a42916750..6d8a214e05a3 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -3,7 +3,6 @@ BR2_powerpc=y BR2_powerpc_8548=y # System -BR2_GLOBAL_PATCH_DIR="board/qemu/ppc-mpc8544ds/patches" BR2_SYSTEM_DHCP="eth0" # Filesystem From 7685016cdc5582985dc8fcb1eac09623467a2bc0 Mon Sep 17 00:00:00 2001 From: Luca Pesce Date: Wed, 24 May 2023 10:31:56 +0200 Subject: [PATCH 0606/2890] package/libwebsockets: (re-)enable external poll loop support Since version 3.2.0, libwebsockets does not compile its external loop support code anymore. That code was put under LWS_WITH_EXTERNAL_POLL compile option, which defaults to OFF. Applications relying on that support need to turn that option on, so let's add it to the package. For example, when libwebsockets is enabled, mosquitto broker is built with websocket support, but its code requires LWS_WITH_EXTERNAL_POLL to be on, otherwise it gives compile-time warning hinting to unusable websocket support: https://github.com/eclipse/mosquitto/commit/1b24f625ea4ee77f3c4796ec2233d059f8c7977e Signed-off-by: Luca Pesce Signed-off-by: Yann E. MORIN --- package/libwebsockets/Config.in | 12 ++++++++++++ package/libwebsockets/libwebsockets.mk | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/package/libwebsockets/Config.in b/package/libwebsockets/Config.in index d7b529cafd55..05c132641ee4 100644 --- a/package/libwebsockets/Config.in +++ b/package/libwebsockets/Config.in @@ -9,5 +9,17 @@ config BR2_PACKAGE_LIBWEBSOCKETS https://libwebsockets.org/ +if BR2_PACKAGE_LIBWEBSOCKETS + +config BR2_PACKAGE_LIBWEBSOCKETS_EXT_POLL + bool "enable external poll loop support" + default y # legacy, was previously always enabled + help + Enable external poll loop support code. This was + unconditionally compiled in for library versions + prior to 3.2.0. + +endif + comment "libwebsockets needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index fb0ee6688326..86756ca61280 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -94,4 +94,8 @@ ifeq ($(BR2_SHARED_LIBS),y) LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_STATIC=OFF endif +ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_EXT_POLL),y) +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_EXTERNAL_POLL=ON +endif + $(eval $(cmake-package)) From 7e7c321ba0424123b0bf6f10a31af00607daaa8f Mon Sep 17 00:00:00 2001 From: Luca Pesce Date: Wed, 24 May 2023 10:31:57 +0200 Subject: [PATCH 0607/2890] package/mosquitto: libwebsockets support needs external loop support When libwebsockets is enabled, mosquitto broker is built with websocket support, but its code requires libwebsockets being built with external loop option - otherwise, mosquitto gives a compile-time warning hinting to unusable websocket support: https://github.com/eclipse/mosquitto/commit/1b24f625ea4ee77f3c4796ec2233d059f8c7977e To fix this, select the BR2_PACKAGE_LIBWEBSOCKETS_EXT_POLL option. Signed-off-by: Luca Pesce Signed-off-by: Yann E. MORIN --- package/mosquitto/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mosquitto/Config.in b/package/mosquitto/Config.in index 6fa5f79c6c07..8bedf2ad21cb 100644 --- a/package/mosquitto/Config.in +++ b/package/mosquitto/Config.in @@ -25,6 +25,7 @@ config BR2_PACKAGE_MOSQUITTO_BROKER depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # include depends on BR2_PACKAGE_MOSQUITTO + select BR2_PACKAGE_LIBWEBSOCKETS_EXT_POLL if BR2_PACKAGE_LIBWEBSOCKETS help Build and install the mosquitto broker onto target. From c27bf8881d94b3973b5bf00f414321a6ee7db819 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 24 May 2023 22:56:28 +0200 Subject: [PATCH 0608/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 2, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 16 ++++++++-------- package/linux-headers/Config.in.host | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index abb4bf922f2b..1967919431c6 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.3.2" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.3.4" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index fbc166afa23b..5b860d4aa122 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b612ecf282ca3f7989ff6d9f39082833b7dc2d522cb969a05334d3614e9c5328 linux-6.3.2.tar.xz -sha256 9ffa34921044660c6adb3eb5fd996192e322b15bbf532fe4e4e7a47079ed8fc1 linux-6.2.15.tar.xz -sha256 7a094c1428b20fef0b5429e4effcc6ed962a674ac6f04e606d63be1ddcc3a6f0 linux-6.1.28.tar.xz +sha256 d8627528ed6b3ae607d00b1ef5a46e0e7051ae40b285fd4e82f4ff0bb72b68e8 linux-6.3.4.tar.xz +sha256 06ff0d780a6934b46140f6d8c1a15792c78aa337d8b2411bf90747371d358713 linux-6.2.16.tar.xz +sha256 1bf254c4ca9ebccb25328296584fb5e87ad635ae0c1cc1deb0b5bb37a4608813 linux-6.1.30.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 77ceea259c0158dd624304871170d09b2e59ed612f3a4d436fe0f07362dcaec2 linux-5.15.111.tar.xz -sha256 1bbd445c154b053eea46acc883be548a98179988a9ed3a0b81bddfbf30a37e29 linux-5.10.179.tar.xz -sha256 142f9aed1c9f2e409dd72c5c490ad824dddf31f955ed2097d5989c4b5074fc28 linux-5.4.242.tar.xz +sha256 4a4e98d21149d781867a6d44855f708b02f03cfe233d8026a0af9c9841b3b9ca linux-5.15.113.tar.xz +sha256 da839a4bf1f6c964b9bde593bd58928f106f53690ff677e226bc50cf368b0c29 linux-5.10.180.tar.xz +sha256 c3cf664feeeee47e0f0c45c53705568f73692c37a3ff7f11c1b15e59610feb04 linux-5.4.243.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 43a514997d3a9052b765a9e1c8fbf7f5a810771937f8754a529ed09e0e02e20b linux-4.19.282.tar.xz -sha256 876c01f0d12ad0147b5c9ee2de919bedc7ffb7c2714dbfb7ccf44426f6f49153 linux-4.14.314.tar.xz +sha256 047316d20c6c97ad41c40477c7e1ab0bea434243e17bfc72155801b123cc51f4 linux-4.19.283.tar.xz +sha256 a346c5c34c06caeb28063b6379a28ec1f4111fa438ecd933a55f696fe362c99d linux-4.14.315.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6f9c3b941896..ba7cf4945535 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -400,14 +400,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.314" if BR2_KERNEL_HEADERS_4_14 - default "4.19.282" if BR2_KERNEL_HEADERS_4_19 - default "5.4.242" if BR2_KERNEL_HEADERS_5_4 - default "5.10.179" if BR2_KERNEL_HEADERS_5_10 - default "5.15.111" if BR2_KERNEL_HEADERS_5_15 - default "6.1.28" if BR2_KERNEL_HEADERS_6_1 - default "6.2.15" if BR2_KERNEL_HEADERS_6_2 - default "6.3.2" if BR2_KERNEL_HEADERS_6_3 + default "4.14.315" if BR2_KERNEL_HEADERS_4_14 + default "4.19.283" if BR2_KERNEL_HEADERS_4_19 + default "5.4.243" if BR2_KERNEL_HEADERS_5_4 + default "5.10.180" if BR2_KERNEL_HEADERS_5_10 + default "5.15.113" if BR2_KERNEL_HEADERS_5_15 + default "6.1.30" if BR2_KERNEL_HEADERS_6_1 + default "6.2.16" if BR2_KERNEL_HEADERS_6_2 + default "6.3.4" if BR2_KERNEL_HEADERS_6_3 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 4030a7eb59fa7d12fe31ef56fe0479f2c5f8d3f7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 24 May 2023 22:56:29 +0200 Subject: [PATCH 0609/2890] package/linux-headers: drop 6.2.x option The 6.2.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index debe8428a562..ac2e302a6b06 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.05" +config BR2_KERNEL_HEADERS_6_2 + bool "kernel headers version 6.2.x are no longer supported" + select BR2_LEGACY + help + Version 6.2.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_ATK bool "atk removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 5b860d4aa122..b8ec77e232be 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 d8627528ed6b3ae607d00b1ef5a46e0e7051ae40b285fd4e82f4ff0bb72b68e8 linux-6.3.4.tar.xz -sha256 06ff0d780a6934b46140f6d8c1a15792c78aa337d8b2411bf90747371d358713 linux-6.2.16.tar.xz sha256 1bf254c4ca9ebccb25328296584fb5e87ad635ae0c1cc1deb0b5bb37a4608813 linux-6.1.30.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 4a4e98d21149d781867a6d44855f708b02f03cfe233d8026a0af9c9841b3b9ca linux-5.15.113.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ba7cf4945535..4a2e1e154d68 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -49,10 +49,6 @@ config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 -config BR2_KERNEL_HEADERS_6_2 - bool "Linux 6.2.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 - config BR2_KERNEL_HEADERS_6_3 bool "Linux 6.3.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 @@ -406,7 +402,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.180" if BR2_KERNEL_HEADERS_5_10 default "5.15.113" if BR2_KERNEL_HEADERS_5_15 default "6.1.30" if BR2_KERNEL_HEADERS_6_1 - default "6.2.16" if BR2_KERNEL_HEADERS_6_2 default "6.3.4" if BR2_KERNEL_HEADERS_6_3 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From aecf8a96e1768a20f2f12258a6c755e5aa316ff9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 26 May 2023 23:49:35 +0200 Subject: [PATCH 0610/2890] package/python-django: add missing python-zlib runtime dependency Tree django core files are using "import zlib" and requires BR2_PACKAGE_PYTHON3_ZLIB to be enabled. django/core/cache/backends/filebased.py:import zlib django/core/files/images.py:import zlib django/core/signing.py:import zlib Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819300 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/python-django/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-django/Config.in b/package/python-django/Config.in index 5830cadc93d0..c236a6dc0b47 100644 --- a/package/python-django/Config.in +++ b/package/python-django/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_DJANGO bool "python-django" select BR2_PACKAGE_PYTHON3_UNICODEDATA select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_SQLPARSE # runtime help From 8ac1458e8162ab9d3ac3c5354c874a00bdf36d57 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 27 May 2023 00:23:12 +0200 Subject: [PATCH 0611/2890] package/python-can: add missing setuptools runtime dependency The commit [1] removed setuptools from runtime dependencies "Drop spurious setuptools runtime dependency.". Since then the test TestPythonPy3Can fail with the following error: ModuleNotFoundError: No module named 'pkg_resources' Add back setuptools to provide "pkg_resources". Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819285 [1] 09c966af735ca53b447f52965d123c21e43ae522 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/python-can/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 5d21e29d88fe..68a9ffca71ba 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_AENUM # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime From d3a93df9e84a65bfdbf5748692f4d9241363c025 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 25 May 2023 23:07:22 +0200 Subject: [PATCH 0612/2890] package/crudini: fix python 3.10+ warning due to pipes import The TestCrudiniPy3 test fail due to a python 3.10 warning due to pipes import in crudini. Indeed, pipes is deprecated since python 3.10 and slated for removal in python 3.13. Backport an upstream patch fixing the warning. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819049 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../0001-prefer-shlex-over-pipes.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/crudini/0001-prefer-shlex-over-pipes.patch diff --git a/package/crudini/0001-prefer-shlex-over-pipes.patch b/package/crudini/0001-prefer-shlex-over-pipes.patch new file mode 100644 index 000000000000..16296f619fa1 --- /dev/null +++ b/package/crudini/0001-prefer-shlex-over-pipes.patch @@ -0,0 +1,41 @@ +From d81b703f3e8e29c1547386135c7e9ca539c1f054 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?P=C3=A1draig=20Brady?= +Date: Tue, 2 Aug 2022 14:40:37 +0100 +Subject: [PATCH] prefer shlex over pipes + +pipes is deprecated since python 3.10 +and slated for removal in python 3.13 + +[Romain backport to 0.9.3] +Upstream: https://github.com/pixelb/crudini/commit/e1650941054822faad4cda788bff6fe364eb4ca3 +Signed-off-by: Romain Naour +--- + crudini | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/crudini b/crudini +index 669596b..a136241 100755 +--- a/crudini ++++ b/crudini +@@ -17,15 +17,17 @@ import getopt + import hashlib + import iniparse + import os +-import pipes ++import re + import shutil + import string + import tempfile + + if sys.version_info[0] >= 3: ++ import shlex as pipes + from io import StringIO + import configparser + else: ++ import pipes + from cStringIO import StringIO + import ConfigParser as configparser + +-- +2.34.3 + From 30a4e35c395fc05f27b0b74b492409ee7e983680 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 27 May 2023 21:57:42 +0200 Subject: [PATCH 0613/2890] package/libressl: bump to version 3.7.3 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 03ec1e10c1f6..76a5acad6c3d 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 b06aa538fefc9c6b33c4db4931a09a5f52d9d2357219afcbff7d93fe12ebf6f7 libressl-3.7.2.tar.gz +sha256 7948c856a90c825bd7268b6f85674a8dcd254bae42e221781b24e3f8dc335db3 libressl-3.7.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index ae3a2499690d..1a63a0f348ff 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.7.2 +LIBRESSL_VERSION = 3.7.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From 2816038d8b468725f318d680a73044ef91925870 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 14:42:08 +0200 Subject: [PATCH 0614/2890] package/zfs: fix python3 support check Backport an upstream commit fixing the python3 support check "The 22.0 release of the python `packaging` package removed the `LegacyVersion` trait, causing ZFS to no longer compile. This commit replaces the sections of `ax_python_dev.m4` that rely on `LegacyVersion` with updated implementations from the upstream `autoconf-archive`." Add a comment above ZFS_AUTORECONF. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819411 https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819410 https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819409 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...LegacyVersion-broke-ax_python_dev.m4.patch | 134 ++++++++++++++++++ package/zfs/zfs.mk | 1 + 2 files changed, 135 insertions(+) create mode 100644 package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch diff --git a/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch b/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch new file mode 100644 index 000000000000..c7c4dc7d10c5 --- /dev/null +++ b/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch @@ -0,0 +1,134 @@ +From ad2c8e13e42bc2f396cce117d17a227dadedd476 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 5 Jan 2023 11:04:24 -0800 +Subject: [PATCH] removal of LegacyVersion broke ax_python_dev.m4 + +The 22.0 release of the python `packaging` package removed the +`LegacyVersion` trait, causing ZFS to no longer compile. + +This commit replaces the sections of `ax_python_dev.m4` that rely on +`LegacyVersion` with updated implementations from the upstream +`autoconf-archive`. + +Reviewed-by: Brian Behlendorf +Signed-off-by: Matthew Ahrens +Closes #14297 +Upstream: https://github.com/openzfs/zfs/commit/b72efb751147ab57afd1588a15910f547cb22600 +[Romain: backport to 2.1.7] +Signed-off-by: Romain Naour +--- + config/ax_python_devel.m4 | 71 +++++++++++++++++++-------------------- + 1 file changed, 35 insertions(+), 36 deletions(-) + +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 +index 7adcf01a0..9eef45065 100644 +--- a/config/ax_python_devel.m4 ++++ b/config/ax_python_devel.m4 +@@ -97,23 +97,13 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) +- ac_supports_python_ver=`cat<= '2.1.0')"` + if test "$ac_supports_python_ver" != "True"; then + if test -z "$PYTHON_NOVERSIONCHECK"; then + AC_MSG_RESULT([no]) +- m4_ifvaln([$2],[$2],[ +- AC_MSG_FAILURE([ ++ AC_MSG_FAILURE([ + This version of the AC@&t@_PYTHON_DEVEL macro + doesn't work properly with versions of Python before + 2.1.0. You may need to re-run configure, setting the +@@ -122,7 +112,6 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. + Moreover, to disable this check, set PYTHON_NOVERSIONCHECK + to something else than an empty string. + ]) +- ]) + else + AC_MSG_RESULT([skip at user request]) + fi +@@ -131,37 +120,47 @@ to something else than an empty string. + fi + + # +- # if the macro parameter ``version'' is set, honour it ++ # If the macro parameter ``version'' is set, honour it. ++ # A Python shim class, VPy, is used to implement correct version comparisons via ++ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for ++ # Python 2.7.10 (the ".1" being evaluated as less than ".3"). + # + if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) +- # Why the strip ()? Because if we don't, version.parse +- # will, for example, report 3.10.0 >= '3.11.0' +- ac_supports_python_ver=`cat< ax_python_devel_vpy.py ++class VPy: ++ def vtup(self, s): ++ return tuple(map(int, s.strip().replace("rc", ".").split("."))) ++ def __init__(self): ++ import sys ++ self.vpy = tuple(sys.version_info) ++ def __eq__(self, s): ++ return self.vpy == self.vtup(s) ++ def __ne__(self, s): ++ return self.vpy != self.vtup(s) ++ def __lt__(self, s): ++ return self.vpy < self.vtup(s) ++ def __gt__(self, s): ++ return self.vpy > self.vtup(s) ++ def __le__(self, s): ++ return self.vpy <= self.vtup(s) ++ def __ge__(self, s): ++ return self.vpy >= self.vtup(s) ++EOF ++ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \ ++ ver = ax_python_devel_vpy.VPy(); \ ++ print (ver $1)"` ++ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py* + if test "$ac_supports_python_ver" = "True"; then +- AC_MSG_RESULT([yes]) ++ AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- m4_ifvaln([$2],[$2],[ +- AC_MSG_ERROR([this package requires Python $1. ++ AC_MSG_ERROR([this package requires Python $1. + If you have it installed, but it isn't the default Python + interpreter in your system path, please pass the PYTHON_VERSION + variable to configure. See ``configure --help'' for reference. + ]) +- PYTHON_VERSION="" +- ]) ++ PYTHON_VERSION="" + fi + fi + +-- +2.34.3 + diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 84e9099ba901..97e9442cf872 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -12,6 +12,7 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs +# 0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch ZFS_AUTORECONF = YES ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl From 0ac6713cee7e683b08234df14fff652cfbfef91b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 12:12:40 +0200 Subject: [PATCH 0615/2890] package/perl-clone: new package perl-clone is a new mandatory dependency of perl-http-message v6.44 that is already available in Buildroot since commit [1]. [1] 79e8aad721099eb05e60b449432136691275022f Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/perl-clone/Config.in | 10 ++++++++++ package/perl-clone/perl-clone.hash | 6 ++++++ package/perl-clone/perl-clone.mk | 14 ++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/perl-clone/Config.in create mode 100644 package/perl-clone/perl-clone.hash create mode 100644 package/perl-clone/perl-clone.mk diff --git a/package/Config.in b/package/Config.in index 420ebaa370b7..0cf2f3998c8d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -796,6 +796,7 @@ menu "Perl libraries/modules" source "package/perl-class-method-modifiers/Config.in" source "package/perl-class-std/Config.in" source "package/perl-class-std-fast/Config.in" + source "package/perl-clone/Config.in" source "package/perl-convert-asn1/Config.in" source "package/perl-cookie-baker/Config.in" source "package/perl-crypt-blowfish/Config.in" diff --git a/package/perl-clone/Config.in b/package/perl-clone/Config.in new file mode 100644 index 000000000000..78f13dfe6b08 --- /dev/null +++ b/package/perl-clone/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PERL_CLONE + bool "perl-clone" + depends on !BR2_STATIC_LIBS + help + recursively copy Perl datatypes. + + https://metacpan.org/release/Clone + +comment "perl-clone needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-clone/perl-clone.hash b/package/perl-clone/perl-clone.hash new file mode 100644 index 000000000000..7b69b97d0655 --- /dev/null +++ b/package/perl-clone/perl-clone.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 cafa8984a2c2e005e54b27dd1e3f0afe Clone-0.46.tar.gz +sha256 aadeed5e4c8bd6bbdf68c0dd0066cb513e16ab9e5b4382dc4a0aafd55890697b Clone-0.46.tar.gz + +# computed by scancpan +sha256 40aa7eb133e97b075024380640528760a54aefc344781741ed02539a375db5ac README.md diff --git a/package/perl-clone/perl-clone.mk b/package/perl-clone/perl-clone.mk new file mode 100644 index 000000000000..9e04329eabd9 --- /dev/null +++ b/package/perl-clone/perl-clone.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-clone +# +################################################################################ + +PERL_CLONE_VERSION = 0.46 +PERL_CLONE_SOURCE = Clone-$(PERL_CLONE_VERSION).tar.gz +PERL_CLONE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GARU +PERL_CLONE_LICENSE = Artistic or GPL-1.0+ +PERL_CLONE_LICENSE_FILES = README.md +PERL_CLONE_DISTNAME = Clone + +$(eval $(perl-package)) From 742258fec06df18782e4bd75b00ca530120312cb Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 12:12:41 +0200 Subject: [PATCH 0616/2890] package/perl-http-message: add missing perl-clone dependency perl-clone was added to perl-http-message v6.44 as mandatory dependency by commit [1]. While updating to v6.44 [2] in Buildroot the new dependency was forgotten. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819252 https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819256 [1] https://github.com/libwww-perl/HTTP-Message/commit/6b89d6b2cce67b540ade87fc6fdf88cdede20b46 [2] 79e8aad721099eb05e60b449432136691275022f Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/perl-http-message/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/perl-http-message/Config.in b/package/perl-http-message/Config.in index 82538cfce818..3c6849487ade 100644 --- a/package/perl-http-message/Config.in +++ b/package/perl-http-message/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_HTTP_MESSAGE bool "perl-http-message" + select BR2_PACKAGE_PERL_CLONE # runtime select BR2_PACKAGE_PERL_ENCODE_LOCALE # runtime select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_IO_HTML # runtime From 222d747effc286ac71d643077ab96cf7e2182c6d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 17:18:12 +0200 Subject: [PATCH 0617/2890] package/znc: fix build with swig 4.1.x Buildroot commit 260924e239627cbe1379cfc752939245d53a06e0 "package/swig: bump to version 4.1.1" broke the build of znc. Fixes: http://autobuild.buildroot.net/results/14c/14c44e94b6b588aa033f24202aa8437882cf8792/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...rt-SWIG-4.1.0-drop-support-for-4.0.1.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch diff --git a/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch b/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch new file mode 100644 index 000000000000..cb0988e63149 --- /dev/null +++ b/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch @@ -0,0 +1,53 @@ +From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov +Date: Sat, 5 Nov 2022 12:54:40 +0000 +Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1 + +https://bugs.gentoo.org/878587 + +Upstream: https://github.com/znc/znc/commit/fecdd9895894b3afe903021b0843a422eb4d3308 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + modules/modperl/CMakeLists.txt | 1 - + modules/modpython/CMakeLists.txt | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d43578e0e..efab0ee1ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,7 +173,7 @@ if(WANT_PYTHON AND NOT EXISTS + endif() + endif() + if(search_swig) +- find_package(SWIG 3.0.0) ++ find_package(SWIG 4.0.1) + if(NOT SWIG_FOUND) + message(FATAL_ERROR + "Can't find SWIG, therefore Perl and Python aren't supported. " +diff --git a/modules/modperl/CMakeLists.txt b/modules/modperl/CMakeLists.txt +index e18fe47644..a87f74e478 100644 +--- a/modules/modperl/CMakeLists.txt ++++ b/modules/modperl/CMakeLists.txt +@@ -53,7 +53,6 @@ if(SWIG_FOUND) + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." + "-I${CMAKE_CURRENT_SOURCE_DIR}/include" +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modperl_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modperl.i" +diff --git a/modules/modpython/CMakeLists.txt b/modules/modpython/CMakeLists.txt +index edbeb41ed5..36a2e649f0 100644 +--- a/modules/modpython/CMakeLists.txt ++++ b/modules/modpython/CMakeLists.txt +@@ -50,7 +50,6 @@ if(SWIG_FOUND) + "-I${PROJECT_BINARY_DIR}/include" + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modpython_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modpython.i" From b6ce18b5ac78474611cdea07b887f4f83bc78648 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 27 May 2023 18:33:02 +0200 Subject: [PATCH 0618/2890] package/busybox: fix busybox lineedit signal handling Since the Busybox version bump to 1.36.0 the TestS6 fails during the test teardown. Backport an upstream patch fixing signal handling (SIGWINCH), see [1]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819388 [1] https://bugs.busybox.net/show_bug.cgi?id=15256 Signed-off-by: Romain Naour [Peter: use upstream commit as-is] Signed-off-by: Peter Korsgaard --- ...CH-and-SIGCHLD-in-hush-interrupting-.patch | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch diff --git a/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch b/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch new file mode 100644 index 000000000000..8ebb487ec6d3 --- /dev/null +++ b/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch @@ -0,0 +1,103 @@ +From 93e0898c663a533082b5f3c2e7dcce93ec47076d Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 26 Jan 2023 12:56:33 +0100 +Subject: [PATCH] shell: fix SIGWINCH and SIGCHLD (in hush) interrupting line + input, closes 15256 + +function old new delta +record_pending_signo 32 63 +31 +lineedit_read_key 231 224 -7 +------------------------------------------------------------------------------ +(add/remove: 0/0 grow/shrink: 1/1 up/down: 31/-7) Total: 24 bytes + +Signed-off-by: Denys Vlasenko +Upstream: https://git.busybox.net/busybox/commit/?id=93e0898c663a533082b5f3c2e7dcce93ec47076d +Signed-off-by: Romain Naour +--- + libbb/lineedit.c | 17 ++++++++++------- + shell/ash.c | 3 ++- + shell/hush.c | 10 ++++++++-- + 3 files changed, 20 insertions(+), 10 deletions(-) + +diff --git a/libbb/lineedit.c b/libbb/lineedit.c +index d6b2e76ff..b942f540a 100644 +--- a/libbb/lineedit.c ++++ b/libbb/lineedit.c +@@ -2180,7 +2180,8 @@ static int lineedit_read_key(char *read_key_buffer, int timeout) + * "\xff\n",pause,"ls\n" invalid and thus won't lose "ls". + * + * If LI_INTERRUPTIBLE, return -1 if got EINTR in poll() +- * inside read_key, or if bb_got_signal != 0 (IOW: if signal ++ * inside read_key and bb_got_signal became != 0, ++ * or if bb_got_signal != 0 (IOW: if signal + * arrived before poll() is reached). + * + * Note: read_key sets errno to 0 on success. +@@ -2197,14 +2198,16 @@ static int lineedit_read_key(char *read_key_buffer, int timeout) + IF_FEATURE_EDITING_WINCH(S.ok_to_redraw = 0;) + if (errno != EINTR) + break; ++ /* It was EINTR. Repeat read_key() unless... */ + if (state->flags & LI_INTERRUPTIBLE) { +- /* LI_INTERRUPTIBLE bails out on EINTR, +- * but nothing really guarantees that bb_got_signal +- * is nonzero. Follow the least surprise principle: ++ /* LI_INTERRUPTIBLE bails out on EINTR ++ * if bb_got_signal became nonzero. ++ * (It may stay zero: for example, our SIGWINCH ++ * handler does not set it. This is used for signals ++ * which should not interrupt line editing). + */ +- if (bb_got_signal == 0) +- bb_got_signal = 255; +- goto ret; ++ if (bb_got_signal != 0) ++ goto ret; /* will return -1 */ + } + } + +diff --git a/shell/ash.c b/shell/ash.c +index 18ccc1329..5f8c8ea19 100644 +--- a/shell/ash.c ++++ b/shell/ash.c +@@ -10821,7 +10821,8 @@ preadfd(void) + again: + /* For shell, LI_INTERRUPTIBLE is set: + * read_line_input will abort on either +- * getting EINTR in poll(), or if it sees bb_got_signal != 0 ++ * getting EINTR in poll() and bb_got_signal became != 0, ++ * or if it sees bb_got_signal != 0 + * (IOW: if signal arrives before poll() is reached). + * Interactive testcases: + * (while kill -INT $$; do sleep 1; done) & +diff --git a/shell/hush.c b/shell/hush.c +index d111f0cc5..f064b8fd2 100644 +--- a/shell/hush.c ++++ b/shell/hush.c +@@ -1946,7 +1946,12 @@ static void record_pending_signo(int sig) + { + sigaddset(&G.pending_set, sig); + #if ENABLE_FEATURE_EDITING +- bb_got_signal = sig; /* for read_line_input: "we got a signal" */ ++ if (sig != SIGCHLD ++ || (G_traps && G_traps[SIGCHLD] && G_traps[SIGCHLD][0]) ++ /* ^^^ if SIGCHLD, interrupt line reading only if it has a trap */ ++ ) { ++ bb_got_signal = sig; /* for read_line_input: "we got a signal" */ ++ } + #endif + #if ENABLE_HUSH_FAST + if (sig == SIGCHLD) { +@@ -2669,7 +2674,8 @@ static int get_user_input(struct in_str *i) + } else { + /* For shell, LI_INTERRUPTIBLE is set: + * read_line_input will abort on either +- * getting EINTR in poll(), or if it sees bb_got_signal != 0 ++ * getting EINTR in poll() and bb_got_signal became != 0, ++ * or if it sees bb_got_signal != 0 + * (IOW: if signal arrives before poll() is reached). + * Interactive testcases: + * (while kill -INT $$; do sleep 1; done) & +-- +2.30.2 + From c765ac9c02dbddd53cf6813cf59c8f265b043caf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 28 May 2023 22:17:33 +0200 Subject: [PATCH 0619/2890] Update for 2023.05-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 16 ++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 48 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index b81e3d75208d..b0875759fff9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,19 @@ +2023.05-rc2, released May 28th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: busybox, clamav, crudini, + kodi-pvr-vbox, libcurl, libmnl, libpqxx, libressl, libssh, + llvm, lua, mesa3d, perl-http-message, python-can, + python-django, sdl2_mixer, webkitgtk, zfs, znc + + New packages: perl-clone + + Issues resolved (http://bugs.uclibc.org): + + #15421: qemu_aarch64_ebbr_defconfig: Missing Linux kernel source.. + #15581: qemu_ppc_mpc8544ds_defconfig: Fails due to non-working patch + 2023.05-rc1, released May 15th, 2023 Fixes all over the tree and new features. diff --git a/Makefile b/Makefile index 6e094c8b1356..2e1eff2f3c15 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.05-rc1 +export BR2_VERSION := 2023.05-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1684130000 +BR2_VERSION_EPOCH = 1685305000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 7f43a6f66bf8..75b445d06995 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@

          buildroot-2022.11.2.tar.xz

          --> -

          Latest release candidate: 2023.05-rc1

          +

          Latest release candidate: 2023.05-rc2

          - +
          - +
          -

          buildroot-2023.05-rc1.tar.gz

          -

          PGP signature

          +

          buildroot-2023.05-rc2.tar.gz

          +

          PGP signature

          - +
          - +
          -

          buildroot-2023.05-rc1.tar.xz

          -

          PGP signature

          +

          buildroot-2023.05-rc2.tar.xz

          +

          PGP signature

          diff --git a/docs/website/news.html b/docs/website/news.html index 92dd469f510c..28d0b8395267 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

          News

            +
          • +
            +
            +
            +

            2023.05-rc2 released

            +

            28 May 2023

            +
            +
            +

            2023.05-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

            + +

            Head to the downloads page to pick up the + 2023.05-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

            +
            +
            +
            • +
          • From 073d6dbcb19bd7bce3be203ccfa88524ea61af6e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 30 May 2023 22:45:41 +0200 Subject: [PATCH 0620/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 1967919431c6..f288f52601b8 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.3.4" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.3.5" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index b8ec77e232be..4806bf711cfb 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 d8627528ed6b3ae607d00b1ef5a46e0e7051ae40b285fd4e82f4ff0bb72b68e8 linux-6.3.4.tar.xz -sha256 1bf254c4ca9ebccb25328296584fb5e87ad635ae0c1cc1deb0b5bb37a4608813 linux-6.1.30.tar.xz +sha256 f5cd478c3d8b908ab606afd1e95a4f8f77e7186b4a82829251d6e6aaafff825e linux-6.3.5.tar.xz +sha256 e86917bba1990e967943645484182a64ba325f98b114a1906cc1d50992e073c1 linux-6.1.31.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 4a4e98d21149d781867a6d44855f708b02f03cfe233d8026a0af9c9841b3b9ca linux-5.15.113.tar.xz -sha256 da839a4bf1f6c964b9bde593bd58928f106f53690ff677e226bc50cf368b0c29 linux-5.10.180.tar.xz -sha256 c3cf664feeeee47e0f0c45c53705568f73692c37a3ff7f11c1b15e59610feb04 linux-5.4.243.tar.xz +sha256 e981ea5d219f77735bf5a3f7e84a8af578df8ac3e1c4ff1b0649e2b0795277d2 linux-5.15.114.tar.xz +sha256 ace6ceb73f5f2504bc1bcb9b8cd5b55d6ff8e90a81ee244ad2315fdd671ba4e7 linux-5.10.181.tar.xz +sha256 90f5280e95ed7b374ad6f3979ed08008e29a051e5f372d367c06ed75b002a21b linux-5.4.244.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 047316d20c6c97ad41c40477c7e1ab0bea434243e17bfc72155801b123cc51f4 linux-4.19.283.tar.xz -sha256 a346c5c34c06caeb28063b6379a28ec1f4111fa438ecd933a55f696fe362c99d linux-4.14.315.tar.xz +sha256 7fb9ee20c7e52f9be6d9f501e8498a22f4b364abfde136143749a77e597fd03e linux-4.19.284.tar.xz +sha256 ac8318f1c1d387e23ccfa760ec042943372df23e3c4e2408177fb5a3f6488f76 linux-4.14.316.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 4a2e1e154d68..51f475f16a82 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -396,13 +396,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.315" if BR2_KERNEL_HEADERS_4_14 - default "4.19.283" if BR2_KERNEL_HEADERS_4_19 - default "5.4.243" if BR2_KERNEL_HEADERS_5_4 - default "5.10.180" if BR2_KERNEL_HEADERS_5_10 - default "5.15.113" if BR2_KERNEL_HEADERS_5_15 - default "6.1.30" if BR2_KERNEL_HEADERS_6_1 - default "6.3.4" if BR2_KERNEL_HEADERS_6_3 + default "4.14.316" if BR2_KERNEL_HEADERS_4_14 + default "4.19.284" if BR2_KERNEL_HEADERS_4_19 + default "5.4.244" if BR2_KERNEL_HEADERS_5_4 + default "5.10.181" if BR2_KERNEL_HEADERS_5_10 + default "5.15.114" if BR2_KERNEL_HEADERS_5_15 + default "6.1.31" if BR2_KERNEL_HEADERS_6_1 + default "6.3.5" if BR2_KERNEL_HEADERS_6_3 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 08e92de0447591f61266ee10f982f4ad0545154d Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 31 May 2023 15:46:00 +0200 Subject: [PATCH 0621/2890] DEVELOPERS: update etienne carriere e-mail address Updates my e-mail address. Signed-off-by: Etienne Carriere Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index e76717e84530..7aa5980df7f3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -862,7 +862,7 @@ F: package/szip/ N: Esben Haabendal F: package/python-kiwisolver/ -N: Etienne Carriere +N: Etienne Carriere F: boot/optee-os/ F: package/optee-client/ F: package/optee-examples/ From 2bcfcec50285659c9921e8457fc893c8195e32a5 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 1 Jun 2023 18:11:46 +0200 Subject: [PATCH 0622/2890] package/libopenssl: security bump to version 1.1.1u fix CVE-2023-2650 Possible DoS translating ASN.1 object identifiers Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- ...Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch | 2 +- ...Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch | 2 +- .../0007-Fixup-support-for-io_pgetevents_time64-syscall.patch | 2 +- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch index c51a3cd684e4..ef40b0353a35 100644 --- a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch +++ b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch @@ -13,7 +13,7 @@ diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c index 9e0f670..32c7282 100644 --- a/crypto/mem_sec.c +++ b/crypto/mem_sec.c -@@ -485,7 +485,7 @@ static int sh_init(size_t size, int minsize) +@@ -491,7 +491,7 @@ static int sh_init(size_t size, int minsize) if (mlock(sh.arena, sh.arena_size) < 0) ret = 2; #endif diff --git a/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch b/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch index b5070ad74ccb..9f34e1f5fb74 100644 --- a/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch +++ b/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch @@ -21,7 +21,7 @@ diff --git a/Configure b/Configure index 5a699836f3..f9152b1702 100755 --- a/Configure +++ b/Configure -@@ -1417,6 +1417,10 @@ my %predefined_CXX = $config{CXX} +@@ -1424,6 +1424,10 @@ my %predefined_CXX = $config{CXX} ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX}) : (); diff --git a/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch b/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch index 4313eecd6d10..7b003e483634 100644 --- a/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch +++ b/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch @@ -23,7 +23,7 @@ diff --git a/engines/e_afalg.c b/engines/e_afalg.c index 9480d7c24b..4e9d67db2d 100644 --- a/engines/e_afalg.c +++ b/engines/e_afalg.c -@@ -124,27 +124,56 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb) +@@ -121,27 +121,56 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb) return syscall(__NR_io_submit, ctx, n, iocb); } diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index ebc56b11dd95..708926de8037 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 -sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1u.tar.gz.sha256 +sha256 e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6 openssl-1.1.1u.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 6e84f0617568..178979f43b1f 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1t +LIBOPENSSL_VERSION = 1.1.1u LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From 0a623d4955a0c62037710aca545abc10b41153d6 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 30 May 2023 21:27:56 +0200 Subject: [PATCH 0623/2890] package/gcc: bump to version 12.3 Remove upstream patch. See announce: https://gcc.gnu.org/pipermail/gcc-announce/2023/000176.html Runtime tested: https://gitlab.com/kubu93/buildroot/-/pipelines/882178578 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 +- package/gcc/12.2.0/0002-fix-condvar.patch | 82 ------------------- ...le-split-stack-for-non-thread-builds.patch | 0 package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 +- 5 files changed, 4 insertions(+), 87 deletions(-) delete mode 100644 package/gcc/12.2.0/0002-fix-condvar.patch rename package/gcc/{12.2.0 => 12.3.0}/0001-disable-split-stack-for-non-thread-builds.patch (100%) diff --git a/.checkpackageignore b/.checkpackageignore index f2dea0dfd9b1..a8338883d092 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -524,8 +524,7 @@ package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.pat package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch Upstream package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch Upstream package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch Upstream -package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream -package/gcc/12.2.0/0002-fix-condvar.patch Upstream +package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch Upstream package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch Upstream package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch Upstream diff --git a/package/gcc/12.2.0/0002-fix-condvar.patch b/package/gcc/12.2.0/0002-fix-condvar.patch deleted file mode 100644 index 5044942e9f7d..000000000000 --- a/package/gcc/12.2.0/0002-fix-condvar.patch +++ /dev/null @@ -1,82 +0,0 @@ -From ee4af2ed0b7322884ec4ff537564683c3749b813 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Thu, 22 Dec 2022 09:56:47 +0000 -Subject: [PATCH] libstdc++: Avoid recursion in __nothrow_wait_cv::wait - [PR105730] - -The commit r12-5877-g9e18a25331fa25 removed the incorrect -noexcept-specifier from std::condition_variable::wait and gave the new -symbol version @@GLIBCXX_3.4.30. It also redefined the original symbol -std::condition_variable::wait(unique_lock&)@GLIBCXX_3.4.11 as an -alias for a new symbol, __gnu_cxx::__nothrow_wait_cv::wait, which still -has the incorrect noexcept guarantee. That __nothrow_wait_cv::wait is -just a wrapper around the real condition_variable::wait which adds -noexcept and so terminates on a __forced_unwind exception. - -This doesn't work on uclibc, possibly due to a dynamic linker bug. When -__nothrow_wait_cv::wait calls the condition_variable::wait function it -binds to the alias symbol, which means it just calls itself recursively -until the stack overflows. - -This change avoids the possibility of a recursive call by changing the -__nothrow_wait_cv::wait function so that instead of calling -condition_variable::wait it re-implements it. This requires accessing -the private _M_cond member of condition_variable, so we need to use the -trick of instantiating a template with the member-pointer of the private -member. - -libstdc++-v3/ChangeLog: - - PR libstdc++/105730 - * src/c++11/compatibility-condvar.cc (__nothrow_wait_cv::wait): - Access private data member of base class and call its wait - member. - -Signed-off-by: Gleb Mazovetskiy ---- - .../src/c++11/compatibility-condvar.cc | 22 ++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/libstdc++-v3/src/c++11/compatibility-condvar.cc b/libstdc++-v3/src/c++11/compatibility-condvar.cc -index e3a8b8403ca..3cef3bc0714 100644 ---- a/libstdc++-v3/src/c++11/compatibility-condvar.cc -+++ b/libstdc++-v3/src/c++11/compatibility-condvar.cc -@@ -67,6 +67,24 @@ _GLIBCXX_END_NAMESPACE_VERSION - && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT) - namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) - { -+namespace -+{ -+ // Pointer-to-member for private std::condition_variable::_M_cond member. -+ std::__condvar std::condition_variable::* __base_member; -+ -+ template -+ struct cracker -+ { static std::__condvar std::condition_variable::* value; }; -+ -+ // Initializer for this static member also initializes __base_member. -+ template -+ std::__condvar std::condition_variable::* -+ cracker::value = __base_member = X; -+ -+ // Explicit instantiation is allowed to access the private member. -+ template class cracker<&std::condition_variable::_M_cond>; -+} -+ - struct __nothrow_wait_cv : std::condition_variable - { - void wait(std::unique_lock&) noexcept; -@@ -76,7 +94,9 @@ __attribute__((used)) - void - __nothrow_wait_cv::wait(std::unique_lock& lock) noexcept - { -- this->condition_variable::wait(lock); -+ // In theory this could be simply this->std::condition_variable::wait(lock) -+ // but with uclibc that binds to the @GLIBCXX_3.4.11 symbol, see PR 105730. -+ (this->*__base_member).wait(*lock.mutex()); - } - } // namespace __gnu_cxx - --- -2.31.1 - diff --git a/package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 100% rename from package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index cd1b9fa46d80..dca1579319ce 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -88,7 +88,7 @@ config BR2_GCC_VERSION default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE default "10.4.0" if BR2_GCC_VERSION_10_X default "11.3.0" if BR2_GCC_VERSION_11_X - default "12.2.0" if BR2_GCC_VERSION_12_X + default "12.3.0" if BR2_GCC_VERSION_12_X default "arc-2020.09-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 666124fa6dbe..9082d25b78bf 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -4,8 +4,8 @@ sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 gcc-10.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-11.3.0/sha512.sum sha512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7 gcc-11.3.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.2.0/sha512.sum -sha512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 gcc-12.2.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.3.0/sha512.sum +sha512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204 gcc-12.3.0.tar.xz # Locally calculated (fetched from Github) sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz From f1e3d02cd4d9ba04b9aea8bf10a960104d171773 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 30 May 2023 21:27:57 +0200 Subject: [PATCH 0624/2890] package/gcc: bump to version 11.4 Add Upstream tag to backported patches. Remove patches merged in gcc 11.4. See announce: https://gcc.gnu.org/pipermail/gcc-announce/2023/000177.html Runtime tested: https://gitlab.com/kubu93/buildroot/-/pipelines/882299806 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- .checkpackageignore | 7 +- .../11.3.0/0005-rs6000-Improve-.machine.patch | 120 ------------------ ...e-rs6000_cpu-for-.machine-ppc-and-pp.patch | 68 ---------- ...-mcmodel-option-to-handle-large-GOTs.patch | 12 +- ...-cmodel-large-when-building-crtstuff.patch | 12 +- ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 8 +- ...le-split-stack-for-non-thread-builds.patch | 2 +- ...machine-names-in-__has_include-.-PR.patch} | 8 +- package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 +- 10 files changed, 31 insertions(+), 212 deletions(-) delete mode 100644 package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch delete mode 100644 package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch rename package/gcc/{11.3.0 => 11.4.0}/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch (95%) rename package/gcc/{11.3.0 => 11.4.0}/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch (88%) rename package/gcc/{11.3.0 => 11.4.0}/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch (81%) rename package/gcc/{11.3.0 => 11.4.0}/0004-disable-split-stack-for-non-thread-builds.patch (92%) rename package/gcc/{11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch => 11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch} (96%) diff --git a/.checkpackageignore b/.checkpackageignore index a8338883d092..ea5f6aafd3d2 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -518,12 +518,7 @@ package/gcc/10.4.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch Upstr package/gcc/10.4.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch Upstream package/gcc/10.4.0/0004-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch Upstream package/gcc/10.4.0/0005-disable-split-stack-for-non-thread-builds.patch Upstream -package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch Upstream -package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch Upstream -package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch Upstream -package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch Upstream -package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch Upstream -package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch Upstream +package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch Upstream package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch Upstream package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch Upstream diff --git a/package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch b/package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch deleted file mode 100644 index 82a667ab7b98..000000000000 --- a/package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch +++ /dev/null @@ -1,120 +0,0 @@ -From ca2c3a7d3db7a699c358d3408f820396dd536fc8 Mon Sep 17 00:00:00 2001 -From: Segher Boessenkool -Date: Tue, 1 Mar 2022 17:04:29 +0000 -Subject: [PATCH] rs6000: Improve .machine - -This adds more correct .machine for most older CPUs. It should be -conservative in the sense that everything we handled before we handle at -least as well now. This does not yet revamp the server CPU handling, it -is too risky at this point in time. - -Tested on powerpc64-linux {-m32,-m64}. Also manually tested with all --mcpu=, and the output of that passed through the GNU assembler. - -2022-03-04 Segher Boessenkool - - * config/rs6000/rs6000.c (rs6000_machine_from_flags): Restructure a - bit. Handle most older CPUs. - -(cherry picked from commit 77eccbf39ed55297802bb66dff5f62507a7239e3) -(cherry picked from commit fc7e603edc67c66a14f893f3b5a0a34e7d26f77c) -Signed-off-by: Romain Naour ---- - gcc/config/rs6000/rs6000.c | 81 +++++++++++++++++++++++++------------- - 1 file changed, 54 insertions(+), 27 deletions(-) - -diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c -index 0421dc7adb3..0a55c979c36 100644 ---- a/gcc/config/rs6000/rs6000.c -+++ b/gcc/config/rs6000/rs6000.c -@@ -5742,33 +5742,60 @@ const char *rs6000_machine; - const char * - rs6000_machine_from_flags (void) - { -- /* For some CPUs, the machine cannot be determined by ISA flags. We have to -- check them first. */ -- switch (rs6000_cpu) -- { -- case PROCESSOR_PPC8540: -- case PROCESSOR_PPC8548: -- return "e500"; -- -- case PROCESSOR_PPCE300C2: -- case PROCESSOR_PPCE300C3: -- return "e300"; -- -- case PROCESSOR_PPCE500MC: -- return "e500mc"; -- -- case PROCESSOR_PPCE500MC64: -- return "e500mc64"; -- -- case PROCESSOR_PPCE5500: -- return "e5500"; -- -- case PROCESSOR_PPCE6500: -- return "e6500"; -- -- default: -- break; -- } -+ /* e300 and e500 */ -+ if (rs6000_cpu == PROCESSOR_PPCE300C2 || rs6000_cpu == PROCESSOR_PPCE300C3) -+ return "e300"; -+ if (rs6000_cpu == PROCESSOR_PPC8540 || rs6000_cpu == PROCESSOR_PPC8548) -+ return "e500"; -+ if (rs6000_cpu == PROCESSOR_PPCE500MC) -+ return "e500mc"; -+ if (rs6000_cpu == PROCESSOR_PPCE500MC64) -+ return "e500mc64"; -+ if (rs6000_cpu == PROCESSOR_PPCE5500) -+ return "e5500"; -+ if (rs6000_cpu == PROCESSOR_PPCE6500) -+ return "e6500"; -+ -+ /* 400 series */ -+ if (rs6000_cpu == PROCESSOR_PPC403) -+ return "\"403\""; -+ if (rs6000_cpu == PROCESSOR_PPC405) -+ return "\"405\""; -+ if (rs6000_cpu == PROCESSOR_PPC440) -+ return "\"440\""; -+ if (rs6000_cpu == PROCESSOR_PPC476) -+ return "\"476\""; -+ -+ /* A2 */ -+ if (rs6000_cpu == PROCESSOR_PPCA2) -+ return "a2"; -+ -+ /* Cell BE */ -+ if (rs6000_cpu == PROCESSOR_CELL) -+ return "cell"; -+ -+ /* Titan */ -+ if (rs6000_cpu == PROCESSOR_TITAN) -+ return "titan"; -+ -+ /* 500 series and 800 series */ -+ if (rs6000_cpu == PROCESSOR_MPCCORE) -+ return "\"821\""; -+ -+ /* 600 series and 700 series, "classic" */ -+ if (rs6000_cpu == PROCESSOR_PPC601 || rs6000_cpu == PROCESSOR_PPC603 -+ || rs6000_cpu == PROCESSOR_PPC604 || rs6000_cpu == PROCESSOR_PPC604e -+ || rs6000_cpu == PROCESSOR_PPC750 || rs6000_cpu == PROCESSOR_POWERPC) -+ return "ppc"; -+ -+ /* Classic with AltiVec, "G4" */ -+ if (rs6000_cpu == PROCESSOR_PPC7400 || rs6000_cpu == PROCESSOR_PPC7450) -+ return "\"7450\""; -+ -+ /* The older 64-bit CPUs */ -+ if (rs6000_cpu == PROCESSOR_PPC620 || rs6000_cpu == PROCESSOR_PPC630 -+ || rs6000_cpu == PROCESSOR_RS64A || rs6000_cpu == PROCESSOR_POWERPC64) -+ return "ppc64"; - - HOST_WIDE_INT flags = rs6000_isa_flags; - --- -2.34.3 - diff --git a/package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch b/package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch deleted file mode 100644 index 43fed4c19ffc..000000000000 --- a/package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 6de33ed642f119f1e2543095dd56e4a94f97c27f Mon Sep 17 00:00:00 2001 -From: Segher Boessenkool -Date: Fri, 11 Mar 2022 21:15:18 +0000 -Subject: [PATCH] rs6000: Do not use rs6000_cpu for .machine ppc and ppc64 - (PR104829) - -Fixes: 77eccbf39ed5 - -rs6000.h has - #define PROCESSOR_POWERPC PROCESSOR_PPC604 - #define PROCESSOR_POWERPC64 PROCESSOR_RS64A -which means that if you use things like -mcpu=powerpc -mvsx it will no -longer work after my latest .machine patch. This causes GCC build errors -in some cases, not a good idea (even if the errors are actually -pre-existing: using -mvsx with a machine that does not have VSX cannot -work properly). - -2022-03-11 Segher Boessenkool - - PR target/104829 - * config/rs6000/rs6000.c (rs6000_machine_from_flags): Don't output - "ppc" and "ppc64" based on rs6000_cpu. - -(cherry picked from commit 80fcc4b6afee72443bef551064826b3b4b6785e6) -(cherry picked from commit d87e0e297b1cba73a0c055d2a3e9267d288f435a) -Signed-off-by: Romain Naour ---- - gcc/config/rs6000/rs6000.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c -index 0a55c979c36..7e5cdd34840 100644 ---- a/gcc/config/rs6000/rs6000.c -+++ b/gcc/config/rs6000/rs6000.c -@@ -5782,20 +5782,28 @@ rs6000_machine_from_flags (void) - if (rs6000_cpu == PROCESSOR_MPCCORE) - return "\"821\""; - -+#if 0 -+ /* This (and ppc64 below) are disabled here (for now at least) because -+ PROCESSOR_POWERPC, PROCESSOR_POWERPC64, and PROCESSOR_COMMON -+ are #define'd as some of these. Untangling that is a job for later. */ -+ - /* 600 series and 700 series, "classic" */ - if (rs6000_cpu == PROCESSOR_PPC601 || rs6000_cpu == PROCESSOR_PPC603 - || rs6000_cpu == PROCESSOR_PPC604 || rs6000_cpu == PROCESSOR_PPC604e -- || rs6000_cpu == PROCESSOR_PPC750 || rs6000_cpu == PROCESSOR_POWERPC) -+ || rs6000_cpu == PROCESSOR_PPC750) - return "ppc"; -+#endif - - /* Classic with AltiVec, "G4" */ - if (rs6000_cpu == PROCESSOR_PPC7400 || rs6000_cpu == PROCESSOR_PPC7450) - return "\"7450\""; - -+#if 0 - /* The older 64-bit CPUs */ - if (rs6000_cpu == PROCESSOR_PPC620 || rs6000_cpu == PROCESSOR_PPC630 -- || rs6000_cpu == PROCESSOR_RS64A || rs6000_cpu == PROCESSOR_POWERPC64) -+ || rs6000_cpu == PROCESSOR_RS64A) - return "ppc64"; -+#endif - - HOST_WIDE_INT flags = rs6000_isa_flags; - --- -2.34.3 - diff --git a/package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch b/package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch similarity index 95% rename from package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch rename to package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch index 4888f7e32077..f927cd007d13 100644 --- a/package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch +++ b/package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch @@ -1,4 +1,4 @@ -From 7a20b4574f06472086c786bd1b078ee962cdb02c Mon Sep 17 00:00:00 2001 +From 35c0801efa26bf248d278b5711b77a19e95b2f57 Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Tue, 6 Apr 2021 05:47:17 +0900 Subject: [PATCH] or1k: Add mcmodel option to handle large GOTs @@ -28,7 +28,11 @@ gcc/ChangeLog: * config/or1k/or1k.opt (mcmodel=): New option. * doc/invoke.texi (OpenRISC Options): Document mcmodel. +Uptream: eff8110674ef193481d3657456a262beeb9951ff + Signed-off-by: Giulio Benetti +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- gcc/config/or1k/or1k-opts.h | 30 ++++++++++++++++++++++++++++++ gcc/config/or1k/or1k.c | 11 +++++++++-- @@ -166,7 +170,7 @@ index 6bd0f3eee6d..cc23e3b8856 100644 Target RejectNegative Mask(CMOV) Enable generation of conditional move (l.cmov) instructions. By default the diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 35508efb4ef..a1b7608a3aa 100644 +index f1217812280..90c6186fc14 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -1136,7 +1136,8 @@ Objective-C and Objective-C++ Dialects}. @@ -179,7 +183,7 @@ index 35508efb4ef..a1b7608a3aa 100644 @emph{PDP-11 Options} @gccoptlist{-mfpu -msoft-float -mac0 -mno-ac0 -m40 -m45 -m10 @gol -@@ -26443,6 +26444,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli}, +@@ -26444,6 +26445,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli}, @code{l.slli}) instructions. By default extra instructions will be generated to store the immediate to a register first. @@ -196,5 +200,5 @@ index 35508efb4ef..a1b7608a3aa 100644 @end table -- -2.35.1 +2.34.3 diff --git a/package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch b/package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch similarity index 88% rename from package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch rename to package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch index 716f007a24fb..eb4517513567 100644 --- a/package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch +++ b/package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch @@ -1,4 +1,4 @@ -From c544a63928406b706b8493fd9b8ca2136b433cf0 Mon Sep 17 00:00:00 2001 +From f75178ccd2f5e4d73e27cccffffada859b87be7d Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Wed, 21 Apr 2021 05:33:15 +0900 Subject: [PATCH] or1k: Use cmodel=large when building crtstuff @@ -21,7 +21,11 @@ libgcc/ChangeLog: * config.host (or1k-*, tmake_file): Add or1k/t-crtstuff. * config/or1k/t-crtstuff: New file. +Upstream: da8a9d695b3c4b9397b5d9a27660bfa48af8d707 + Signed-off-by: Giulio Benetti +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- libgcc/config.host | 4 ++-- libgcc/config/or1k/t-crtstuff | 2 ++ @@ -29,10 +33,10 @@ Signed-off-by: Giulio Benetti create mode 100644 libgcc/config/or1k/t-crtstuff diff --git a/libgcc/config.host b/libgcc/config.host -index f2dc7e266f4..6f193c32fbd 100644 +index 45f8e19ada4..5523345abb0 100644 --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -1132,12 +1132,12 @@ nios2-*-*) +@@ -1150,12 +1150,12 @@ nios2-*-*) extra_parts="$extra_parts crti.o crtn.o" ;; or1k-*-linux*) @@ -56,5 +60,5 @@ index 00000000000..dcae7f3498e +# Compile crtbeginS.o and crtendS.o with -mcmodel=large +CRTSTUFF_T_CFLAGS_S += -mcmodel=large -- -2.35.1 +2.34.3 diff --git a/package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch similarity index 81% rename from package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch rename to package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch index e33dec3ff6cd..cb407c78fc10 100644 --- a/package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch +++ b/package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -1,4 +1,4 @@ -From 8ef5787701f4d7cf46a27771d38ab54af2499e25 Mon Sep 17 00:00:00 2001 +From 48ced46a5f81f49737ea13d11a099e03062cf141 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 27 Mar 2020 21:23:53 +0100 Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed @@ -8,7 +8,11 @@ is defined. Added the CPP_SPEC definition to correct this. Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 +Upstream: cac2f69cdad434ad5cb60f5fe931d45cd82ef476 + Signed-off-by: Bernd Kuhls +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- gcc/config/or1k/linux.h | 2 ++ 1 file changed, 2 insertions(+) @@ -27,5 +31,5 @@ index 196f3f3c8f0..0cbdc934af1 100644 #define LINK_SPEC "%{h*} \ %{static:-Bstatic} \ -- -2.35.1 +2.34.3 diff --git a/package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch b/package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch similarity index 92% rename from package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch index dba2d02d7f3d..817997e925e3 100644 --- a/package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch +++ b/package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch @@ -1,4 +1,4 @@ -From 3b9d7d397fa6dc290eb05bffca80968efb6ec2e5 Mon Sep 17 00:00:00 2001 +From 590ef1956786bfd49dae7a5e2fed67509d06f36b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 25 Jul 2022 00:29:55 +0200 Subject: [PATCH] disable split-stack for non-thread builds diff --git a/package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch b/package/gcc/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch similarity index 96% rename from package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch rename to package/gcc/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch index 4e93f6ab96fd..88bc26e0d7e9 100644 --- a/package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch +++ b/package/gcc/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch @@ -1,4 +1,4 @@ -From de3f4ee9a5bd2adcb5ff2e1690db2567fda1473c Mon Sep 17 00:00:00 2001 +From 3e878f9d1c473f91a1377193d4d8d2616357bed1 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 28 Jun 2021 13:54:58 +0800 Subject: [PATCH] fixinc: don't "fix" machine names in __has_include(...) @@ -93,10 +93,10 @@ index 5b23a8b640d..404b420f302 100644 with the appropriate underscores, then leave it alone. We want exactly two leading and trailing underscores. */ diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def -index 066bef99162..b7ad6982e96 100644 +index c2f54d1189a..b2841d384f3 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def -@@ -3154,7 +3154,8 @@ fix = { +@@ -3201,7 +3201,8 @@ fix = { c_fix = machine_name; test_text = "/* MACH_DIFF: */\n" @@ -120,5 +120,5 @@ index cf95321fb86..8b3accaf04e 100644 #endif /* MACHINE_NAME_CHECK */ -- -2.37.3 +2.34.3 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index dca1579319ce..b6adf1f127e2 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -87,7 +87,7 @@ config BR2_GCC_VERSION string default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE default "10.4.0" if BR2_GCC_VERSION_10_X - default "11.3.0" if BR2_GCC_VERSION_11_X + default "11.4.0" if BR2_GCC_VERSION_11_X default "12.3.0" if BR2_GCC_VERSION_12_X default "arc-2020.09-release" if BR2_GCC_VERSION_ARC diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 9082d25b78bf..f478962af844 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -2,8 +2,8 @@ sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 gcc-8.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-10.4.0/sha512.sum sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 gcc-10.4.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-11.3.0/sha512.sum -sha512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7 gcc-11.3.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-11.4.0/sha512.sum +sha512 a5018bf1f1fa25ddf33f46e720675d261987763db48e7a5fdf4c26d3150a8abcb82fdc413402df1c32f2e6b057d9bae6bdfa026defc4030e10144a8532e60f14 gcc-11.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-12.3.0/sha512.sum sha512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204 gcc-12.3.0.tar.xz From b2fb3a7e2a06c10092280081e45b2b8841add5d2 Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Mon, 29 May 2023 13:43:56 +0000 Subject: [PATCH 0625/2890] package/earlyoom: fix daemon executable path in the init script earlyoom.mk file explicitly sets 'PREFIX=/usr', and the init script fails to start earlyoom because of a nonexistent executable path: # /etc/init.d/S02earlyoom start start-stop-daemon: unable to stat /bin/earlyoom (No such file or directory) FAIL Signed-off-by: Sergey Bobrenok Signed-off-by: Peter Korsgaard --- package/earlyoom/S02earlyoom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/earlyoom/S02earlyoom b/package/earlyoom/S02earlyoom index c02495af90ec..35624f3c72ff 100644 --- a/package/earlyoom/S02earlyoom +++ b/package/earlyoom/S02earlyoom @@ -9,7 +9,7 @@ EARLYOOM_ARGS="" start() { printf() 'Starting %s: ' "$DAEMON" - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/bin/$DAEMON" \ + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $EARLYOOM_ARGS status=$? if [ "$status" -eq 0 ]; then From 281a80dc934d3e8d8e780b04276cfe38b4bea9d5 Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Mon, 29 May 2023 13:44:00 +0000 Subject: [PATCH 0626/2890] package/earlyoom: restore missing startup message in the init script '/etc/init.d/S02earlyoom start' simply prints 'OK' instead of 'Starting earlyoom: OK' because of a typo in the printf function call. Signed-off-by: Sergey Bobrenok Signed-off-by: Peter Korsgaard --- package/earlyoom/S02earlyoom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/earlyoom/S02earlyoom b/package/earlyoom/S02earlyoom index 35624f3c72ff..ac1734109ef7 100644 --- a/package/earlyoom/S02earlyoom +++ b/package/earlyoom/S02earlyoom @@ -8,7 +8,7 @@ EARLYOOM_ARGS="" [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" start() { - printf() 'Starting %s: ' "$DAEMON" + printf 'Starting %s: ' "$DAEMON" start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $EARLYOOM_ARGS status=$? From 239dd7dcbda1b2c86a29491158fa089e06efca33 Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Mon, 29 May 2023 13:44:02 +0000 Subject: [PATCH 0627/2890] package/earlyoom: unhardcode package version in CFLAGS 'earlyoom --help' still says 'earlyoom 1.6' though it's already version 1.7. '-DVERSION' flag value should be either unhardcoded, either updated with each package version bump. Signed-off-by: Sergey Bobrenok Signed-off-by: Peter Korsgaard --- package/earlyoom/earlyoom.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/earlyoom/earlyoom.mk b/package/earlyoom/earlyoom.mk index c7042a054e0a..808b9c49fa38 100644 --- a/package/earlyoom/earlyoom.mk +++ b/package/earlyoom/earlyoom.mk @@ -11,7 +11,7 @@ EARLYOOM_LICENSE_FILES = LICENSE EARLYOOM_BUILD_TARGETS = earlyoom.service earlyoom EARLYOOM_INSTALL_TARGETS = install-default install-bin -EARLYOOM_CFLAGS = '$(TARGET_CFLAGS) -std=gnu99 -DVERSION=\"1.6\"' +EARLYOOM_CFLAGS = '$(TARGET_CFLAGS) -std=gnu99 -DVERSION=\"$(EARLYOOM_VERSION)\"' EARLYOOM_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ From 91b7bd01eca709c0bd7fa94c147f82082f054c94 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 21:01:07 +0200 Subject: [PATCH 0628/2890] package/python-executing: new package Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-executing/Config.in | 7 +++++++ package/python-executing/python-executing.hash | 5 +++++ package/python-executing/python-executing.mk | 16 ++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-executing/Config.in create mode 100644 package/python-executing/python-executing.hash create mode 100644 package/python-executing/python-executing.mk diff --git a/package/Config.in b/package/Config.in index 0cf2f3998c8d..82aa348455d4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1051,6 +1051,7 @@ menu "External python modules" source "package/python-entrypoints/Config.in" source "package/python-esptool/Config.in" source "package/python-evdev/Config.in" + source "package/python-executing/Config.in" source "package/python-falcon/Config.in" source "package/python-filelock/Config.in" source "package/python-fire/Config.in" diff --git a/package/python-executing/Config.in b/package/python-executing/Config.in new file mode 100644 index 000000000000..e1f8f8efdf2a --- /dev/null +++ b/package/python-executing/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_EXECUTING + bool "python-executing" + help + Get the currently executing AST node of a frame, and other + information. + + https://github.com/alexmojaki/executing diff --git a/package/python-executing/python-executing.hash b/package/python-executing/python-executing.hash new file mode 100644 index 000000000000..40fd43b5fd46 --- /dev/null +++ b/package/python-executing/python-executing.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/executing/json +md5 e6fa9a6abf00555ccc8a6b3524729238 executing-1.2.0.tar.gz +sha256 19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107 executing-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-executing/python-executing.mk b/package/python-executing/python-executing.mk new file mode 100644 index 000000000000..4c968323ea6d --- /dev/null +++ b/package/python-executing/python-executing.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-executing +# +################################################################################ + +PYTHON_EXECUTING_VERSION = 1.2.0 +PYTHON_EXECUTING_SOURCE = executing-$(PYTHON_EXECUTING_VERSION).tar.gz +PYTHON_EXECUTING_SITE = https://files.pythonhosted.org/packages/8f/ac/89ff37d8594b0eef176b7cec742ac868fef853b8e18df0309e3def9f480b +PYTHON_EXECUTING_SETUP_TYPE = setuptools +PYTHON_EXECUTING_LICENSE = MIT +PYTHON_EXECUTING_LICENSE_FILES = LICENSE.txt + +PYTHON_EXECUTING_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) From c8e93f4a6b91ad42add41618b775a30dbfc79338 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 21:01:08 +0200 Subject: [PATCH 0629/2890] package/python-pure-eval: new package Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-pure-eval/Config.in | 6 ++++++ package/python-pure-eval/python-pure-eval.hash | 5 +++++ package/python-pure-eval/python-pure-eval.mk | 16 ++++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-pure-eval/Config.in create mode 100644 package/python-pure-eval/python-pure-eval.hash create mode 100644 package/python-pure-eval/python-pure-eval.mk diff --git a/package/Config.in b/package/Config.in index 82aa348455d4..3da005b5e51f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1190,6 +1190,7 @@ menu "External python modules" source "package/python-psycopg2/Config.in" source "package/python-ptyprocess/Config.in" source "package/python-pudb/Config.in" + source "package/python-pure-eval/Config.in" source "package/python-py/Config.in" source "package/python-pyaes/Config.in" source "package/python-pyalsa/Config.in" diff --git a/package/python-pure-eval/Config.in b/package/python-pure-eval/Config.in new file mode 100644 index 000000000000..f6ccd6056dc1 --- /dev/null +++ b/package/python-pure-eval/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PURE_EVAL + bool "python-pure-eval" + help + Safely evaluate AST nodes without side effects. + + http://github.com/alexmojaki/pure_eval diff --git a/package/python-pure-eval/python-pure-eval.hash b/package/python-pure-eval/python-pure-eval.hash new file mode 100644 index 000000000000..5bf5dcb749cf --- /dev/null +++ b/package/python-pure-eval/python-pure-eval.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pure_eval/json +md5 212fd27ca2c58d9effddec69748d738a pure_eval-0.2.2.tar.gz +sha256 2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3 pure_eval-0.2.2.tar.gz +# Locally computed sha256 checksums +sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-pure-eval/python-pure-eval.mk b/package/python-pure-eval/python-pure-eval.mk new file mode 100644 index 000000000000..f139ea270fcb --- /dev/null +++ b/package/python-pure-eval/python-pure-eval.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-pure-eval +# +################################################################################ + +PYTHON_PURE_EVAL_VERSION = 0.2.2 +PYTHON_PURE_EVAL_SOURCE = pure_eval-$(PYTHON_PURE_EVAL_VERSION).tar.gz +PYTHON_PURE_EVAL_SITE = https://files.pythonhosted.org/packages/97/5a/0bc937c25d3ce4e0a74335222aee05455d6afa2888032185f8ab50cdf6fd +PYTHON_PURE_EVAL_SETUP_TYPE = setuptools +PYTHON_PURE_EVAL_LICENSE = MIT +PYTHON_PURE_EVAL_LICENSE_FILES = LICENSE.txt + +PYTHON_PURE_EVAL_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) From aa5c233c36bcc8fd51c84f7776c1b3a2875a3d98 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 21:01:09 +0200 Subject: [PATCH 0630/2890] package/python-asttokens: new package Signed-off-by: Romain Naour [Peter: fix alphabetical ordering] Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-asttokens/Config.in | 7 +++++++ package/python-asttokens/python-asttokens.hash | 5 +++++ package/python-asttokens/python-asttokens.mk | 16 ++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-asttokens/Config.in create mode 100644 package/python-asttokens/python-asttokens.hash create mode 100644 package/python-asttokens/python-asttokens.mk diff --git a/package/Config.in b/package/Config.in index 3da005b5e51f..bc78acebdac6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -967,6 +967,7 @@ menu "External python modules" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" + source "package/python-asttokens/Config.in" source "package/python-async-generator/Config.in" source "package/python-async-lru/Config.in" source "package/python-async-timeout/Config.in" diff --git a/package/python-asttokens/Config.in b/package/python-asttokens/Config.in new file mode 100644 index 000000000000..2732b8124bce --- /dev/null +++ b/package/python-asttokens/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_ASTTOKENS + bool "python-asttokens" + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Annotate AST trees with source code positions. + + https://github.com/gristlabs/asttokens diff --git a/package/python-asttokens/python-asttokens.hash b/package/python-asttokens/python-asttokens.hash new file mode 100644 index 000000000000..6529e4db412e --- /dev/null +++ b/package/python-asttokens/python-asttokens.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/asttokens/json +md5 a9ae6ae0f85398e511bcb9ec87695eed asttokens-2.2.1.tar.gz +sha256 4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3 asttokens-2.2.1.tar.gz +# Locally computed sha256 checksums +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/python-asttokens/python-asttokens.mk b/package/python-asttokens/python-asttokens.mk new file mode 100644 index 000000000000..8a8ce1ddd92d --- /dev/null +++ b/package/python-asttokens/python-asttokens.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-asttokens +# +################################################################################ + +PYTHON_ASTTOKENS_VERSION = 2.2.1 +PYTHON_ASTTOKENS_SOURCE = asttokens-$(PYTHON_ASTTOKENS_VERSION).tar.gz +PYTHON_ASTTOKENS_SITE = https://files.pythonhosted.org/packages/c8/e3/b0b4f32162621126fbdaba636c152c6b6baec486c99f48686e66343d638f +PYTHON_ASTTOKENS_SETUP_TYPE = setuptools +PYTHON_ASTTOKENS_LICENSE = Apache-2.0 +PYTHON_ASTTOKENS_LICENSE_FILES = LICENSE + +PYTHON_ASTTOKENS_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) From a1c55ea6dd4e7b93e4720206fc1ea390933ef675 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 21:01:10 +0200 Subject: [PATCH 0631/2890] package/python-stack-data: new package Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-stack-data/Config.in | 10 ++++++++++ package/python-stack-data/python-stack-data.hash | 5 +++++ package/python-stack-data/python-stack-data.mk | 14 ++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 package/python-stack-data/Config.in create mode 100644 package/python-stack-data/python-stack-data.hash create mode 100644 package/python-stack-data/python-stack-data.mk diff --git a/package/Config.in b/package/Config.in index bc78acebdac6..ad438667d263 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1310,6 +1310,7 @@ menu "External python modules" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" source "package/python-sqlparse/Config.in" + source "package/python-stack-data/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" diff --git a/package/python-stack-data/Config.in b/package/python-stack-data/Config.in new file mode 100644 index 000000000000..508eb9cf132a --- /dev/null +++ b/package/python-stack-data/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_STACK_DATA + bool "python-stack-data" + select BR2_PACKAGE_PYTHON_ASTTOKENS # runtime + select BR2_PACKAGE_PYTHON_EXECUTING # runtime + select BR2_PACKAGE_PYTHON_PURE_EVAL # runtime + help + Extract data from python stack frames and tracebacks + for informative displays. + + http://github.com/alexmojaki/stack_data diff --git a/package/python-stack-data/python-stack-data.hash b/package/python-stack-data/python-stack-data.hash new file mode 100644 index 000000000000..6decd3ca8eb9 --- /dev/null +++ b/package/python-stack-data/python-stack-data.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/stack_data/json +md5 bf86c3c81a0158e1e7f3979da5a0033b stack_data-0.6.2.tar.gz +sha256 32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815 stack_data-0.6.2.tar.gz +# Locally computed sha256 checksums +sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-stack-data/python-stack-data.mk b/package/python-stack-data/python-stack-data.mk new file mode 100644 index 000000000000..494ce8f4546d --- /dev/null +++ b/package/python-stack-data/python-stack-data.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-stack-data +# +################################################################################ + +PYTHON_STACK_DATA_VERSION = 0.6.2 +PYTHON_STACK_DATA_SOURCE = stack_data-$(PYTHON_STACK_DATA_VERSION).tar.gz +PYTHON_STACK_DATA_SITE = https://files.pythonhosted.org/packages/db/18/aa7f2b111aeba2cd83503254d9133a912d7f61f459a0c8561858f0d72a56 +PYTHON_STACK_DATA_SETUP_TYPE = setuptools +PYTHON_STACK_DATA_LICENSE = MIT +PYTHON_STACK_DATA_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From 8d93c999a39344bb3b73a21490cc4e0122ef5923 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 21:01:11 +0200 Subject: [PATCH 0632/2890] package/ipython: add missing dependencies As reported [1], the test TestIPythonPy3 fail since it was updated to 8.6.0 release just after 2022.11. ModuleNotFoundError: No module named 'stack_data' Indeed there is no such python3-stack-data in Buildroot. For example, Fedora packaging added python3-stack-data while updating to ipython 8.0.1. With python-stack-data added, the test TestIPythonPy3 still fail with: ModuleNotFoundError: No module named 'sqlite3' Since ipython 8 sqlite3 fallback imports has been removed [2]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819089 [1] http://lists.busybox.net/pipermail/buildroot/2023-May/668086.html [2] https://github.com/ipython/ipython/commit/7a0bdabecfa745b60c3a711e1da2df378687e746 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/python-ipython/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in index 3de49ae57420..c217efcfd1ee 100644 --- a/package/python-ipython/Config.in +++ b/package/python-ipython/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_IPYTHON bool "python-ipython" + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_BACKCALL # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime select BR2_PACKAGE_PYTHON_JEDI # runtime @@ -7,6 +8,7 @@ config BR2_PACKAGE_PYTHON_IPYTHON select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime select BR2_PACKAGE_PYTHON_PEXPECT # runtime + select BR2_PACKAGE_PYTHON_STACK_DATA # runtime select BR2_PACKAGE_PYTHON_TRAITLETS # runtime help IPython is a command shell for interactive computing in From be861867cfac5fb7cc2ce986d24f447b22568da0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Jun 2023 22:00:07 +0200 Subject: [PATCH 0633/2890] .checkpackageignore: update after gcc 11.x bump The bump to 11.4.0 in commit f1e3d02cd4d missed 0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch, so add it back again to keep checkpackage happy. Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.checkpackageignore b/.checkpackageignore index ea5f6aafd3d2..401b24b5d680 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -518,6 +518,7 @@ package/gcc/10.4.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch Upstr package/gcc/10.4.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch Upstream package/gcc/10.4.0/0004-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch Upstream package/gcc/10.4.0/0005-disable-split-stack-for-non-thread-builds.patch Upstream +package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch Upstream package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch Upstream package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch Upstream From 0cd8abda1bb64a87a5195fa6fc214b6b47147acb Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 18 May 2023 14:07:47 -0700 Subject: [PATCH 0634/2890] package/openjdk{-bin}: security bump versions to 11.0.19+7 and 17.0.7+7 Fixes the following security issues: * CVEs - CVE-2023-21930 - CVE-2023-21937 - CVE-2023-21938 - CVE-2023-21939 - CVE-2023-21954 - CVE-2023-21967 - CVE-2023-21968 * Security fixes - JDK-8287404: Improve ping times - JDK-8288436: Improve Xalan supports - JDK-8294474: Better AES support - JDK-8295304: Runtime support improvements - JDK-8296676, JDK-8296622: Improve String platform support - JDK-8296684: Improve String platform support - JDK-8296692: Improve String platform support - JDK-8296832: Improve Swing platform support - JDK-8297371: Improve UTF8 representation redux - JDK-8298191: Enhance object reclamation process - JDK-8298310: Enhance TLS session negotiation - JDK-8298667: Improved path handling - JDK-8299129: Enhance NameService lookups For details, see the announcements: https://mail.openjdk.org/pipermail/jdk-updates-dev/2023-April/021899.html https://mail.openjdk.org/pipermail/jdk-updates-dev/2023-April/021900.html Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 +- package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- .../0001-Add-ARCv2-ISA-processors-support-to-Zero.patch | 8 ++++---- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) rename package/openjdk/{17.0.6+10 => 17.0.7+7}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (94%) diff --git a/.checkpackageignore b/.checkpackageignore index 401b24b5d680..d6d8d886b48f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1129,7 +1129,7 @@ package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch Upstream package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch Upstream package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch Upstream package/open2300/0001-fix-makefile.patch Upstream -package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream +package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream package/openldap/0001-fix_cross_strip.patch Upstream package/openldap/0002-fix-bignum.patch Upstream package/openldap/0003-disable-docs.patch Upstream diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 241ca34a0437..eb9d7396e3ec 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,10 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289 OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz -sha256 9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz +sha256 e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz +sha256 0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz -sha256 04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz +sha256 5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581 OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz +sha256 0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index c3eb0b05e60f..dad846534b11 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.6_10 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.7_7 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.18_10 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.19_7 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 94% rename from package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index dfd3b07beac7..a8ea5aff65be 100644 --- a/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1676,6 +1676,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1700,6 +1703,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1728,6 +1732,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,7 +95,7 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1750,7 +1756,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 0a67e7a3ecc1..3b362896282d 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz -sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz +sha256 43b80a5aec5fce908e80858e9b34efdf1b49255a12ce303650325af65141d3e8 openjdk-17.0.7+7.tar.gz +sha256 25fd9ab3042a284aa4e6348969403016404bc2706a4a02c149a0054fbe477337 openjdk-11.0.19+7.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 0fe506bbfd05..39d461a87cde 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.6+10 +OPENJDK_VERSION_MINOR = 0.7+7 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.18+10 +OPENJDK_VERSION_MINOR = 0.19+7 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) From bab89b35f018a332c7d42ed6e6cb8d72fdeac4b2 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 16 May 2023 13:57:50 -0700 Subject: [PATCH 0635/2890] package/containerd: bump version to v1.6.21 https://github.com/containerd/containerd/releases/tag/v1.6.21 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 65a87f25fab2..345a7b16ffa5 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 819086ccdca44cfc5f108e226c7a9294d8fad3eb32031a621623da80dedbfb11 containerd-1.6.20.tar.gz +sha256 9452e95455d03a00d78ae0587595d0c18555bae7912068269efa25a724efe713 containerd-1.6.21.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index bc1dd58611f4..83489a3abfa2 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.20 +CONTAINERD_VERSION = 1.6.21 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From 502dcf46af1be88a4ac5973efc9f8eb95c461bf6 Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Tue, 23 May 2023 10:56:20 +0200 Subject: [PATCH 0636/2890] package/mpd: update to version 0.23.13 - Bug fixes in input, archive/zzip, database/simple, decoder, output/pipewire, process termination - determine systemd unit directories via pkg-config - support libfmt 10 Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.13/NEWS Commit: https://github.com/MusicPlayerDaemon/MPD/commit/9027e5c Tested on: i386 (build, run) Aarch64 (build, run) Signed-off-by: Andreas Ziegler Signed-off-by: Peter Korsgaard --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 2521238f64df..8683b02e3b2c 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7 mpd-0.23.12.tar.xz +sha256 a96b01e6fbbb7e8ab25eb7c15d5c811c62eb19b76d143a802f51674791f1d519 mpd-0.23.13.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 6c25c9b46f93..d73072a439be 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).12 +MPD_VERSION = $(MPD_VERSION_MAJOR).13 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt From a46ac2346558d05afe405dda3730169df4b677d2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 31 May 2023 20:34:53 +0200 Subject: [PATCH 0637/2890] package/openvpn: bump version to 2.6.4 Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.6/ChangeLog https://github.com/OpenVPN/openvpn/blob/release/2.6/Changes.rst Added mandatory dependency to libcap-ng due to upstream commit https://github.com/OpenVPN/openvpn/commit/2e359a088226ab1e5ee41fbab27d38d8a8d192ac Added optional dependency to libnl due to upstream commit https://github.com/OpenVPN/openvpn/commit/f63c9b1edbda41491ba2e05ff706bf0233903cb6 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/openvpn/Config.in | 1 + package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in index cd8b1db99664..5aa2386d362c 100644 --- a/package/openvpn/Config.in +++ b/package/openvpn/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_OPENVPN bool "openvpn" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBCAP_NG select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 0959b7f83809..8078b411578b 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 08340a389905c84196b6cd750add1bc0fa2d46a1afebfd589c24120946c13e68 openvpn-2.5.7.tar.gz +sha256 371a2a323a99a79299b9b4caa4a31bc7b2cdff63236e68d429f3ee50e75f3dd4 openvpn-2.6.4.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 5c602e0448fc..920677e170bd 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,9 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.7 +OPENVPN_VERSION = 2.6.4 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases -OPENVPN_DEPENDENCIES = host-pkgconf +OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL OPENVPN_CPE_ID_VENDOR = openvpn @@ -16,6 +16,13 @@ OPENVPN_CONF_OPTS = \ $(if $(BR2_STATIC_LIBS),--disable-plugins) OPENVPN_CONF_ENV = NETSTAT=/bin/netstat +ifeq ($(BR2_PACKAGE_LIBNL),y) +OPENVPN_CONF_OPTS += --enable-dco +OPENVPN_DEPENDENCIES += libnl +else +OPENVPN_CONF_OPTS += --disable-dco +endif + ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y) OPENVPN_CONF_OPTS += \ --enable-small \ From e7d40576fad6784164b668776d81547edd8fafdd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 1 Jun 2023 18:44:00 +0200 Subject: [PATCH 0638/2890] package/libcurl: bump version to 8.1.2 Changelog: https://curl.se/changes.html#8_1_2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 12d356118b72..18b2dbfd8625 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.1.1.tar.xz.asc +# https://curl.se/download/curl-8.1.2.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 08a948e061929645597c1ef7194e07b308b22084ff03fa7400b465e6c05149e5 curl-8.1.1.tar.xz +sha256 31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6 curl-8.1.2.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 93e839798bf1..2be3415cb875 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.1.1 +LIBCURL_VERSION = 8.1.2 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From e2f4ac35fe338e5adc36b0644ed9040574595496 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 3 Jun 2023 12:18:29 +0200 Subject: [PATCH 0639/2890] package/sdl2_net: fix license hash after 2.2.0 bump Fixes: http://autobuild.buildroot.net/results/37e5075a5c790d5c96bdc72c44d4362a16ae00bb/ Commit b41ff7dd46c5 (package/sdl2_net: bump version to 2.2.0) forgot to update the license hash / filename, breaking the build. Upstream renamed COPYING.txt to LICENSE.txt, changed white space and updated the copyright years, so update the hash to match: diff -uw sdl2_net-2.0.1/COPYING.txt sdl2_net-2.2.0/LICENSE.txt --- sdl2_net-2.0.1/COPYING.txt 2016-01-03 08:57:09.000000000 +0100 +++ sdl2_net-2.2.0/LICENSE.txt 2022-08-17 18:55:22.000000000 +0200 @@ -1,6 +1,4 @@ -/* - SDL_net: An example cross-platform network library for use with SDL - Copyright (C) 1997-2016 Sam Lantinga +Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -17,4 +15,4 @@ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. -*/ + Signed-off-by: Peter Korsgaard --- package/sdl2_net/sdl2_net.hash | 2 +- package/sdl2_net/sdl2_net.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sdl2_net/sdl2_net.hash b/package/sdl2_net/sdl2_net.hash index c614aee25557..eac0ac707f7a 100644 --- a/package/sdl2_net/sdl2_net.hash +++ b/package/sdl2_net/sdl2_net.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 4e4a891988316271974ff4e9585ed1ef729a123d22c08bd473129179dc857feb SDL2_net-2.2.0.tar.gz -sha256 f09845a238245402a8b8388db6634d8a5b2c3e1dc098f16f9d8c74a276ef4594 COPYING.txt +sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt diff --git a/package/sdl2_net/sdl2_net.mk b/package/sdl2_net/sdl2_net.mk index 6adf8eb77919..85676af08117 100644 --- a/package/sdl2_net/sdl2_net.mk +++ b/package/sdl2_net/sdl2_net.mk @@ -8,7 +8,7 @@ SDL2_NET_VERSION = 2.2.0 SDL2_NET_SOURCE = SDL2_net-$(SDL2_NET_VERSION).tar.gz SDL2_NET_SITE = http://www.libsdl.org/projects/SDL_net/release SDL2_NET_LICENSE = Zlib -SDL2_NET_LICENSE_FILES = COPYING.txt +SDL2_NET_LICENSE_FILES = LICENSE.txt SDL2_NET_INSTALL_STAGING = YES SDL2_NET_DEPENDENCIES = sdl2 host-pkgconf From 4ba8a13d7bbfcdfce85f6a38ec4f5df291f25c7b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Jun 2023 12:55:09 +0200 Subject: [PATCH 0640/2890] package/minidlna: bump version to 1.3.3 Release notes: https://sourceforge.net/p/minidlna/git/ci/master/tree/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/minidlna/minidlna.hash | 6 +++--- package/minidlna/minidlna.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/minidlna/minidlna.hash b/package/minidlna/minidlna.hash index e55e5473d3d0..b78dd5b4ddab 100644 --- a/package/minidlna/minidlna.hash +++ b/package/minidlna/minidlna.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.2/ -sha1 71750adadc34490d52f0b9a930c2731a47f9772d minidlna-1.3.2.tar.gz +# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.3/ +sha1 2d42028d2ca5ae04affdb96cb414314867e179ea minidlna-1.3.3.tar.gz # Locally computed -sha256 222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0 minidlna-1.3.2.tar.gz +sha256 39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4 minidlna-1.3.3.tar.gz sha256 79146b7f558e56510b9a714ff75318c05ab93aeccfd6597497b9bce212cf92ea COPYING sha256 94876d7886116e176e702b4902bd9f19731a6883db5f229ac2a7058a22aa6529 LICENCE.miniupnpd diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 6ca72d924083..1609695ebff5 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINIDLNA_VERSION = 1.3.2 +MINIDLNA_VERSION = 1.3.3 MINIDLNA_SITE = https://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION) MINIDLNA_LICENSE = GPL-2.0, BSD-3-Clause MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd From 6aa637737fd04cbf0f69fb0d2b9eeeba029c8570 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Wed, 31 May 2023 12:40:08 +0100 Subject: [PATCH 0641/2890] board/kria/kv260/kv260.sh: remove trailing spaces Signed-off-by: Neal Frager [Arnout: update .checkpackageignore] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 2 +- board/zynqmp/kria/kv260/kv260.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index d6d8d886b48f..567e22520c45 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -103,7 +103,7 @@ board/versal/post-build.sh Shellcheck board/versal/post-image.sh Shellcheck TrailingSpace board/zynq/post-build.sh Shellcheck board/zynq/post-image.sh Shellcheck -board/zynqmp/kria/kv260/kv260.sh Shellcheck TrailingSpace +board/zynqmp/kria/kv260/kv260.sh Shellcheck board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch ApplyOrder Upstream board/zynqmp/post-build.sh Shellcheck board/zynqmp/post-image.sh Shellcheck diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh index e3467f30686c..e03d67d8b0a5 100755 --- a/board/zynqmp/kria/kv260/kv260.sh +++ b/board/zynqmp/kria/kv260/kv260.sh @@ -1,8 +1,8 @@ #!/bin/sh # This is a temporary work around for generating kv260 u-boot.itb. -# The problem is there is no way to currently configure u-boot to apply -# the carrier board dtb overlay during build, so all kv260 carrier board +# The problem is there is no way to currently configure u-boot to apply +# the carrier board dtb overlay during build, so all kv260 carrier board # drivers are missing. # This will be removed when u-boot can build the kv260 u-boot.itb natively. From 37e23e0dd7187bb27abb329f4fbb29c59c31c672 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 27 May 2023 15:43:26 +0200 Subject: [PATCH 0642/2890] support/testing/tests/package/test_kexec.py: fix kexec test for qemu 5.2 The commit f69c972ae61 (support/testing/tests/package/test_kexec.py: new runtime test) was tested locally with a qemu version (>= 7.x) more recent than the one available in our buidroot/base Docker image (5.2). As a consequence, that test fails to run in gitlab-ci as reported by [1]. Remove "dtb-kaslr-seed=off" from the Qemu command line and pass a custom devicetree to qemu virt machine. This devicetree is based on qemu aarch64 5.2 dts with kaslr-seed set 0. The qemu aarch64 devicetree has been exported [2] and updated with the following method: qemu-system-aarch64 -machine virt -machine dumpdtb=qemu-aarch64-virt-5.2-machine.dtb dtc -I dtb qemu-aarch64-virt-5.2-machine.dtb > qemu-aarch64-virt-5.2-machine.dts edit the dts and replace kaslr-seed parameter by "kaslr-seed = <0 0>;" As soon as our buidroot/base Docker image is updated and a newer qemu version is available, we can safely revert this change and use the initial method. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819092 [1] http://lists.busybox.net/pipermail/buildroot/2023-May/668091.html [2] https://u-boot.readthedocs.io/en/latest/develop/devicetree/dt_qemu.html#obtaining-the-qemu-devicetree Signed-off-by: Romain Naour Cc: Signed-off-by: Julien Olivain Tested-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- support/testing/tests/package/test_kexec.py | 15 +- .../qemu-aarch64-virt-5.2-machine.dts | 373 ++++++++++++++++++ 2 files changed, 384 insertions(+), 4 deletions(-) create mode 100644 support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts diff --git a/support/testing/tests/package/test_kexec.py b/support/testing/tests/package/test_kexec.py index 77e383373e79..51d43b0572f3 100644 --- a/support/testing/tests/package/test_kexec.py +++ b/support/testing/tests/package/test_kexec.py @@ -24,6 +24,8 @@ class TestKexec(infra.basetest.BRTest): BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" + BR2_LINUX_KERNEL_DTS_SUPPORT=y + BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="{}" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_KEXEC=y @@ -31,20 +33,25 @@ class TestKexec(infra.basetest.BRTest): BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set """.format( - infra.filepath("tests/package/test_kexec/linux-kexec.fragment") + infra.filepath("tests/package/test_kexec/linux-kexec.fragment"), + infra.filepath("tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts") ) def test_run(self): hda = os.path.join(self.builddir, "images", "rootfs.ext4") kern = os.path.join(self.builddir, "images", "Image") + dtb = os.path.join(self.builddir, "images", "qemu-aarch64-virt-5.2-machine.dtb") # Notes: # Sufficient memory is needed to load the kernel: having at # least 512MB works. kexec could silently fail if not enough # memory is present. KASLR needs to be disabled for the test: - # we pass "nokaslr" to kernel bootargs, and also pass - # "dtb-kaslr-seed=off" to qemu virt machine. + # we pass "nokaslr" to kernel bootargs, and also pass a custom + # devicetree to qemu virt machine. This devicetree is based on + # qemu aarch64 5.2 dts with kaslr-seed set 0. + # With newer qemu >= 7.0 we can disable KASLR from the qemu + # command line using "dtb-kaslr-seed=off". bootargs = ["root=/dev/vda console=ttyAMA0 nokaslr"] - qemu_opts = ["-M", "virt,dtb-kaslr-seed=off", "-cpu", "cortex-a57", "-m", "512M", + qemu_opts = ["-M", "virt", "-dtb", dtb, "-cpu", "cortex-a57", "-m", "512M", "-drive", f"file={hda},if=virtio,format=raw"] self.emulator.boot(arch="aarch64", kernel=kern, diff --git a/support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts b/support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts new file mode 100644 index 000000000000..ad96a51c40c8 --- /dev/null +++ b/support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts @@ -0,0 +1,373 @@ +/dts-v1/; + +/ { + interrupt-parent = <0x8001>; + #size-cells = <0x02>; + #address-cells = <0x02>; + compatible = "linux,dummy-virt"; + + psci { + migrate = <0x84000005>; + cpu_on = <0x84000003>; + cpu_off = <0x84000002>; + cpu_suspend = <0x84000001>; + method = "hvc"; + compatible = "arm,psci-0.2\0arm,psci"; + }; + + memory@40000000 { + reg = <0x00 0x40000000 0x00 0x8000000>; + device_type = "memory"; + }; + + platform@c000000 { + interrupt-parent = <0x8001>; + ranges = <0x00 0x00 0xc000000 0x2000000>; + #address-cells = <0x01>; + #size-cells = <0x01>; + compatible = "qemu,platform\0simple-bus"; + }; + + fw-cfg@9020000 { + dma-coherent; + reg = <0x00 0x9020000 0x00 0x18>; + compatible = "qemu,fw-cfg-mmio"; + }; + + virtio_mmio@a000000 { + dma-coherent; + interrupts = <0x00 0x10 0x01>; + reg = <0x00 0xa000000 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000200 { + dma-coherent; + interrupts = <0x00 0x11 0x01>; + reg = <0x00 0xa000200 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000400 { + dma-coherent; + interrupts = <0x00 0x12 0x01>; + reg = <0x00 0xa000400 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000600 { + dma-coherent; + interrupts = <0x00 0x13 0x01>; + reg = <0x00 0xa000600 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000800 { + dma-coherent; + interrupts = <0x00 0x14 0x01>; + reg = <0x00 0xa000800 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000a00 { + dma-coherent; + interrupts = <0x00 0x15 0x01>; + reg = <0x00 0xa000a00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000c00 { + dma-coherent; + interrupts = <0x00 0x16 0x01>; + reg = <0x00 0xa000c00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000e00 { + dma-coherent; + interrupts = <0x00 0x17 0x01>; + reg = <0x00 0xa000e00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001000 { + dma-coherent; + interrupts = <0x00 0x18 0x01>; + reg = <0x00 0xa001000 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001200 { + dma-coherent; + interrupts = <0x00 0x19 0x01>; + reg = <0x00 0xa001200 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001400 { + dma-coherent; + interrupts = <0x00 0x1a 0x01>; + reg = <0x00 0xa001400 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001600 { + dma-coherent; + interrupts = <0x00 0x1b 0x01>; + reg = <0x00 0xa001600 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001800 { + dma-coherent; + interrupts = <0x00 0x1c 0x01>; + reg = <0x00 0xa001800 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001a00 { + dma-coherent; + interrupts = <0x00 0x1d 0x01>; + reg = <0x00 0xa001a00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001c00 { + dma-coherent; + interrupts = <0x00 0x1e 0x01>; + reg = <0x00 0xa001c00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001e00 { + dma-coherent; + interrupts = <0x00 0x1f 0x01>; + reg = <0x00 0xa001e00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002000 { + dma-coherent; + interrupts = <0x00 0x20 0x01>; + reg = <0x00 0xa002000 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002200 { + dma-coherent; + interrupts = <0x00 0x21 0x01>; + reg = <0x00 0xa002200 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002400 { + dma-coherent; + interrupts = <0x00 0x22 0x01>; + reg = <0x00 0xa002400 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002600 { + dma-coherent; + interrupts = <0x00 0x23 0x01>; + reg = <0x00 0xa002600 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002800 { + dma-coherent; + interrupts = <0x00 0x24 0x01>; + reg = <0x00 0xa002800 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002a00 { + dma-coherent; + interrupts = <0x00 0x25 0x01>; + reg = <0x00 0xa002a00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002c00 { + dma-coherent; + interrupts = <0x00 0x26 0x01>; + reg = <0x00 0xa002c00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002e00 { + dma-coherent; + interrupts = <0x00 0x27 0x01>; + reg = <0x00 0xa002e00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003000 { + dma-coherent; + interrupts = <0x00 0x28 0x01>; + reg = <0x00 0xa003000 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003200 { + dma-coherent; + interrupts = <0x00 0x29 0x01>; + reg = <0x00 0xa003200 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003400 { + dma-coherent; + interrupts = <0x00 0x2a 0x01>; + reg = <0x00 0xa003400 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003600 { + dma-coherent; + interrupts = <0x00 0x2b 0x01>; + reg = <0x00 0xa003600 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003800 { + dma-coherent; + interrupts = <0x00 0x2c 0x01>; + reg = <0x00 0xa003800 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003a00 { + dma-coherent; + interrupts = <0x00 0x2d 0x01>; + reg = <0x00 0xa003a00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003c00 { + dma-coherent; + interrupts = <0x00 0x2e 0x01>; + reg = <0x00 0xa003c00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003e00 { + dma-coherent; + interrupts = <0x00 0x2f 0x01>; + reg = <0x00 0xa003e00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + gpio-keys { + #address-cells = <0x01>; + #size-cells = <0x00>; + compatible = "gpio-keys"; + + poweroff { + gpios = <0x8003 0x03 0x00>; + linux,code = <0x74>; + label = "GPIO Key Poweroff"; + }; + }; + + pl061@9030000 { + phandle = <0x8003>; + clock-names = "apb_pclk"; + clocks = <0x8000>; + interrupts = <0x00 0x07 0x04>; + gpio-controller; + #gpio-cells = <0x02>; + compatible = "arm,pl061\0arm,primecell"; + reg = <0x00 0x9030000 0x00 0x1000>; + }; + + pcie@10000000 { + interrupt-map-mask = <0x1800 0x00 0x00 0x07>; + interrupt-map = <0x00 0x00 0x00 0x01 0x8001 0x00 0x00 0x00 0x03 0x04 0x00 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x04 0x04 0x00 0x00 0x00 0x03 0x8001 0x00 0x00 0x00 0x05 0x04 0x00 0x00 0x00 0x04 0x8001 0x00 0x00 0x00 0x06 0x04 0x800 0x00 0x00 0x01 0x8001 0x00 0x00 0x00 0x04 0x04 0x800 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x05 0x04 0x800 0x00 0x00 0x03 0x8001 0x00 0x00 0x00 0x06 0x04 0x800 0x00 0x00 0x04 0x8001 0x00 0x00 0x00 0x03 0x04 0x1000 0x00 0x00 0x01 0x8001 0x00 0x00 0x00 0x05 0x04 0x1000 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x06 0x04 0x1000 0x00 0x00 0x03 0x8001 0x00 0x00 0x00 0x03 0x04 0x1000 0x00 0x00 0x04 0x8001 0x00 0x00 0x00 0x04 0x04 0x1800 0x00 0x00 0x01 0x8001 0x00 0x00 0x00 0x06 0x04 0x1800 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x03 0x04 0x1800 0x00 0x00 0x03 0x8001 0x00 0x00 0x00 0x04 0x04 0x1800 0x00 0x00 0x04 0x8001 0x00 0x00 0x00 0x05 0x04>; + #interrupt-cells = <0x01>; + ranges = <0x1000000 0x00 0x00 0x00 0x3eff0000 0x00 0x10000 0x2000000 0x00 0x10000000 0x00 0x10000000 0x00 0x2eff0000 0x3000000 0x80 0x00 0x80 0x00 0x80 0x00>; + reg = <0x40 0x10000000 0x00 0x10000000>; + msi-parent = <0x8002>; + dma-coherent; + bus-range = <0x00 0xff>; + linux,pci-domain = <0x00>; + #size-cells = <0x02>; + #address-cells = <0x03>; + device_type = "pci"; + compatible = "pci-host-ecam-generic"; + }; + + pl031@9010000 { + clock-names = "apb_pclk"; + clocks = <0x8000>; + interrupts = <0x00 0x02 0x04>; + reg = <0x00 0x9010000 0x00 0x1000>; + compatible = "arm,pl031\0arm,primecell"; + }; + + pl011@9000000 { + clock-names = "uartclk\0apb_pclk"; + clocks = <0x8000 0x8000>; + interrupts = <0x00 0x01 0x04>; + reg = <0x00 0x9000000 0x00 0x1000>; + compatible = "arm,pl011\0arm,primecell"; + }; + + pmu { + }; + + intc@8000000 { + phandle = <0x8001>; + reg = <0x00 0x8000000 0x00 0x10000 0x00 0x8010000 0x00 0x10000>; + compatible = "arm,cortex-a15-gic"; + ranges; + #size-cells = <0x02>; + #address-cells = <0x02>; + interrupt-controller; + #interrupt-cells = <0x03>; + + v2m@8020000 { + phandle = <0x8002>; + reg = <0x00 0x8020000 0x00 0x1000>; + msi-controller; + compatible = "arm,gic-v2m-frame"; + }; + }; + + flash@0 { + bank-width = <0x04>; + reg = <0x00 0x00 0x00 0x4000000 0x00 0x4000000 0x00 0x4000000>; + compatible = "cfi-flash"; + }; + + cpus { + #size-cells = <0x00>; + #address-cells = <0x01>; + + cpu@0 { + reg = <0x00>; + compatible = "arm,cortex-a15"; + device_type = "cpu"; + }; + }; + + timer { + interrupts = <0x01 0x0d 0x104 0x01 0x0e 0x104 0x01 0x0b 0x104 0x01 0x0a 0x104>; + always-on; + compatible = "arm,armv7-timer"; + }; + + apb-pclk { + phandle = <0x8000>; + clock-output-names = "clk24mhz"; + clock-frequency = <0x16e3600>; + #clock-cells = <0x00>; + compatible = "fixed-clock"; + }; + + chosen { + stdout-path = "/pl011@9000000"; + /* Buildroot specific: KASLR needs to be disabled for the Kexec test. */ + kaslr-seed = <0 0>; + }; +}; From 465f670e6cd550660e8b0b935f03a2be275b0c53 Mon Sep 17 00:00:00 2001 From: Witold Lipieta Date: Fri, 26 May 2023 11:42:19 +0200 Subject: [PATCH 0643/2890] package/python-matplotlib: add Pillow dependency Pillow is mandatory dependency since version 3.3.0. Signed-off-by: Witold Lipieta Signed-off-by: Arnout Vandecappelle --- package/python-matplotlib/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index b93677766274..8a9281b8e7fa 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_KIWISOLVER # runtime select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PILLOW # runtime select BR2_PACKAGE_PYTHON_PYPARSING # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_QHULL From 1c54f2170b32da05dbec8b410de3a5cba916c9e9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 May 2023 15:16:42 +0200 Subject: [PATCH 0644/2890] support/testing: test_clang: update to the next LTS kernel (4.19.x) The kernel 4.16.7 curently used by the test doesn't build with host bison (GNU Bison 3.7.5) probably due a missing fix [1] in 4.16.x branch. Since kernel 4.16 is EOL, bump to the next LTS kernel (4.19.x) in order to ease backport to previous Buildroot releases. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4114986744 [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d59fbbd09d5d6bdf4ea1f0b4090d175e081ff421 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle --- support/testing/tests/package/test_clang.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_clang.py b/support/testing/tests/package/test_clang.py index df3990c6be82..f36faa059a54 100644 --- a/support/testing/tests/package/test_clang.py +++ b/support/testing/tests/package/test_clang.py @@ -14,7 +14,7 @@ class TestClangCompilerRT(infra.basetest.BRTest): BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.283" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From 558afd87d943ec39880ab98704f0d41c6b0e2817 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 18:25:06 +0200 Subject: [PATCH 0645/2890] package/kodi-skin-confluence: bump version to Nexus branch Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/kodi-skin-confluence/kodi-skin-confluence.hash | 2 +- package/kodi-skin-confluence/kodi-skin-confluence.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.hash b/package/kodi-skin-confluence/kodi-skin-confluence.hash index c840e5b161b9..449a2113deda 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.hash +++ b/package/kodi-skin-confluence/kodi-skin-confluence.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c57b9a303ad1ebf14ad487901e5da15eba7b3a40304046974fad1d64fb7b8b57 kodi-skin-confluence-e6d31bc84eea73a04b2a23358929d5276be832b8.tar.gz +sha256 1d55079d2b021b16ae8494497684abab184a86302426af588655577a641074ac kodi-skin-confluence-a155597cb6bb0f9d46b26ad881be1148929a03af.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.txt diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.mk b/package/kodi-skin-confluence/kodi-skin-confluence.mk index c32718fd1058..43d0c4bff689 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.mk +++ b/package/kodi-skin-confluence/kodi-skin-confluence.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SKIN_CONFLUENCE_VERSION = e6d31bc84eea73a04b2a23358929d5276be832b8 +KODI_SKIN_CONFLUENCE_VERSION = a155597cb6bb0f9d46b26ad881be1148929a03af KODI_SKIN_CONFLUENCE_SITE = $(call github,xbmc,skin.confluence,$(KODI_SKIN_CONFLUENCE_VERSION)) KODI_SKIN_CONFLUENCE_LICENSE = GPL-2.0 KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt From 51b60c8acf3f4b534d0954b801f1034491b59c94 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 17:33:47 +0200 Subject: [PATCH 0646/2890] package/mesa3d: needs gcc >= 8 Needed since upstream commit https://github.com/Mesa3D/mesa/commit/f9057cea517e01e05f08f00a741aad5bae154d62 which was first released with mesa3d-22.3.0, added to buildroot with commit e4a1183d8f7d8422dbc23432248b984745a428b7. Fixes: http://autobuild.buildroot.net/results/011/01109560288f933019eea726a91c4109fbcca794/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/intel-mediadriver/Config.in | 5 +++-- package/mesa3d/Config.in | 16 +++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in index 537e4abd2f77..c59437ec73e5 100644 --- a/package/intel-mediadriver/Config.in +++ b/package/intel-mediadriver/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER depends on BR2_x86_64 depends on !BR2_STATIC_LIBS # mesa3d, libva depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # mesa3d depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d @@ -28,7 +29,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER_GEN8 endif # BR2_PACKAGE_INTEL_MEDIADRIVER -comment "intel-mediadriver needs a toolchain w/ dynamic library, C++, NPTL" +comment "intel-mediadriver needs a toolchain w/ dynamic library, gcc >= 8, C++, NPTL" depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 9ac946269a98..dfd0dc105dc0 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -4,7 +4,7 @@ menuconfig BR2_PACKAGE_MESA3D depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !BR2_m68k || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # m68k needs gcc >= 7.x + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND @@ -24,7 +24,6 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future @@ -33,10 +32,9 @@ config BR2_PACKAGE_MESA3D_LLVM depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm select BR2_PACKAGE_LLVM -comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" +comment "llvm support needs a toolchain w/ wchar, threads, C++, dynamic library, host gcc >= 5" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ || !BR2_HOST_GCC_AT_LEAST_5 @@ -391,11 +389,7 @@ config BR2_PACKAGE_PROVIDES_LIBOPENCL endif # BR2_PACKAGE_MESA3D -comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library" +comment "mesa3d needs a toolchain w/ gcc >=8, C++, NPTL, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_TOOLCHAIN_HAS_SYNC_1 - -comment "mesa3d needs a toolchain w/ gcc >= 7" - depends on BR2_m68k - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 From 11db2d6fde313fc832baef38a25b4a24c31375ce Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 18:03:58 +0200 Subject: [PATCH 0647/2890] package/mesa3d: fix build error with the i915 Gallium driver The error was introduced by mesa3d commit https://cgit.freedesktop.org/mesa/mesa/commit/?id=dfd20f002f388be3f168938bc1f25e91bb08bf98 which was first introduced in mesa3d 23.0.0, added with buildroot commit 89944e2c459d45dd4271c49e35dd4a13dfd850a4 Fixes: http://autobuild.buildroot.net/results/9c1/9c1407ca5be221dbb3ee03d2a95ada65bb7eb36b/ Signed-off-by: Bernd Kuhls [Arnout: - rename 0005 -> 0006 - another patch was added in parallel; - use gitlab instead of cgit for upstream link ] Signed-off-by: Arnout Vandecappelle --- ...5-Gallium-driver-includes-Intel-sour.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch diff --git a/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch b/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch new file mode 100644 index 000000000000..6831bdafd363 --- /dev/null +++ b/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch @@ -0,0 +1,46 @@ +From cd861b7f38e448822ce765aee61304d1e0a3a8b5 Mon Sep 17 00:00:00 2001 +From: James Knight +Date: Thu, 13 Apr 2023 16:38:51 -0400 +Subject: meson: ensure i915 Gallium driver includes Intel sources + +Ensure builds flag the use of Intel sources when the i915 Gallium driver +is configured (`-Dgallium-drivers=i915`). Otherwise, a build may fail if +other Intel-based configuration options are not enabled: + + ./src/gallium/winsys/i915/drm/meson.build:21:0: ERROR: Unknown variable "libintel_common". + +Signed-off-by: James Knight +Part-of: + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/cd861b7f38e448822ce765aee61304d1e0a3a8b5 + +Signed-off-by: Bernd Kuhls +--- + meson.build | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +(limited to 'meson.build') + +diff --git a/meson.build b/meson.build +index 23d2d965b37..a3e3c5478a8 100644 +--- a/meson.build ++++ b/meson.build +@@ -245,7 +245,14 @@ with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental') + with_any_vk = _vulkan_drivers.length() != 0 + + with_any_broadcom = with_gallium_vc4 or with_gallium_v3d or with_broadcom_vk +-with_any_intel = with_intel_vk or with_intel_hasvk or with_gallium_iris or with_gallium_crocus or with_intel_tools ++with_any_intel = [ ++ with_gallium_crocus, ++ with_gallium_i915, ++ with_gallium_iris, ++ with_intel_hasvk, ++ with_intel_tools, ++ with_intel_vk, ++].contains(true) + + if with_swrast_vk and not with_gallium_softpipe + error('swrast vulkan requires gallium swrast') +-- +cgit v1.2.1 + From f3b46aa2aa5636a5d6d578b6960dc380740fd775 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 16 May 2023 21:48:53 +0200 Subject: [PATCH 0648/2890] package/vdr: Fix patch for uclibc build uClibc-ng 1.0.42 added support for getloadavg: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=ad3a130dad88ad7a59dcd965b0cf9bd0d713595e leading to build errors of the vdr package: skinlcars.c:1105:12: error: 'int getloadavg(double*, int)' was declared 'extern' and later 'static' [-fpermissive] since its version bump in buildroot: https://git.busybox.net/buildroot/commit/?id=61ae6add9e5d4761536fa4ff24150d5f8f82a61d Fixes: http://autobuild.buildroot.net/results/d3a/d3a65044fabdafa1b6d75a508eae006a2cfebdc0/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/vdr/0001-getloadavg.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vdr/0001-getloadavg.patch b/package/vdr/0001-getloadavg.patch index 9e6316e28425..f6ba84c9e51e 100644 --- a/package/vdr/0001-getloadavg.patch +++ b/package/vdr/0001-getloadavg.patch @@ -14,7 +14,7 @@ diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c +/* uclibc and dietlibc do not have this junk -ReneR */ +#if defined (__UCLIBC__) || defined (__dietlibc__) -+static int getloadavg (double loadavg[], int nelem) ++int getloadavg (double loadavg[], int nelem) +{ + int fd; + From c9b2e252ca2eb76fc49eb7aafe0dfbc674b2c743 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 16 May 2023 21:48:54 +0200 Subject: [PATCH 0649/2890] package/vdr: reformatted patches git-formatted patches due to the upstream repo using git: http://git.tvdr.de/?p=vdr.git Sent patches upstream and added Upstream: tags. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 3 -- ...compat.patch => 0002-Fix-musl-build.patch} | 49 ++++++++++++------ package/vdr/0003-Include-limits.h.patch | 51 +++++++++++++++++++ package/vdr/0003-include-missing-limits.patch | 30 ----------- ...at_cntr-is-an-internal-symbol-of-som.patch | 2 + 5 files changed, 87 insertions(+), 48 deletions(-) rename package/vdr/{0002-musl-compat.patch => 0002-Fix-musl-build.patch} (77%) create mode 100644 package/vdr/0003-Include-limits.h.patch delete mode 100644 package/vdr/0003-include-missing-limits.patch diff --git a/.checkpackageignore b/.checkpackageignore index 567e22520c45..10e70f078770 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1590,9 +1590,6 @@ package/vde2/0001-no-cxx.patch Upstream package/vde2/0002-fstp-Add-static-to-inline-functions.patch Upstream package/vde2/0003-vde_l3-Add-static-to-inline-functions.patch Upstream package/vdr/0001-getloadavg.patch Upstream -package/vdr/0002-musl-compat.patch Upstream -package/vdr/0003-include-missing-limits.patch Upstream -package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch Upstream package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch Upstream package/vlc/0002-automake-add-subdir-objects-option.patch Upstream package/vlc/0003-build-use-pkg-config-to-get-tremor-libs.patch Upstream diff --git a/package/vdr/0002-musl-compat.patch b/package/vdr/0002-Fix-musl-build.patch similarity index 77% rename from package/vdr/0002-musl-compat.patch rename to package/vdr/0002-Fix-musl-build.patch index b6f8f414a965..8c0b8d663bc5 100644 --- a/package/vdr/0002-musl-compat.patch +++ b/package/vdr/0002-Fix-musl-build.patch @@ -1,12 +1,28 @@ -Fix musl build +From fb44386acc2497ac250364bc08cebc26ded816cf Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter +Date: Tue, 16 May 2023 19:57:39 +0200 +Subject: [PATCH] Fix musl build Downloaded from https://git.alpinelinux.org/aports/tree/community/vdr/musl-compat.patch +Initial commit: +https://git.alpinelinux.org/aports/commit/?id=140248605cee4a0160f80b47ce77a823be2f740a + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029744.html + Signed-off-by: Bernd Kuhls +--- + i18n.h | 2 +- + osd.c | 2 +- + thread.c | 4 +++- + tools.c | 4 ++-- + tools.h | 14 ++++++++++++-- + vdr.c | 6 ++++++ + 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/i18n.h b/i18n.h -index f8ad9de..b002bbf 100644 +index 03deb6f2..85ce4077 100644 --- a/i18n.h +++ b/i18n.h @@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void); @@ -19,7 +35,7 @@ index f8ad9de..b002bbf 100644 ///< the current language. If no translation is available, the original ///< string will be returned. diff --git a/osd.c b/osd.c -index 524700a..ef975f5 100644 +index 47bda686..0d360c81 100644 --- a/osd.c +++ b/osd.c @@ -12,7 +12,7 @@ @@ -32,10 +48,10 @@ index 524700a..ef975f5 100644 #include "tools.h" diff --git a/thread.c b/thread.c -index 47eb977..58dba43 100644 +index 93eb8c0d..6e854541 100644 --- a/thread.c +++ b/thread.c -@@ -155,7 +155,9 @@ cRwLock::cRwLock(bool PreferWriter) +@@ -160,7 +160,9 @@ cRwLock::cRwLock(bool PreferWriter) writeLockThreadId = 0; pthread_rwlockattr_t attr; pthread_rwlockattr_init(&attr); @@ -45,7 +61,7 @@ index 47eb977..58dba43 100644 pthread_rwlock_init(&rwlock, &attr); } -@@ -205,7 +207,7 @@ cMutex::cMutex(void) +@@ -210,7 +212,7 @@ cMutex::cMutex(void) locked = 0; pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); @@ -55,10 +71,10 @@ index 47eb977..58dba43 100644 } diff --git a/tools.c b/tools.c -index 754673d..fef9d2d 100644 +index d04033b1..8b161eec 100644 --- a/tools.c +++ b/tools.c -@@ -640,7 +640,7 @@ char *ReadLink(const char *FileName) +@@ -672,7 +672,7 @@ char *ReadLink(const char *FileName) { if (!FileName) return NULL; @@ -67,7 +83,7 @@ index 754673d..fef9d2d 100644 if (!TargetName) { if (errno == ENOENT) // file doesn't exist TargetName = strdup(FileName); -@@ -1528,7 +1528,7 @@ +@@ -1562,7 +1562,7 @@ cReadDir::~cReadDir() struct dirent *cReadDir::Next(void) { if (directory) { @@ -77,7 +93,7 @@ index 754673d..fef9d2d 100644 #else while ((result = readdir(directory)) != NULL) { diff --git a/tools.h b/tools.h -index 73cca5a..03f5fd1 100644 +index ff6169ee..60eda179 100644 --- a/tools.h +++ b/tools.h @@ -28,6 +28,16 @@ @@ -97,7 +113,7 @@ index 73cca5a..03f5fd1 100644 typedef unsigned char uchar; extern int SysLogLevel; -@@ -400,7 +410,7 @@ +@@ -444,7 +454,7 @@ class cReadDir { private: DIR *directory; struct dirent *result; @@ -106,7 +122,7 @@ index 73cca5a..03f5fd1 100644 union { // according to "The GNU C Library Reference Manual" struct dirent d; char b[offsetof(struct dirent, d_name) + NAME_MAX + 1]; -@@ -738,7 +748,7 @@ public: +@@ -818,7 +828,7 @@ public: data[i] = T(0); size = 0; } @@ -116,10 +132,10 @@ index 73cca5a..03f5fd1 100644 qsort(data, size, sizeof(T), Compare); } diff --git a/vdr.c b/vdr.c -index 8a49471..c2a82aa 100644 +index 1bdc51ab..0f426e61 100644 --- a/vdr.c +++ b/vdr.c -@@ -670,12 +670,18 @@ int main(int argc, char *argv[]) +@@ -661,12 +661,18 @@ int main(int argc, char *argv[]) } } else if (Terminal) { @@ -137,4 +153,7 @@ index 8a49471..c2a82aa 100644 +#endif } - isyslog("VDR version %s started", VDRVERSION); + // Set user id in case we were started as root: +-- +2.39.2 + diff --git a/package/vdr/0003-Include-limits.h.patch b/package/vdr/0003-Include-limits.h.patch new file mode 100644 index 000000000000..7ddfd1703c53 --- /dev/null +++ b/package/vdr/0003-Include-limits.h.patch @@ -0,0 +1,51 @@ +From a4a3d9b012c12cd8aaa2526f0eacdcffcdd9f8f1 Mon Sep 17 00:00:00 2001 +From: Roberto Oliveira +Date: Tue, 16 May 2023 20:01:18 +0200 +Subject: [PATCH] Include limits.h + +vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined +in limits.h. +Needs to be explicitly included on ppc64le and for all archs for debug build. + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch + +Initial commits: +https://git.alpinelinux.org/aports/commit/?id=c9d8942ccf4825fd734b5f37157a49fc4f0b4339 +https://git.alpinelinux.org/aports/commit/?id=47965644c390b1be1117769b1e08b31858267e9a + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029743.html + +Signed-off-by: Bernd Kuhls +--- + config.h | 1 + + tools.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/config.h b/config.h +index 72dd3d2a..b9ea769f 100644 +--- a/config.h ++++ b/config.h +@@ -19,6 +19,7 @@ + #include "i18n.h" + #include "font.h" + #include "tools.h" ++#include + + // VDR's own version number: + +diff --git a/tools.c b/tools.c +index 8b161eec..56a2e0dd 100644 +--- a/tools.c ++++ b/tools.c +@@ -27,6 +27,7 @@ extern "C" { + #include + #include "i18n.h" + #include "thread.h" ++#include + + int SysLogLevel = 3; + +-- +2.39.2 + diff --git a/package/vdr/0003-include-missing-limits.patch b/package/vdr/0003-include-missing-limits.patch deleted file mode 100644 index c2efe291e6a4..000000000000 --- a/package/vdr/0003-include-missing-limits.patch +++ /dev/null @@ -1,30 +0,0 @@ -vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined -in limits.h. -Needs to be explicitly included on ppc64le and for all archs for debug build. - -Downloaded from -https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch - -Signed-off-by: Bernd Kuhls ----- - ---- a/config.h -+++ b/config.h -@@ -19,6 +19,7 @@ - #include "i18n.h" - #include "font.h" - #include "tools.h" -+#include - - // VDR's own version number: - ---- a/tools.c -+++ b/tools.c -@@ -27,6 +27,7 @@ - #include - #include "i18n.h" - #include "thread.h" -+#include - - int SysLogLevel = 3; - diff --git a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch index 9cc45a96c16f..7b1a4c2c05e5 100644 --- a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch +++ b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch @@ -10,6 +10,8 @@ anything because musl has a basic NLS implementation. Even gettext-tiny defines _nl_msg_cat_cntr as a dummy symbol in its stub libintl-musl implementation. +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029745.html + Signed-off-by: Thomas Petazzoni --- i18n.c | 2 ++ From 579f5a9782ee8694f4939c6a4f3efe51b476b487 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 16 May 2023 21:48:55 +0200 Subject: [PATCH 0650/2890] package/vdr: fix musl build Fixes: http://autobuild.buildroot.net/results/bdacedd845a2bf4db9826f0d3868f6b48d456d2a/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/vdr/0005-Fix-musl-build.patch | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/vdr/0005-Fix-musl-build.patch diff --git a/package/vdr/0005-Fix-musl-build.patch b/package/vdr/0005-Fix-musl-build.patch new file mode 100644 index 000000000000..390e78eab56f --- /dev/null +++ b/package/vdr/0005-Fix-musl-build.patch @@ -0,0 +1,37 @@ +From 075472ec580e03cc89971f0c118cb363776a304d Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Tue, 16 May 2023 20:22:12 +0200 +Subject: [PATCH] Fix musl build + +malloc_trim is a GNU extension and therefore not present in non-glibc C +libraries such as musl. Wrapping this in an ifdef fixes musl builds. + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029742.html + +Signed-off-by: Bernd Kuhls +--- + vdr.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/vdr.c b/vdr.c +index 0f426e61..bc4902de 100644 +--- a/vdr.c ++++ b/vdr.c +@@ -1588,12 +1588,14 @@ int main(int argc, char *argv[]) + cSchedules::Cleanup(); + // Plugins housekeeping: + PluginManager.Housekeeping(); ++#if defined(__GLIBC__) + // Memory cleanup: + static time_t LastMemoryCleanup = 0; + if ((Now - LastMemoryCleanup) > MEMCLEANUPDELTA) { + malloc_trim(0); + LastMemoryCleanup = Now; + } ++#endif + } + } + +-- +2.39.2 + From d2c1d8dfb5233acf90da6a3b26526fc9ceebe2df Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Sun, 7 May 2023 18:53:36 +0200 Subject: [PATCH 0651/2890] kexec: fix sys/random.h with uclibc Fixes: http://autobuild.buildroot.net/results/b5a/b5a46cc164cb0fe6bf37dacb917b3664d2710a4a Signed-off-by: Laurent Vivier Signed-off-by: Arnout Vandecappelle --- ...1-m68k-fix-getrandom-use-with-uclibc.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/kexec/0001-m68k-fix-getrandom-use-with-uclibc.patch diff --git a/package/kexec/0001-m68k-fix-getrandom-use-with-uclibc.patch b/package/kexec/0001-m68k-fix-getrandom-use-with-uclibc.patch new file mode 100644 index 000000000000..6661349aba75 --- /dev/null +++ b/package/kexec/0001-m68k-fix-getrandom-use-with-uclibc.patch @@ -0,0 +1,36 @@ +From 491439a5c55b18dce96b522f3a603faaf1908ede Mon Sep 17 00:00:00 2001 +From: Laurent Vivier +Date: Fri, 21 Apr 2023 18:22:07 +0200 +Subject: [PATCH] m68k: fix getrandom() use with uclibc + +With uclibc, getrandom() is only defined with _GNU_SOURCE, fix that: + +kexec/arch/m68k/bootinfo.c: In function 'bootinfo_add_rng_seed': +kexec/arch/m68k/bootinfo.c:231:13: warning: implicit declaration of function 'getrandom'; did you mean 'srandom'? [-Wimplicit-function-declaration] + 231 | if (getrandom(bi->rng_seed.data, RNG_SEED_LEN, GRND_NONBLOCK) != RNG_SEED_LEN) { + | ^~~~~~~~~ + | srandom +kexec/arch/m68k/bootinfo.c:231:56: error: 'GRND_NONBLOCK' undeclared (first use in this function) + 231 | if (getrandom(bi->rng_seed.data, RNG_SEED_LEN, GRND_NONBLOCK) != RNG_SEED_LEN) { + | ^~~~~~~~~~~~~ + +Fixes: b9de05184816 ("m68k: pass rng seed via BI_RNG_SEED") +Upstream: https://lore.kernel.org/kexec/20230422095904.1303434-1-laurent@vivier.eu/ +Cc: Jason@zx2c4.com +Signed-off-by: Laurent Vivier +--- + kexec/arch/m68k/bootinfo.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kexec/arch/m68k/bootinfo.c b/kexec/arch/m68k/bootinfo.c +index 086a34bdfdeb..5afd212d9d34 100644 +--- a/kexec/arch/m68k/bootinfo.c ++++ b/kexec/arch/m68k/bootinfo.c +@@ -1,3 +1,4 @@ ++#define _GNU_SOURCE + + #include + #include +-- +2.40.0 + From 2cd0059419ced783957a6c2d18bac529173fdfcd Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Sun, 4 Jun 2023 13:47:28 +0700 Subject: [PATCH 0652/2890] package/git: bump to version 2.41.0 Bump the package version to 2.41.0. For the release announcement and notes, see [1]. Link: https://lore.kernel.org/git/xmqqleh3a3wm.fsf@gitster.g/ [1] Signed-off-by: Bagas Sanjaya Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 1efa95ed44b3..91d723ecd1c5 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 4893b8b98eefc9fdc4b0e7ca249e340004faa7804a433d17429e311e1fef21d2 git-2.40.1.tar.xz +sha256 e748bafd424cfe80b212cbc6f1bbccc3a47d4862fb1eb7988877750478568040 git-2.41.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index ba86915b369b..99646b10dc1e 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.40.1 +GIT_VERSION = 2.41.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 2e511e791daab76b1da42cb3a69a4d7c2baeb85d Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Wed, 24 May 2023 10:42:35 +0200 Subject: [PATCH 0653/2890] package/gnuplot: bump version to 5.4.7 Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/gnuplot/gnuplot.hash | 8 ++++---- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index de0741d609df..2f482ca43416 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.6/ -md5 da719235bb2f46830f9d2101d04b14a5 gnuplot-5.4.6.tar.gz -sha1 31ea0c00af5c156e5d068e3b1cc2fb1847f471ab gnuplot-5.4.6.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.7/ +md5 cdc9bb3ac0cc7e717246ed3df2d6ffa2 gnuplot-5.4.7.tar.gz +sha1 6e68f94af822ff56549beab3a465c2fe976d3b34 gnuplot-5.4.7.tar.gz # Locally computed -sha256 02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419 gnuplot-5.4.6.tar.gz +sha256 318a1501c9e659f39cf05ee5268335671bddc6c20eae06851f262fde27c2e739 gnuplot-5.4.7.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index c49fbc497d4c..23fbae10a9b3 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.6 +GNUPLOT_VERSION = 5.4.7 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright From eb940ab43d6ec8b0703182fd491e3ef9c57acc6e Mon Sep 17 00:00:00 2001 From: itzwam Date: Wed, 24 May 2023 15:20:36 +0200 Subject: [PATCH 0654/2890] package/bird: bump to version 2.0.12 Bugfix release, with "Important bugfixes". For details, see the announcement: https://bird.network.cz/pipermail/bird-users/2023-January/016560.html Signed-off-by: Itz 'toinux' Wam Signed-off-by: Peter Korsgaard --- package/bird/bird.hash | 2 +- package/bird/bird.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bird/bird.hash b/package/bird/bird.hash index 3e00a1993db6..a62fbba630e9 100644 --- a/package/bird/bird.hash +++ b/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 60a7b83b67b9d089d2a745a11fddd12461f631abc7b645b6c085adf90b3f55d6 bird-2.0.11.tar.gz +sha256 3ec462a237d06d1f4455d6ec00a42f0b1686061fc988e5c89a841d01dd753b53 bird-2.0.12.tar.gz sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/package/bird/bird.mk b/package/bird/bird.mk index 1295358fb9de..f1b2ee6c5ea0 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIRD_VERSION = 2.0.11 +BIRD_VERSION = 2.0.12 BIRD_SITE = https://bird.network.cz/download BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README From 6b26999abca4e9fb4c2050123af028b80fa0c990 Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Thu, 18 May 2023 12:20:20 +0200 Subject: [PATCH 0655/2890] package/lightning: bump version to 2.2.1 And restore support for MIPS64, which is supported by Lightning. Signed-off-by: Paul Cercueil Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../0001-lib-jit_disasm.c-fix-build.patch | 42 ------------------- package/lightning/Config.in | 6 ++- package/lightning/lightning.hash | 2 +- package/lightning/lightning.mk | 2 +- 5 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 package/lightning/0001-lib-jit_disasm.c-fix-build.patch diff --git a/.checkpackageignore b/.checkpackageignore index 81cf1afe6be3..963efac992d3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -893,7 +893,6 @@ package/libwebsock/0002-fix-ssl.patch Upstream package/libwebsock/0003-fix-incorrect-inline.patch Upstream package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch Upstream package/libyuv/0001-i386-sse2.patch Upstream -package/lightning/0001-lib-jit_disasm.c-fix-build.patch Upstream package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch Upstream package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch Upstream diff --git a/package/lightning/0001-lib-jit_disasm.c-fix-build.patch b/package/lightning/0001-lib-jit_disasm.c-fix-build.patch deleted file mode 100644 index 9e79be91a0a3..000000000000 --- a/package/lightning/0001-lib-jit_disasm.c-fix-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0d828c96c373c34b201ca7ea37b61c1e3b0485cd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 19 Dec 2022 23:55:31 +0100 -Subject: [PATCH] lib/jit_disasm.c: fix build - -Fix the following build failure raised since -http://git.savannah.gnu.org/cgit/lightning.git/commit/?id=837c7a1e8d08fb9294578dc84694077f4d6106f9: - -jit_disasm.c: In function 'fprintf_styled': -jit_disasm.c:57:27: error: parameter name omitted - 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) - | ^~~~~~ -jit_disasm.c:57:35: error: parameter name omitted - 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) - | ^~~~~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/e15e01e98e0d8c873efd3f512b671d98e4daf6c0 - -Signed-off-by: Fabrice Fontaine -[yann.morin.1998@free.fr: make it a backport now it's applied upstream] -Signed-off-by: Yann E. MORIN ---- - lib/jit_disasm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/jit_disasm.c b/lib/jit_disasm.c -index 58a269b..68c966d 100644 ---- a/lib/jit_disasm.c -+++ b/lib/jit_disasm.c -@@ -54,7 +54,7 @@ static FILE *disasm_stream; - #endif - - #if BINUTILS_2_38 --static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) -+static int fprintf_styled(void * stream, enum disassembler_style style, const char* fmt, ...) - { - va_list args; - int r; --- -2.25.1 - diff --git a/package/lightning/Config.in b/package/lightning/Config.in index 3cf7c28ae29b..e42730addb43 100644 --- a/package/lightning/Config.in +++ b/package/lightning/Config.in @@ -1,12 +1,14 @@ comment "lightning needs a toolchain w/ dynamic library, threads" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ - BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 + BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 || \ + BR2_mips64 || BR2_mips64el depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_LIGHTNING bool "lightning" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ - BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 + BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 || \ + BR2_mips64 || BR2_mips64el depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS help diff --git a/package/lightning/lightning.hash b/package/lightning/lightning.hash index 998ae3743bb0..97b391674cf2 100644 --- a/package/lightning/lightning.hash +++ b/package/lightning/lightning.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4e3984ff1ccf0ba30a985211d40fc5c06b25f014ebdf3d80d0fe3d0c80dd7c0e lightning-2.2.0.tar.gz +sha256 98671681d5684770ccb06a07fa3b8f032a454bdb56eafc18e6fab04459ea3caa lightning-2.2.1.tar.gz sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/lightning/lightning.mk b/package/lightning/lightning.mk index 8ab2ca1f9db8..4a8c7e5efd28 100644 --- a/package/lightning/lightning.mk +++ b/package/lightning/lightning.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIGHTNING_VERSION = 2.2.0 +LIGHTNING_VERSION = 2.2.1 LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning LIGHTNING_LICENSE = LGPL-3.0+ LIGHTNING_LICENSE_FILES = COPYING.LESSER From 108bb3395b5ed2abe1c3c5a20fb9205dfc672b54 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 17 May 2023 23:46:48 +0200 Subject: [PATCH 0656/2890] package/z3: bump to version 4.12.2 For change log since v4.12.1, see: - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.2 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/z3/z3.hash | 2 +- package/z3/z3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/z3/z3.hash b/package/z3/z3.hash index 8a511c3fe5d1..bddf3066ba51 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 z3-4.12.1.tar.gz +sha256 9f58f3710bd2094085951a75791550f547903d75fe7e2fcb373c5f03fc761b8f z3-4.12.2.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index 45c412ad126e..501d9ee61aa7 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.12.1 +Z3_VERSION = 4.12.2 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt From fe567a81846b35b17c6989d759c2d893e46bc023 Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Thu, 18 May 2023 23:06:57 +0200 Subject: [PATCH 0657/2890] package/strace: bump to version 6.3 Signed-off-by: Paul Cercueil Signed-off-by: Peter Korsgaard --- package/strace/strace.hash | 4 ++-- package/strace/strace.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index d49abf1f161a..555d074c5d5d 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.2/strace-6.2.tar.xz.asc -sha256 0c7d38a449416268d3004029a220a15a77c2206a03cc88120f37f46e949177e8 strace-6.2.tar.xz +# https://strace.io/files/6.3/strace-6.3.tar.xz.asc +sha256 e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731 strace-6.3.tar.xz sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 730a91d27721..6514bfe3545e 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.2 +STRACE_VERSION = 6.3 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From 25e485f462b7459dda6793d7eaa385c8617febff Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 4 Jun 2023 13:10:30 +0200 Subject: [PATCH 0658/2890] Update for 2023.05-rc3 Signed-off-by: Peter Korsgaard --- CHANGES | 12 ++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 44 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index b0875759fff9..1f540b8f4b37 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,15 @@ +2023.05-rc3, released June 4th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: bird, containerd, earlyoom, gcc, + ipython, kexec, kodi-skin-confluence, libcurl, libopenssl, + mesa3d, minidlna, mpd, openjdk, openjdk-bin, + python-matplotlib, sdl2_net, vdr + + New packages: python-asttokens, python-executing, + python-pure-eval, python-stack-data + 2023.05-rc2, released May 28th, 2023 Fixes all over the tree. diff --git a/Makefile b/Makefile index 2e1eff2f3c15..ce2f34dc5ea8 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.05-rc2 +export BR2_VERSION := 2023.05-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1685305000 +BR2_VERSION_EPOCH = 1685877000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 75b445d06995..5e9280626de9 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@

            buildroot-2022.11.2.tar.xz

            --> -

            Latest release candidate: 2023.05-rc2

            +

            Latest release candidate: 2023.05-rc3

            - +
            - +
            -

            buildroot-2023.05-rc2.tar.gz

            -

            PGP signature

            +

            buildroot-2023.05-rc3.tar.gz

            +

            PGP signature

            - +
            - +
            -

            buildroot-2023.05-rc2.tar.xz

            -

            PGP signature

            +

            buildroot-2023.05-rc3.tar.xz

            +

            PGP signature

            diff --git a/docs/website/news.html b/docs/website/news.html index 28d0b8395267..7523bc57d9fe 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

            News

              +
            • +
              +
              +
              +

              2023.05-rc3 released

              +

              4 June 2023

              +
              +
              +

              2023.05-rc3 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

              + +

              Head to the downloads page to pick up the + 2023.05-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

              +
              +
              +
              • +
            • From c29bf1d2db5afb8a0109260ed2477fa8fc49c2ba Mon Sep 17 00:00:00 2001 From: Titouan Christophe Date: Mon, 5 Jun 2023 08:24:51 +0200 Subject: [PATCH 0659/2890] package/redis: security bump to v7.0.11 From the release notes (see https://github.com/redis/redis/blob/7.0/00-RELEASENOTES): ================================================================================ Redis 7.0.11 Released Mon Apr 17 16:00:00 IST 2023 ================================================================================ Upgrade urgency: SECURITY, contains fixes to security issues. Security Fixes: * (CVE-2023-28856) Authenticated users can use the HINCRBYFLOAT command to create an invalid hash field that will crash Redis on access ... ================================================================================ Redis 7.0.10 Released Mon Mar 20 16:00:00 IST 2023 ================================================================================ Upgrade urgency: SECURITY, contains fixes to security issues. Security Fixes: * (CVE-2023-28425) Specially crafted MSETNX command can lead to assertion and denial-of-service ... ================================================================================ Redis 7.0.9 Released Tue Feb 28 12:00:00 IST 2023 ================================================================================ Upgrade urgency: SECURITY, contains fixes to security issues. Security Fixes: * (CVE-2023-25155) Specially crafted SRANDMEMBER, ZRANDMEMBER, and HRANDFIELD commands can trigger an integer overflow, resulting in a runtime assertion and termination of the Redis server process. * (CVE-2022-36021) String matching commands (like SCAN or KEYS) with a specially crafted pattern to trigger a denial-of-service attack on Redis, causing it to hang and consume 100% CPU time. ... ================================================================================ Redis 7.0.8 Released Mon Jan 16 12:00:00 IDT 2023 ================================================================================ Upgrade urgency: SECURITY, contains fixes to security issues. Security Fixes: * (CVE-2022-35977) Integer overflow in the Redis SETRANGE and SORT/SORT_RO commands can drive Redis to OOM panic * (CVE-2023-22458) Integer overflow in the Redis HRANDFIELD and ZRANDMEMBER commands can lead to denial-of-service ... Signed-off-by: Titouan Christophe Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index eb8c21be9850..69bfc1475fc7 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 8d327d7e887d1bb308fc37aaf717a0bf79f58129e3739069aaeeae88955ac586 redis-7.0.7.tar.gz +sha256 ce250d1fba042c613de38a15d40889b78f7cb6d5461a27e35017ba39b07221e3 redis-7.0.11.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index b08be1153879..e5d3de8eb9be 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.0.7 +REDIS_VERSION = 7.0.11 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From 35dea785ef6a4c3f3faa91b20da60aef15d1bcdd Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 3 Jun 2023 23:06:42 +0200 Subject: [PATCH 0660/2890] package/perl-http-message: add missing reverse dependency from perl-clone Commit [1] added dependency on perl-clone but forgot to propagate the reverse dependency on !BR2_STATIC_LIBS. Fixes: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PERL_CLONE Depends on [n]: BR2_PACKAGE_PERL [=y] && !BR2_STATIC_LIBS [=y] Selected by [y]: - BR2_PACKAGE_PERL_HTTP_MESSAGE [=y] && BR2_PACKAGE_PERL [=y] http://autobuild.buildroot.org/results/5d5/5d503aaa94b56523c684be7946123921747ebf52 [1] 742258fec06df18782e4bd75b00ca530120312cb Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/perl-http-cookies/Config.in | 4 ++++ package/perl-http-daemon/Config.in | 4 ++++ package/perl-http-message/Config.in | 4 ++++ package/perl-http-negotiate/Config.in | 4 ++++ package/perl-plack/Config.in | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/package/perl-http-cookies/Config.in b/package/perl-http-cookies/Config.in index 3ca461bf8337..147d9521bb74 100644 --- a/package/perl-http-cookies/Config.in +++ b/package/perl-http-cookies/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_PERL_HTTP_COOKIES bool "perl-http-cookies" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime help HTTP cookie jars. https://github.com/libwww-perl/HTTP-Cookies + +comment "perl-http-cookies needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-daemon/Config.in b/package/perl-http-daemon/Config.in index 0c7ffe723aab..4d6277a79961 100644 --- a/package/perl-http-daemon/Config.in +++ b/package/perl-http-daemon/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_HTTP_DAEMON bool "perl-http-daemon" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime select BR2_PACKAGE_PERL_LWP_MEDIATYPES # runtime @@ -7,3 +8,6 @@ config BR2_PACKAGE_PERL_HTTP_DAEMON A simple http server class. https://github.com/libwww-perl/HTTP-Daemon + +comment "perl-http-daemon needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-message/Config.in b/package/perl-http-message/Config.in index 3c6849487ade..e2cb42f94116 100644 --- a/package/perl-http-message/Config.in +++ b/package/perl-http-message/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_HTTP_MESSAGE bool "perl-http-message" + depends on !BR2_STATIC_LIBS # perl-clone select BR2_PACKAGE_PERL_CLONE # runtime select BR2_PACKAGE_PERL_ENCODE_LOCALE # runtime select BR2_PACKAGE_PERL_HTTP_DATE # runtime @@ -10,3 +11,6 @@ config BR2_PACKAGE_PERL_HTTP_MESSAGE HTTP style message (base class). https://github.com/libwww-perl/HTTP-Message + +comment "perl-http-message needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-negotiate/Config.in b/package/perl-http-negotiate/Config.in index c519ede2df01..2e82ce5ad27f 100644 --- a/package/perl-http-negotiate/Config.in +++ b/package/perl-http-negotiate/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_PERL_HTTP_NEGOTIATE bool "perl-http-negotiate" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime help choose a variant to serve. https://metacpan.org/release/HTTP-Negotiate + +comment "perl-http-negotiate needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-plack/Config.in b/package/perl-plack/Config.in index c81ac4a444f6..420f8257e5ee 100644 --- a/package/perl-plack/Config.in +++ b/package/perl-plack/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_PLACK bool "perl-plack" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_APACHE_LOGFORMAT_COMPILER # runtime select BR2_PACKAGE_PERL_COOKIE_BAKER # runtime select BR2_PACKAGE_PERL_DEVEL_STACKTRACE # runtime @@ -19,3 +20,6 @@ config BR2_PACKAGE_PERL_PLACK toolkit). https://github.com/plack/Plack + +comment "perl-plack needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS From e0e64e9edeafd6467d20d211463ad28b20705503 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Jun 2023 21:53:45 +0200 Subject: [PATCH 0661/2890] support/testing/infra/emulator.py: fix typo in comment Artefact (British) and Artifact (American) are both valid spelling but ARTIFACTS_URL is used in the emulator code. Surprisingly, the url actually use "artefacts" http://autobuild.buildroot.net/artefacts Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/testing/infra/emulator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 53876f828cc0..02cf4861280d 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -20,7 +20,7 @@ def __init__(self, builddir, downloaddir, logtofile, timeout_multiplier): # # kernel: path to the kernel image, or the special string # 'builtin'. 'builtin' means a pre-built kernel image will be - # downloaded from ARTEFACTS_URL and suitable options are + # downloaded from ARTIFACTS_URL and suitable options are # automatically passed to qemu and added to the kernel cmdline. So # far only armv5, armv7 and i386 builtin kernels are available. # If None, then no kernel is used, and we assume a bootable device From 757251a0deeb28cf4a682bb9db5a438be4c0f925 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Jun 2023 12:21:49 +0200 Subject: [PATCH 0662/2890] configs/qemu s390x: increase image size to 120M The default kernel configuration for s390x enable a lot of drivers by default so increase the image site to 120M. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4364600444 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- configs/qemu_s390x_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index ee18bdb011f9..4853cd0897ad 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -9,6 +9,7 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel From 7db2ab3041150ee382a257c6c7ce686f9ba24ce9 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 6 Jun 2023 15:42:37 +0100 Subject: [PATCH 0663/2890] board/zynq: fix shellcheck issues This patch cleans up board/zynq shellcheck issues. Signed-off-by: Neal Frager [Peter: use ${} for variables, quotes around entire word] Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 -- board/zynq/post-build.sh | 4 ++-- board/zynq/post-image.sh | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 10e70f078770..90a1481e5473 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -101,8 +101,6 @@ board/udoo/common/post-build.sh Shellcheck board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch Upstream board/versal/post-build.sh Shellcheck board/versal/post-image.sh Shellcheck TrailingSpace -board/zynq/post-build.sh Shellcheck -board/zynq/post-image.sh Shellcheck board/zynqmp/kria/kv260/kv260.sh Shellcheck board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch ApplyOrder Upstream board/zynqmp/post-build.sh Shellcheck diff --git a/board/zynq/post-build.sh b/board/zynq/post-build.sh index 9fd8bbf2c8d0..810fe9987945 100755 --- a/board/zynq/post-build.sh +++ b/board/zynq/post-build.sh @@ -3,6 +3,6 @@ # genimage will need to find the extlinux.conf # in the binaries directory -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${BINARIES_DIR}/extlinux.conf" diff --git a/board/zynq/post-image.sh b/board/zynq/post-image.sh index ac74286cf6d8..627c8ac41a73 100755 --- a/board/zynq/post-image.sh +++ b/board/zynq/post-image.sh @@ -6,10 +6,10 @@ FIRST_DT=$(sed -n \ 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ - ${BR2_CONFIG}) + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" From 48c3d9f396dd7a9fa426e3f7ddbff65a6270aeaf Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 6 Jun 2023 18:54:59 +0100 Subject: [PATCH 0664/2890] board/zynqmp: fix shellcheck issues This patch cleans up board/zynqmp shellcheck issues. Signed-off-by: Neal Frager [Peter: wrap long lines, use quotes around entire word] Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 --- board/zynqmp/kria/kv260/kv260.sh | 10 +++++++--- board/zynqmp/post-build.sh | 7 +++---- board/zynqmp/post-image.sh | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 90a1481e5473..2d838e7ff3bc 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -101,10 +101,7 @@ board/udoo/common/post-build.sh Shellcheck board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch Upstream board/versal/post-build.sh Shellcheck board/versal/post-image.sh Shellcheck TrailingSpace -board/zynqmp/kria/kv260/kv260.sh Shellcheck board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch ApplyOrder Upstream -board/zynqmp/post-build.sh Shellcheck -board/zynqmp/post-image.sh Shellcheck boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch Upstream boot/at91bootstrap/0001-eabi-fix.patch Upstream boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch Upstream diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh index e03d67d8b0a5..dc92c51d43ee 100755 --- a/board/zynqmp/kria/kv260/kv260.sh +++ b/board/zynqmp/kria/kv260/kv260.sh @@ -6,7 +6,11 @@ # drivers are missing. # This will be removed when u-boot can build the kv260 u-boot.itb natively. -UBOOT_DIR=$4 +UBOOT_DIR="$4" -fdtoverlay -o ${UBOOT_DIR}/fit-dtb.blob -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo -${UBOOT_DIR}/tools/mkimage -E -f ${UBOOT_DIR}/u-boot.its -B 0x8 ${BINARIES_DIR}/u-boot.itb +fdtoverlay -o "${UBOOT_DIR}/fit-dtb.blob" \ + -i "${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb" \ + "${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo" + +"${UBOOT_DIR}/tools/mkimage" -E -f "${UBOOT_DIR}/u-boot.its" \ + -B 0x8 "${BINARIES_DIR}/u-boot.itb" diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh index 0713bd1b05b2..747991e3f1da 100755 --- a/board/zynqmp/post-build.sh +++ b/board/zynqmp/post-build.sh @@ -3,14 +3,13 @@ # genimage will need to find the extlinux.conf # in the binaries directory -BOARD_DIR="$(dirname $0)" -CONSOLE=$2 -ROOT=$3 +CONSOLE="$2" +ROOT="$3" mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" label linux kernel /Image devicetree /system.dtb - append console=${CONSOLE} root=/dev/${ROOT} rw rootwait + append console="${CONSOLE}" root="/dev/${ROOT}" rw rootwait __HEADER_EOF diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index c5de2db82070..f44b66342d4b 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -6,10 +6,10 @@ FIRST_DT=$(sed -nr \ -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ - ${BR2_CONFIG}) + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" From 2b0c6c0b7261937027a4f294a2d3c8c0a51eb722 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Jun 2023 19:50:23 +0200 Subject: [PATCH 0665/2890] {linux, linux-headers}: bump 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 10 +++++----- package/linux-headers/Config.in.host | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index f288f52601b8..b4d32f6ea310 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.3.5" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.3.6" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 4806bf711cfb..18ede2d60f21 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,10 +1,10 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 f5cd478c3d8b908ab606afd1e95a4f8f77e7186b4a82829251d6e6aaafff825e linux-6.3.5.tar.xz -sha256 e86917bba1990e967943645484182a64ba325f98b114a1906cc1d50992e073c1 linux-6.1.31.tar.xz +sha256 7a6a1f0dfa0bf7f45f9d4a7b409315cf32267850adab4db033a17de0320a24ef linux-6.3.6.tar.xz +sha256 7c88b7a09ba2b9e47b78eba2b32b1db6a4d89636f7ddd586545f9671a2521a6c linux-6.1.32.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e981ea5d219f77735bf5a3f7e84a8af578df8ac3e1c4ff1b0649e2b0795277d2 linux-5.15.114.tar.xz -sha256 ace6ceb73f5f2504bc1bcb9b8cd5b55d6ff8e90a81ee244ad2315fdd671ba4e7 linux-5.10.181.tar.xz -sha256 90f5280e95ed7b374ad6f3979ed08008e29a051e5f372d367c06ed75b002a21b linux-5.4.244.tar.xz +sha256 1b076860779235e90519e867c1ec78c7a34d1125d8fdba787ff495c7c14f1214 linux-5.15.115.tar.xz +sha256 de8ec58929460e3a14c1b0502f4a449f24c988a7a4a03ff04a82fb2d665fe9f6 linux-5.10.182.tar.xz +sha256 9607881878fbd21e0dec4e8192b0f6352d17fd74c3ec23ffe6b0a24093efb1a4 linux-5.4.245.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 7fb9ee20c7e52f9be6d9f501e8498a22f4b364abfde136143749a77e597fd03e linux-4.19.284.tar.xz sha256 ac8318f1c1d387e23ccfa760ec042943372df23e3c4e2408177fb5a3f6488f76 linux-4.14.316.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 51f475f16a82..f9a164d78d31 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -398,11 +398,11 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.316" if BR2_KERNEL_HEADERS_4_14 default "4.19.284" if BR2_KERNEL_HEADERS_4_19 - default "5.4.244" if BR2_KERNEL_HEADERS_5_4 - default "5.10.181" if BR2_KERNEL_HEADERS_5_10 - default "5.15.114" if BR2_KERNEL_HEADERS_5_15 - default "6.1.31" if BR2_KERNEL_HEADERS_6_1 - default "6.3.5" if BR2_KERNEL_HEADERS_6_3 + default "5.4.245" if BR2_KERNEL_HEADERS_5_4 + default "5.10.182" if BR2_KERNEL_HEADERS_5_10 + default "5.15.115" if BR2_KERNEL_HEADERS_5_15 + default "6.1.32" if BR2_KERNEL_HEADERS_6_1 + default "6.3.6" if BR2_KERNEL_HEADERS_6_3 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 620ce32227b0722c9c68c5d0cd42d8600a18ca6b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 6 Jun 2023 21:56:00 +0200 Subject: [PATCH 0666/2890] package/go: security bump to version 1.9.10 Fixes the following security issues: - cmd/go: cgo code injection The go command may generate unexpected code at build time when using cgo. This may result in unexpected behavior when running a go program which uses cgo. This may occur when running an untrusted module which contains directories with newline characters in their names. Modules which are retrieved using the go command, i.e. via "go get", are not affected (modules retrieved using GOPATH-mode, i.e. GO111MODULE=off, may be affected). Thanks to Juho Nurminen of Mattermost for reporting this issue. This is CVE-2023-29402 and Go issue https://go.dev/issue/60167. - runtime: unexpected behavior of setuid/setgid binaries The Go runtime didn't act any differently when a binary had the setuid/setgid bit set. On Unix platforms, if a setuid/setgid binary was executed with standard I/O file descriptors closed, opening any files could result in unexpected content being read/written with elevated prilieges. Similarly if a setuid/setgid program was terminated, either via panic or signal, it could leak the contents of its registers. Thanks to Vincent Dehors from Synacktiv for reporting this issue. This is CVE-2023-29403 and Go issue https://go.dev/issue/60272. - cmd/go: improper sanitization of LDFLAGS The go command may execute arbitrary code at build time when using cgo. This may occur when running "go get" on a malicious module, or when running any other command which builds untrusted code. This is can by triggered by linker flags, specified via a "#cgo LDFLAGS" directive. Thanks to Juho Nurminen of Mattermost for reporting this issue. This is CVE-2023-29404 and CVE-2023-29405 and Go issues https://go.dev/issue/60305 and https://go.dev/issue/60306. Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index ffe42bf3959b..874737ea2d3d 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 131190a4697a70c5b1d232df5d3f55a3f9ec0e78e40516196ffb3f09ae6a5744 go1.19.9.src.tar.gz +sha256 13755bcce529747d5f2930dee034730c86d02bd3e521ab3e2bbede548d3b953f go1.19.10.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 89c3577982c6..545d2117b7d9 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.9 +GO_VERSION = 1.19.10 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 53beb8fc1a4f3ba20ea6c856b4ec8506570f17c1 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Jun 2023 11:56:06 +0200 Subject: [PATCH 0667/2890] support/dependencies: introduce BR2_HOST_CMAKE_AT_LEAST Some packages (e.g. libjxl) requires a quite recent cmake version, that is not yet available in most distributions, especially those LTS versions. Currently, when we bump the minimum cmake version we require, it gets bumped for all packages, regardless of their own minimum required version, which means that a given configuration will trigger the build of our host-cmake even if the packages that require it are not enabled and those that are would be content with the system-provided cmake. Since host-cmake can take quite some time to build, this can get a bit annoying to pay the price of a host-cmake build that would otherwise not be needed. Some packages even use an alternative build system when available since they requires a more recent version of cmake than the our minimum cmake version (wpewebkit use Ninja: 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd). We introduce config options that packages can select to indicate what minimal cmake version they require, and use that version as the required minimal version required by the current configuration [0]. We would like to ensure that the currently selected minimum cmake version is indeed lower (or equal) to the cmake version we package, but that is not possible: dependencies.mk is parsed before we parse packages, so we do not yet know the cmake version we have, and we can't invert the parsing order as we need to know the required dependencies before we parse packages (so that we can build their dependency rules in Makefile). So we can only add comments in both places, that refer to the other location. [0] note that this is yet not optimal, as in such a case, host-cmake would be in the dependency chain of all cmake-based packages, even for those packages that do not require it. The optimum would be for each package to gain such a dependency on an as-needed basis, but this is by far more complex to achieve, and would only speed up cases where a single package is built from scratch (e.g. with: make clean; make foo), which is not worth optimising (yet?) Signed-off-by: Romain Naour Cc: Julien Olivain Cc: Arnout Vandecappelle Cc: Peter Korsgaard Cc: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/cmake/Config.in.host | 27 ++++++++++++++++++++++++ package/cmake/cmake.mk | 1 + support/dependencies/check-host-cmake.mk | 12 ++++++----- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host index b2e210ee2cb0..5de076537bc5 100644 --- a/package/cmake/Config.in.host +++ b/package/cmake/Config.in.host @@ -9,3 +9,30 @@ config BR2_PACKAGE_HOST_CMAKE the compiler environment of your choice. http://www.cmake.org/ + +# The minimum system cmake version we expect if 3.18 as provided by +# Debian bullseye, that we use in our reference build docker image. +config BR2_HOST_CMAKE_AT_LEAST_3_19 + bool + +config BR2_HOST_CMAKE_AT_LEAST_3_20 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_19 + +config BR2_HOST_CMAKE_AT_LEAST_3_21 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_20 + +config BR2_HOST_CMAKE_AT_LEAST_3_22 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_21 + +# This order guarantees that the highest version is set, as kconfig +# stops affecting a value on the first matching default. +config BR2_HOST_CMAKE_AT_LEAST + string + default "3.22" if BR2_HOST_CMAKE_AT_LEAST_3_22 + default "3.21" if BR2_HOST_CMAKE_AT_LEAST_3_21 + default "3.20" if BR2_HOST_CMAKE_AT_LEAST_3_20 + default "3.19" if BR2_HOST_CMAKE_AT_LEAST_3_19 + default "3.18" diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index dc92c8bb4ea0..b99877696a9c 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,6 +4,7 @@ # ################################################################################ +# When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y CMAKE_VERSION_MAJOR = 3.22 CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk index 5760e4ded1f1..e3676903198b 100644 --- a/support/dependencies/check-host-cmake.mk +++ b/support/dependencies/check-host-cmake.mk @@ -1,9 +1,11 @@ -# Set this to either 3.18 or higher, depending on the highest minimum -# version required by any of the packages bundled in Buildroot. If a -# package is bumped or a new one added, and it requires a higher -# version, our cmake infra will catch it and build its own. +# The cmake minimum version is set to either 3.18 or higher, +# depending on the highest minimum version required by any +# of the packages bundled in Buildroot. If a package is +# bumped or a new one added, and it requires a higher +# cmake version than the one provided by the host, our +# cmake infra will catch it and build its own. # -BR2_CMAKE_VERSION_MIN = 3.18 +BR2_CMAKE_VERSION_MIN = $(BR2_HOST_CMAKE_AT_LEAST) BR2_CMAKE_CANDIDATES ?= cmake cmake3 BR2_CMAKE ?= $(call suitable-host-package,cmake,\ From a4fec34ba231b78ea24a6480c31aa45132b40784 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Jun 2023 11:56:07 +0200 Subject: [PATCH 0668/2890] package/libjxl: requires host-cmake >= 3.19 libjxl requires cmake 3.19 since version v0.7 due to the new behavior of cmake [1]. -- Configuring done CMake Error at cmake/FindLCMS2.cmake:40 (add_library): INTERFACE_LIBRARY targets may only have whitelisted properties. The property "INCLUDE_DIRECTORIES" is not allowed. Call Stack (most recent call first): third_party/CMakeLists.txt:114 (find_package) The portability issue has already been reported upstream [2]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819095 [1] https://gitlab.kitware.com/cmake/cmake/-/commit/afb998704e67d3d3ce5b24c112cb06e770fca78d [2] https://github.com/libjxl/libjxl/issues/1425 Signed-off-by: Romain Naour Cc: Julien Olivain Signed-off-by: Peter Korsgaard --- package/libjxl/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libjxl/Config.in b/package/libjxl/Config.in index da04b89f9b8c..923560298fce 100644 --- a/package/libjxl/Config.in +++ b/package/libjxl/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_LIBJXL # libjxl fail to link statically due to libatomic issue depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + select BR2_HOST_CMAKE_AT_LEAST_3_19 select BR2_PACKAGE_BROTLI select BR2_PACKAGE_HIGHWAY select BR2_PACKAGE_LCMS2 From 62200879d49c085b120f37ce31d9123ebcc5895a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Jun 2023 19:17:08 +0200 Subject: [PATCH 0669/2890] package/libdeflate: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccGKQdKj.s: Assembler messages: /tmp/ccGKQdKj.s:199: Error: invalid constant (7) after fixup /tmp/ccGKQdKj.s:327: Error: invalid constant (0) after fixup /tmp/ccGKQdKj.s:338: Error: invalid constant (1) after fixup /tmp/ccGKQdKj.s:345: Error: invalid constant (20) after fixup /tmp/ccGKQdKj.s:354: Error: invalid constant (20) after fixup /tmp/ccGKQdKj.s:372: Error: invalid constant (20) after fixup /tmp/ccGKQdKj.s:528: Error: invalid constant (3f) after fixup /tmp/ccGKQdKj.s:531: Error: invalid constant (3f) after fixup /tmp/ccGKQdKj.s:202: Error: invalid constant (20000) after fixup /tmp/ccGKQdKj.s:482: Error: invalid constant (20000) after fixup /tmp/ccGKQdKj.s:549: Error: invalid constant (20000) after fixup Fixes: http://autobuild.buildroot.net/results/0103d64a4a6a9b0a708bfb77bf1714edc7acc714/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libdeflate/libdeflate.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 67e97c6e5ec7..c09a03332512 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -9,8 +9,17 @@ LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) LIBDEFLATE_LICENSE = MIT LIBDEFLATE_LICENSE_FILES = COPYING LIBDEFLATE_INSTALL_STAGING = YES + +LIBDEFLATE_CFLAGS = -D_DEFAULT_SOURCE + +# Thumb build is broken, build in ARM mode, since all architectures +# that support Thumb1 also support ARM. +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBDEFLATE_CFLAGS += -marm +endif + LIBDEFLATE_CONF_OPTS = \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -D_DEFAULT_SOURCE" + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(LIBDEFLATE_CFLAGS)" ifeq ($(BR2_SHARED_LIBS),y) LIBDEFLATE_CONF_OPTS += \ From 29e79c1f54407d0bb6cd9a3a27c65a4cbe3ccdcd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Jun 2023 19:35:14 +0200 Subject: [PATCH 0670/2890] package/php: Fix GCC 12 -Og Fixes: http://autobuild.buildroot.net/results/316451459139e250ba2d0c7b554606fd97eebd9a/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/php/0006-xxhash-h-Fix-GCC-12-Og.patch | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 package/php/0006-xxhash-h-Fix-GCC-12-Og.patch diff --git a/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch b/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch new file mode 100644 index 000000000000..9b5b9966cd5a --- /dev/null +++ b/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch @@ -0,0 +1,94 @@ +From adcb38b1ffa8e401293e5028ee5af586fd304e00 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 12 Apr 2023 13:33:07 +0800 +Subject: [PATCH] xxhash.h: Fix GCC 12 -Og + +Change whether to inline XXH3_hashLong_withSecret to a config option + +Ref: https://github.com/Cyan4973/xxHash/commit/ace22bddc7a366a5dd8a71e8b8247694530684ec + +Signed-off-by: Mingli Yu + +Closes GH-11062. + +Upstream: https://github.com/php/php-src/commit/adcb38b1ffa8e401293e5028ee5af586fd304e00 + +Signed-off-by: Bernd Kuhls +--- + ext/hash/xxhash/xxhash.h | 35 +++++++++++++++++++++++++++++++++-- + 1 file changed, 33 insertions(+), 2 deletions(-) + +diff --git a/ext/hash/xxhash/xxhash.h b/ext/hash/xxhash/xxhash.h +index b5bd286496c7..8e816c0584eb 100644 +--- a/ext/hash/xxhash/xxhash.h ++++ b/ext/hash/xxhash/xxhash.h +@@ -1375,6 +1375,23 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, + */ + # define XXH_NO_INLINE_HINTS 0 + ++/*! ++ * @def XXH3_INLINE_SECRET ++ * @brief Determines whether to inline the XXH3 withSecret code. ++ * ++ * When the secret size is known, the compiler can improve the performance ++ * of XXH3_64bits_withSecret() and XXH3_128bits_withSecret(). ++ * ++ * However, if the secret size is not known, it doesn't have any benefit. This ++ * happens when xxHash is compiled into a global symbol. Therefore, if ++ * @ref XXH_INLINE_ALL is *not* defined, this will be defined to 0. ++ * ++ * Additionally, this defaults to 0 on GCC 12+, which has an issue with function pointers ++ * that are *sometimes* force inline on -Og, and it is impossible to automatically ++ * detect this optimization level. ++ */ ++# define XXH3_INLINE_SECRET 0 ++ + /*! + * @def XXH32_ENDJMP + * @brief Whether to use a jump for `XXH32_finalize`. +@@ -1439,6 +1456,15 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, + # endif + #endif + ++#ifndef XXH3_INLINE_SECRET ++# if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 12) \ ++ || !defined(XXH_INLINE_ALL) ++# define XXH3_INLINE_SECRET 0 ++# else ++# define XXH3_INLINE_SECRET 1 ++# endif ++#endif ++ + #ifndef XXH32_ENDJMP + /* generally preferable for performance */ + # define XXH32_ENDJMP 0 +@@ -1515,6 +1541,11 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + # define XXH_NO_INLINE static + #endif + ++#if XXH3_INLINE_SECRET ++# define XXH3_WITH_SECRET_INLINE XXH_FORCE_INLINE ++#else ++# define XXH3_WITH_SECRET_INLINE XXH_NO_INLINE ++#endif + + + /* ************************************* +@@ -4465,7 +4496,7 @@ XXH3_hashLong_64b_internal(const void* XXH_RESTRICT input, size_t len, + * so that the compiler can properly optimize the vectorized loop. + * This makes a big performance difference for "medium" keys (<1 KB) when using AVX instruction set. + */ +-XXH_FORCE_INLINE XXH64_hash_t ++XXH3_WITH_SECRET_INLINE XXH64_hash_t + XXH3_hashLong_64b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen) + { +@@ -5263,7 +5294,7 @@ XXH3_hashLong_128b_default(const void* XXH_RESTRICT input, size_t len, + * It's important for performance to pass @secretLen (when it's static) + * to the compiler, so that it can properly optimize the vectorized loop. + */ +-XXH_FORCE_INLINE XXH128_hash_t ++XXH3_WITH_SECRET_INLINE XXH128_hash_t + XXH3_hashLong_128b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, + const void* XXH_RESTRICT secret, size_t secretLen) From 17393a78e53a3b56aa0416369604ccb1dde414ef Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Wed, 7 Jun 2023 14:29:16 +0200 Subject: [PATCH 0671/2890] package/at-spi2-core: security bump to version 2.48.3 https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_48_3/NEWS Fixes a couple of use after frees when finalizing devices. Added systemd option to not fail if dbus-broker is detected on the host machine. Fixes: - http://autobuild.buildroot.net/results/a4908a2c8cb75b602794e890fccb8dd42ef6ff41 Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- package/at-spi2-core/at-spi2-core.hash | 4 ++-- package/at-spi2-core/at-spi2-core.mk | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index db3ea7096ee2..8f856e1cac55 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/at-spi2-core/2.48/at-spi2-core-2.48.2.sha256sum -sha256 86ebcb55f678381d7ed7825736add42dfccb70ad3b981dfd65d72e58f87828ee at-spi2-core-2.48.2.tar.xz +# From https://download.gnome.org/sources/at-spi2-core/2.48/at-spi2-core-2.48.3.sha256sum +sha256 37316df43ca9989ce539d54cf429a768c28bb38a0b34950beadd0421827edf55 at-spi2-core-2.48.3.tar.xz # locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index e9a93b3edad1..0ca5bc181741 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -5,7 +5,7 @@ ################################################################################ AT_SPI2_CORE_VERSION_MAJOR = 2.48 -AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).2 +AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).3 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ @@ -29,6 +29,13 @@ else AT_SPI2_CORE_CONF_OPTS += -Dintrospection=disabled endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +AT_SPI2_CORE_CONF_OPTS += -Duse_systemd=true +AT_SPI2_CORE_DEPENDENCIES += systemd +else +AT_SPI2_CORE_CONF_OPTS += -Duse_systemd=false +endif + AT_SPI2_CORE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) From dbb0b4274cdbd74cf22fb4da4c1e43084f3d3125 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 7 Jun 2023 23:07:39 +0200 Subject: [PATCH 0672/2890] Update for 2023.05 Signed-off-by: Peter Korsgaard --- CHANGES | 14 ++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 26 +++++++++++++------------- docs/website/news.html | 18 ++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 48 insertions(+), 16 deletions(-) diff --git a/CHANGES b/CHANGES index 1f540b8f4b37..fec806a21598 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +2023.05, released June 7th, 2023 + + Fixes all over the tree. + + Infrastructure: Add BR2_HOST_CMAKE_AT_LEAST_* for packages + needing a newer host-cmake than what is currently enforced + (3.18) - Up to the version provided by the cmake package (3.22). + + Defconfigs: QEMU s390x: Bump rootfs size to 120MB to make room + for kernel modules. + + Updated/fixed packages: at-spi2-core, go, libdeflate, libjxl, + perl-http-message, php, redis + 2023.05-rc3, released June 4th, 2023 Fixes all over the tree. diff --git a/Makefile b/Makefile index ce2f34dc5ea8..3187791d9ba5 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.05-rc3 +export BR2_VERSION := 2023.05 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1685877000 +BR2_VERSION_EPOCH = 1686172000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 5e9280626de9..2af7db1861c2 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,7 +8,7 @@
              Download
              -

              Latest stable / long term support release: 2023.02.1

              +

              Latest long term support release: 2023.02.1

              @@ -41,41 +41,41 @@

              buildroot-2023.02.1.tar.xzPGP signature

              - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
              diff --git a/docs/website/news.html b/docs/website/news.html index 7523bc57d9fe..32e92732157a 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,24 @@

              News

                +
              • +
                +
                +
                +

                2023.05 released

                +

                7 June 2023

                +
                +
                +

                The stable 2023.05 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2023.05 release.

                +
                +
                +
                • +
              • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index d1b75ed405d2..eaac13e32bd0 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.02.1' +RELEASE='2023.05' ### Change here for more memory/cores ### VM_MEMORY=2048 From 35b1ddbe635c11c7c60f51cbe9203a8f68e24857 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 7 Jun 2023 23:32:45 +0200 Subject: [PATCH 0673/2890] docs/website/news.html: add 2023.05 announcement link Signed-off-by: Peter Korsgaard --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index 32e92732157a..1a2af7ccfc5c 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

                2023.05 released

                The stable 2023.05 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2023.05 release.

                From e63b3b8dc72dd595b06563673c59e65de4fd4dee Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Jun 2023 18:08:27 +0200 Subject: [PATCH 0674/2890] Kickoff 2023.08 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3187791d9ba5..09b2066f05ba 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.05 +export BR2_VERSION := 2023.08-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1686172000 From bf7b627174e1bbf82d59574cd2c64c930a0df976 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 12 Jun 2023 21:26:47 +0200 Subject: [PATCH 0675/2890] package/bootgen: add patch to fix builds on machines with modern flex versions Fixes: http://autobuild.buildroot.net/results/293/2936d9b054269b7055e66ab5a7f7c1f7f4926d48/ Bootgen embeds an old version of flex, but uses the system include syntax (#include <>) to reference it, causing conflicts on systems with the development headers for a modern flex version installed, leading to build issues like: ../bisonflex/cmdoptions.yy.cpp: In member function 'virtual int CO::FlexScanner::yylex()': ../bisonflex/cmdoptions.yy.cpp:1362:18: error: no match for 'operator=' (operand types are 'std::istream' {aka 'std::basic_istream'} and 'std::istream*' {aka 'std::basic_istream*'}) Fix it by using normal local includes (#include "") instead. Notice: This was already fixed on master, but the cmdoptions.yy.cpp and reginit.yy.cpp hunks were accidentally dropped when the changes were squashed for the 2023.1 release. Signed-off-by: Peter Korsgaard Reviewed-by: Neal Frager Signed-off-by: Peter Korsgaard --- ...n-machines-with-modern-flex-versions.patch | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 package/bootgen/0001-Refix-builds-on-machines-with-modern-flex-versions.patch diff --git a/package/bootgen/0001-Refix-builds-on-machines-with-modern-flex-versions.patch b/package/bootgen/0001-Refix-builds-on-machines-with-modern-flex-versions.patch new file mode 100644 index 000000000000..b13dd2b03b91 --- /dev/null +++ b/package/bootgen/0001-Refix-builds-on-machines-with-modern-flex-versions.patch @@ -0,0 +1,69 @@ +From 29a4e487527d109f517fc47a7c284b7732b27a10 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Mon, 12 Jun 2023 21:04:25 +0200 +Subject: [PATCH] Refix builds on machines with modern flex versions + +Bootgen embeds an old version of flex, but uses the system include syntax +(#include <>) to reference it, causing conflicts on systems with the +development headers for a modern flex version installed, leading to build +issues like: + +../bisonflex/cmdoptions.yy.cpp: In member function 'virtual int CO::FlexScanner::yylex()': +../bisonflex/cmdoptions.yy.cpp:1362:18: error: no match for 'operator=' (operand types are 'std::istream' {aka 'std::basic_istream'} and 'std::istream*' {aka 'std::basic_istream*'}) + +http://autobuild.buildroot.net/results/293/2936d9b054269b7055e66ab5a7f7c1f7f4926d48/build-end.log + +Fix it by using normal local #include statements by: + +sed -i 's//"FlexLexer.h"/g' * + +Notice: This was already fixed on master with: +https://github.com/Xilinx/bootgen/pull/20 + +Notice: The patch was not applied, instead a different patch with the same +content was applied to master: +https://github.com/Xilinx/bootgen/commit/af4f7083ea92931a07e47995eb2bc2a348c577ed + +This patch was not applied to the xlnx_rel_v2023.1 branch, instead most +of the content was included in: +https://github.com/Xilinx/bootgen/commit/bfba91b2c84160dc203ff09f0e930d82ed06a83a + +But the cmdoptions.yy.cpp and reginit.yy.cpp hunks were accidently dropped: +https://github.com/Xilinx/bootgen/commit/bfba91b2c84160dc203ff09f0e930d82ed06a83a#diff-e0287adb420dbecc112acdf7d4a1efba8ea6cbf06401e4e8679b8ffd22a091d8 + +Upstream: https://github.com/Xilinx/bootgen/pull/24 +Signed-off-by: Peter Korsgaard +--- + cmdoptions.yy.cpp | 2 +- + reginit.yy.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmdoptions.yy.cpp b/cmdoptions.yy.cpp +index 38fed35..4e940ab 100644 +--- a/cmdoptions.yy.cpp ++++ b/cmdoptions.yy.cpp +@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; + + #define yytext_ptr yytext + +-#include ++#include "FlexLexer.h" + + int yyFlexLexer::yywrap() { return 1; } + int yyFlexLexer::yylex() +diff --git a/reginit.yy.cpp b/reginit.yy.cpp +index d830734..dede473 100644 +--- a/reginit.yy.cpp ++++ b/reginit.yy.cpp +@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; + + #define yytext_ptr yytext + +-#include ++#include "FlexLexer.h" + + int yyFlexLexer::yywrap() { return 1; } + int yyFlexLexer::yylex() +-- +2.30.2 + From 38bef5fbc8c609241bb0fbcde310f5eb296537ae Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 13 Jun 2023 09:28:05 +0200 Subject: [PATCH 0676/2890] package/cups: security bump to version 2.4.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following security issues: - CVE-2023-32324: Heap buffer overflow in cupsd https://github.com/OpenPrinting/cups/security/advisories/GHSA-cxc6-w2g7-69p7 And a number of other fixes, see the release notes for details: https://github.com/OpenPrinting/cups/releases/tag/v2.4.3 In addition, 2.4.4 fixes a segfault regression in 2.4.3: https://github.com/OpenPrinting/cups/releases/tag/v2.4.4 Update NOTICE hash for a change in copyright years: -Copyright © 2020-2022 by OpenPrinting +Copyright © 2020-2023 by OpenPrinting Signed-off-by: Peter Korsgaard --- package/cups/cups.hash | 4 ++-- package/cups/cups.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cups/cups.hash b/package/cups/cups.hash index ba220e903e1f..cc6fe254462d 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 f03ccb40b087d1e30940a40e0141dcbba263f39974c20eb9f2521066c9c6c908 cups-2.4.2-source.tar.gz +sha256 209259e8fe8df9112af49f4e5765f50dad6da1f869296de41d6eaab1b98003cb cups-2.4.4-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE -sha256 7a7bd639e3a8457ae40b0dcfb74ea3cc6a8132b06c726142e993625d33eb6de5 NOTICE +sha256 5320b6e3c252423e4153eb2dd63e57e3b630afb21139f44e43b02d85fe33e279 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index fed2aa809f1c..7bbea9a21898 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.4.2 +CUPS_VERSION = 2.4.4 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception From 8bbcfc9ca57fe83411db14daf88febda80ea7cc7 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 12 Jun 2023 01:36:14 +0200 Subject: [PATCH 0677/2890] package/f2fs-tools: bump to version 1.16.0 Drop now upstreamed patches. Signed-off-by: Grzegorz Blach Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 - ...1-configure-ac-fix-cross-compilation.patch | 88 ------------------- ...s-tools-fix-build-error-on-lz4-1-9-4.patch | 34 ------- package/f2fs-tools/f2fs-tools.hash | 2 +- package/f2fs-tools/f2fs-tools.mk | 2 +- 5 files changed, 2 insertions(+), 126 deletions(-) delete mode 100644 package/f2fs-tools/0001-configure-ac-fix-cross-compilation.patch delete mode 100644 package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch diff --git a/.checkpackageignore b/.checkpackageignore index c2316d1d4e67..14c9bdbb7a7a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -444,8 +444,6 @@ package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch Upstream package/exim/S86exim Indent Variables package/expect/0001-enable-cross-compilation.patch Upstream package/expect/0002-allow-tcl-build-directory.patch Upstream -package/f2fs-tools/0001-configure-ac-fix-cross-compilation.patch Upstream -package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch Upstream package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch Upstream package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch Upstream package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch Upstream diff --git a/package/f2fs-tools/0001-configure-ac-fix-cross-compilation.patch b/package/f2fs-tools/0001-configure-ac-fix-cross-compilation.patch deleted file mode 100644 index 0e3d4da19112..000000000000 --- a/package/f2fs-tools/0001-configure-ac-fix-cross-compilation.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 32e7d272344024c216f155c3463dd2d548f3fafd Mon Sep 17 00:00:00 2001 -From: Nick Hainke -Date: Mon, 4 Jul 2022 11:29:19 +0200 -Subject: configure.ac: fix cross compilation - -AC_CHECK_LIB seems to not work correctly with OpenWrt. Add possibility -to disable lz4 and lzo2 manually. - -Fixes errors in the form of: - Package f2fsck is missing dependencies for the following libraries: - liblz4.so.1 - liblzo2.so.2 - -Signed-off-by: Nick Hainke -Signed-off-by: Jaegeuk Kim -[Retrieved from: -https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=32e7d272344024c216f155c3463dd2d548f3fafd] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 44 ++++++++++++++++++++++++++++++++++---------- - 1 file changed, 34 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ea39461..dbe9ad3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -50,6 +50,18 @@ AC_ARG_WITH([blkid], - [], - [with_blkid=check]) - -+AC_ARG_WITH([lzo2], -+ [AS_HELP_STRING([--without-lzo2], -+ [Ignore presence of liblzo2 and disable lzo2 support])], -+ [], -+ [with_lzo2=check]) -+ -+AC_ARG_WITH([lz4], -+ [AS_HELP_STRING([--without-lz4], -+ [Ignore presence of liblz4 and disable lz4 support])], -+ [], -+ [with_lz4=check]) -+ - # Checks for programs. - AC_PROG_CC - AM_PROG_AR -@@ -71,17 +83,29 @@ AS_IF([test "x$with_blkid" != xno], - fi - ], -lblkid)]) - --AC_CHECK_LIB([lzo2], [main], -- [AC_SUBST([liblzo2_LIBS], ["-llzo2"]) -- AC_DEFINE([HAVE_LIBLZO2], [1], -- [Define if you have liblzo2]) -- ], [], []) -+AS_IF([test "x$with_lzo2" != xno], -+ [AC_CHECK_LIB([lzo2], [main], -+ [AC_SUBST([liblzo2_LIBS], ["-llzo2"]) -+ AC_DEFINE([HAVE_LIBLZO2], [1], -+ [Define if you have liblzo2]) -+ ], -+ [if test "x$with_lzo2" != xcheck; then -+ AC_MSG_FAILURE( -+ [--with-lzo2 was given, but test for lzo2 failed]) -+ fi -+ ], -llzo2)]) - --AC_CHECK_LIB([lz4], [main], -- [AC_SUBST([liblz4_LIBS], ["-llz4"]) -- AC_DEFINE([HAVE_LIBLZ4], [1], -- [Define if you have liblz4]) -- ], [], []) -+AS_IF([test "x$with_lz4" != xno], -+ [AC_CHECK_LIB([lz4], [main], -+ [AC_SUBST([liblz4_LIBS], ["-llz4"]) -+ AC_DEFINE([HAVE_LIBLZ4], [1], -+ [Define if you have liblz4]) -+ ], -+ [if test "x$with_lz4" != xcheck; then -+ AC_MSG_FAILURE( -+ [--with-lz4 was given, but test for lz4 failed]) -+ fi -+ ], -llz4)]) - - AS_IF([test "x$with_selinux" != xno], - [AC_CHECK_LIB([selinux], [getcon], --- -cgit - diff --git a/package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch b/package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch deleted file mode 100644 index b43def6bb7e3..000000000000 --- a/package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 19f77c6f6277a274434d6d8883f50e7955c6a8db Mon Sep 17 00:00:00 2001 -From: Jaegeuk Kim -Date: Mon, 29 Aug 2022 11:03:35 -0700 -Subject: f2fs-tools: fix build error on lz4-1.9.4 - -LZ4_STREAMSIZE_U64 is undefined in new lz4 lib. - -Signed-off-by: Jaegeuk Kim -[Retrieved from: -https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=19f77c6f6277a274434d6d8883f50e7955c6a8db] -Signed-off-by: Fabrice Fontaine ---- - fsck/compress.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/fsck/compress.c b/fsck/compress.c -index b413492..b15f0a4 100644 ---- a/fsck/compress.c -+++ b/fsck/compress.c -@@ -32,10 +32,7 @@ - #ifdef HAVE_LIBLZ4 - #define LZ4_MEMORY_USAGE 14 - #define LZ4_MAX_INPUT_SIZE 0x7E000000 /* 2 113 929 216 bytes */ --#ifndef LZ4_STREAMSIZE --#define LZ4_STREAMSIZE (LZ4_STREAMSIZE_U64 * sizeof(long long)) --#endif --#define LZ4_MEM_COMPRESS LZ4_STREAMSIZE -+#define LZ4_MEM_COMPRESS sizeof(LZ4_stream_t) - #define LZ4_ACCELERATION_DEFAULT 1 - #define LZ4_WORK_SIZE ALIGN_UP(LZ4_MEM_COMPRESS, 8) - #endif --- -cgit - diff --git a/package/f2fs-tools/f2fs-tools.hash b/package/f2fs-tools/f2fs-tools.hash index 8d5ff31f0d58..d1f183afffac 100644 --- a/package/f2fs-tools/f2fs-tools.hash +++ b/package/f2fs-tools/f2fs-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 147d471040b44900283ce2c935f1d35d13d7f40008e7cb8fab2b69f54da01a4f f2fs-tools-1.15.0.tar.gz +sha256 208c7a07e95383fbd7b466b5681590789dcb41f41bf197369c41a95383b57c5e f2fs-tools-1.16.0.tar.gz sha256 662abb3a8a80b36ae7036c289dd1e03b361ee5dd2e6fd5211d0d8d029146449f COPYING diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk index f94244f2ad49..a92ab4fe3e03 100644 --- a/package/f2fs-tools/f2fs-tools.mk +++ b/package/f2fs-tools/f2fs-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -F2FS_TOOLS_VERSION = 1.15.0 +F2FS_TOOLS_VERSION = 1.16.0 F2FS_TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no F2FS_TOOLS_DEPENDENCIES = host-pkgconf util-linux From fd3ff0761c741723afc556f5eaf96e1941264eb4 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 12 Jun 2023 01:36:15 +0200 Subject: [PATCH 0678/2890] package/graphicsmagick: security bump to version 1.3.40 Fixes the following security issues: 1.3.39: - oss-fuzz: Several security fixes originating from oss-fuzz testing. - ALL: Replace strcpy() with strlcpy(), replace strcat() with strlcat(), replace sprintf() with snprintf(). Prefer using bounded string functions. This change is made for the purpose of increasing safety than to address any existing demonstrated concern. 1.3.40: - DCX: Fixed heap overflow when writing more than 1023 scenes, and also eliminated use of uninitialized memory. Signed-off-by: Grzegorz Blach [Peter: mark as security fix, extend commit message] Signed-off-by: Peter Korsgaard --- package/graphicsmagick/graphicsmagick.hash | 2 +- package/graphicsmagick/graphicsmagick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/graphicsmagick/graphicsmagick.hash b/package/graphicsmagick/graphicsmagick.hash index 80130da5d66c..a894aedf1186 100644 --- a/package/graphicsmagick/graphicsmagick.hash +++ b/package/graphicsmagick/graphicsmagick.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d60cd9db59351d2b9cb19beb443170acaa28f073d13d258f67b3627635e32675 GraphicsMagick-1.3.38.tar.xz +sha256 97dc1a9d4e89c77b25a3b24505e7ff1653b88f9bfe31f189ce10804b8efa7746 GraphicsMagick-1.3.40.tar.xz sha256 0a20e661de942ebe115a354d0ec6d1d42b93856ea765f813f350a5ce5024cdb7 Copyright.txt diff --git a/package/graphicsmagick/graphicsmagick.mk b/package/graphicsmagick/graphicsmagick.mk index dbaa8ddf7049..76b826ceef5a 100644 --- a/package/graphicsmagick/graphicsmagick.mk +++ b/package/graphicsmagick/graphicsmagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRAPHICSMAGICK_VERSION = 1.3.38 +GRAPHICSMAGICK_VERSION = 1.3.40 GRAPHICSMAGICK_SOURCE = GraphicsMagick-$(GRAPHICSMAGICK_VERSION).tar.xz GRAPHICSMAGICK_SITE = https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/$(GRAPHICSMAGICK_VERSION) GRAPHICSMAGICK_LICENSE = MIT From 1ff1202ae67c992f1fe6b1b3e5184dc1476cb55d Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Mon, 12 Jun 2023 09:36:30 +0200 Subject: [PATCH 0679/2890] package/s390-tools: bump version to 2.27.0 Signed-off-by: Alexander Egorenkov Signed-off-by: Peter Korsgaard --- package/s390-tools/s390-tools.hash | 2 +- package/s390-tools/s390-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index 37b67c5cb180..b7563d8bac9c 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 da81c55fb11d84923c0ebaed703f557052eb1a273495f60ebe3d20a74627303e s390-tools-2.26.0.tar.gz +sha256 4315e64cf2fe0240ff9bd9929501db731d5bf3e7acf964ecf323d48d90e08f6e s390-tools-2.27.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index ec01a18cb07c..187fefea6450 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.26.0 +S390_TOOLS_VERSION = 2.27.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE From 067a8864c594958004dfdb9dea55c304913e2be6 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Tue, 13 Jun 2023 09:31:39 +0300 Subject: [PATCH 0680/2890] package/timescaledb: bump version to 2.11.0 Release notes: https://github.com/timescale/timescaledb/blob/2.11.0/CHANGELOG.md Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 9ec92244a713..22705cfb16a2 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d3bd209ebe48f058fd3fa2aa0d6a74fbce2023d64dbb205e58e2c9ab62059cce timescaledb-2.10.3.tar.gz +sha256 96baf19f502387d2129324032407da6405800de8627bfa556bfd3a7b277287be timescaledb-2.11.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index cd02d8df50e4..3356094cb066 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.10.3 +TIMESCALEDB_VERSION = 2.11.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 81cb8b7e104019c892333907afbdd6cdf35e57ff Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 13 Jun 2023 21:09:09 +0200 Subject: [PATCH 0681/2890] package/libfuse3: bump to version 3.15.0 Drop local patch that has been upstreamed but add a new one to fix build failure: ../meson.build:180:12: ERROR: Can not run test applications in this cross environment. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...ix-MS_LAZYTIME-not-defined-on-uclibc.patch | 48 ------------------- ...est-applications-for-cross-compiler-.patch | 43 +++++++++++++++++ package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 5 files changed, 45 insertions(+), 51 deletions(-) delete mode 100644 package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch create mode 100644 package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch diff --git a/.checkpackageignore b/.checkpackageignore index 14c9bdbb7a7a..5e1fec9e9732 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -740,7 +740,6 @@ package/libftdi1/0002-CMakeLists.txt-fix-paths-when-FTDIPP-is-set.patch Upstream package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch Upstream package/libfuse/0001-fix-aarch64-build.patch Upstream package/libfuse/0002-util-ulockmgr_server-c-conditionally-define-closefrom-fix-glibc-2-34.patch Upstream -package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch Upstream package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch Upstream package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch Upstream package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch Upstream diff --git a/package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch b/package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch deleted file mode 100644 index 58f9747d77dd..000000000000 --- a/package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 56038446952516da5d4cf09e1192824031082943 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 27 Mar 2023 21:08:57 +0200 -Subject: [PATCH] Fix MS_LAZYTIME not defined on uclibc - -[Upstream status: https://github.com/libfuse/libfuse/pull/753] -Signed-off-by: Giulio Benetti ---- - lib/mount.c | 5 +++++ - util/fusermount.c | 6 ++++++ - 2 files changed, 11 insertions(+) - -diff --git a/lib/mount.c b/lib/mount.c -index 1f1ee86..84e5c73 100644 ---- a/lib/mount.c -+++ b/lib/mount.c -@@ -27,6 +27,11 @@ - #include - #include - -+/* uclibc doesn't define MS_LAZYTIME */ -+#ifndef MS_LAZYTIME -+#define MS_LAZYTIME (1<<25) -+#endif -+ - #ifdef __NetBSD__ - #include - -diff --git a/util/fusermount.c b/util/fusermount.c -index 6e72f0d..82cc420 100644 ---- a/util/fusermount.c -+++ b/util/fusermount.c -@@ -25,6 +25,12 @@ - #include - #include - #include -+ -+/* uclibc doesn't define MS_LAZYTIME */ -+#ifndef MS_LAZYTIME -+#define MS_LAZYTIME (1<<25) -+#endif -+ - #include - #include - #include --- -2.34.1 - diff --git a/package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch b/package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch new file mode 100644 index 000000000000..b99b4c23f4dc --- /dev/null +++ b/package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch @@ -0,0 +1,43 @@ +From b58a0014bff619f1810af49441d987d732c4244e Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Tue, 13 Jun 2023 20:02:01 +1000 +Subject: [PATCH] Wrapper around test applications for cross compiler + environment in meson.build (#804) + +This enhances commit 7be56c57f93e3436b1fbd9ecc320de5c03a3e4b8 to allow build +fuse to be built using a cross compiler + +Fixes: +../meson.build:180:12: ERROR: Can not run test applications in this cross environment. + +Upstream: https://github.com/libfuse/libfuse/commit/b58a0014bff619f1810af49441d987d732c4244e + +Signed-off-by: Giulio Benetti +--- + meson.build | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 7aa4e0d..9707ea3 100644 +--- a/meson.build ++++ b/meson.build +@@ -177,10 +177,12 @@ int main() + } + ''' + +-result = cc.run(detect_getmntent_needs_unescape) +-if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping' +- message('getmntent does not unescape') +- add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c') ++if not meson.is_cross_build() ++ result = cc.run(detect_getmntent_needs_unescape) ++ if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping' ++ message('getmntent does not unescape') ++ add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c') ++ endif + endif + + # Write private test results into fuse_config.h (stored in build directory) +-- +2.34.1 + diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index df4df524d09d..155c29ecd29d 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 99688d68a753ee97eed51d536b216b8ae5d7fe0236c1a45d439357903bfd4d88 libfuse3-3.14.1.tar.gz +sha256 1e79f1dd60eaf79645c21411c4a7028c97b5e745ea677ac5bda747c90497a785 libfuse3-3.15.0.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index 61523820ad95..f1b294f74f3f 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.14.1 +LIBFUSE3_VERSION = 3.15.0 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE From 7988be7eb4d9c77821a059f3193263e4d47cafba Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 14 Jun 2023 20:53:21 +0200 Subject: [PATCH 0682/2890] package/dfu-programmer: new package Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/dfu-programmer/Config.in | 17 +++++++++++++++++ package/dfu-programmer/dfu-programmer.hash | 3 +++ package/dfu-programmer/dfu-programmer.mk | 21 +++++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/dfu-programmer/Config.in create mode 100644 package/dfu-programmer/dfu-programmer.hash create mode 100644 package/dfu-programmer/dfu-programmer.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7aa5980df7f3..56316201af1b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2308,6 +2308,7 @@ F: configs/roseapplepi_defconfig F: configs/sheevaplug_defconfig F: configs/visionfive_defconfig F: package/bats-core/ +F: package/dfu-programmer/ F: package/docker-compose/ F: package/dump1090/ F: package/fatcat/ diff --git a/package/Config.in b/package/Config.in index ad438667d263..bff090a66163 100644 --- a/package/Config.in +++ b/package/Config.in @@ -482,6 +482,7 @@ endmenu source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in" source "package/dbus-triggerd/Config.in" + source "package/dfu-programmer/Config.in" source "package/dfu-util/Config.in" source "package/dmidecode/Config.in" source "package/dmraid/Config.in" diff --git a/package/dfu-programmer/Config.in b/package/dfu-programmer/Config.in new file mode 100644 index 000000000000..6e0743e9d832 --- /dev/null +++ b/package/dfu-programmer/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_DFU_PROGRAMMER + bool "dfu-programmer" + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb + select BR2_PACKAGE_LIBUSB + help + Dfu-programmer is a multi-platform command-line programmer + for Atmel (8051, AVR, XMEGA & AVR32) chips with a USB + bootloader supporting ISP. Most Atmel devices having a USB + port come pre-programmed with the bootloader, and this is a + lightweight alternative to Atmel's own FLIP/BatchISP program. + + http://dfu-programmer.github.io/ + +comment "dfu-programmer needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/dfu-programmer/dfu-programmer.hash b/package/dfu-programmer/dfu-programmer.hash new file mode 100644 index 000000000000..afa1d97aed8b --- /dev/null +++ b/package/dfu-programmer/dfu-programmer.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 867eaf0a8cd10123715491807ab99cecb54dc6f09dddade4b2a42b0b0ef9e6b0 dfu-programmer-1.0.0.tar.gz +sha256 d8fb44c26fecbb2b8a368a6c0ed4f5478a401fab03744325407736a80383af76 COPYING diff --git a/package/dfu-programmer/dfu-programmer.mk b/package/dfu-programmer/dfu-programmer.mk new file mode 100644 index 000000000000..3b1589125c55 --- /dev/null +++ b/package/dfu-programmer/dfu-programmer.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# dfu-programmer +# +################################################################################ + +DFU_PROGRAMMER_VERSION = 1.0.0 +DFU_PROGRAMMER_SITE = https://github.com/dfu-programmer/dfu-programmer/releases/download/v$(DFU_PROGRAMMER_VERSION) +DFU_PROGRAMMER_LICENSE = GPL-2.0+ +DFU_PROGRAMMER_LICENSE_FILES = COPYING +DFU_PROGRAMMER_DEPENDENCIES = libusb + +# No update-bash-completion.sh in tarball. Fix sent upstream: +# https://github.com/dfu-programmer/dfu-programmer/pull/91 +define DFU_PROGRAMMER_ADD_MISSING_FILE + ln -s /bin/true $(@D)/update-bash-completion.sh +endef + +DFU_PROGRAMMER_POST_PATCH_HOOKS == DFU_PROGRAMMER_ADD_MISSING_FILE + +$(eval $(autotools-package)) From 59df3875b5e965872007ac22245aa6e048576644 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 14 Jun 2023 16:35:19 +0200 Subject: [PATCH 0683/2890] package/qemu: qemu systems emulation needs fdt when building for all targets defconfig fragment to reproduce the issue: BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y BR2_PACKAGE_QEMU=y BR2_PACKAGE_QEMU_SYSTEM=y ERROR: Problem encountered: fdt not available but required by targets aarch64-softmmu, arm-softmmu, i386-softmmu, loongarch64-softmmu, microblaze-softmmu, microblazeel-softmmu, mips64el-softmmu, nios2-softmmu, or1k-softmmu, ppc-softmmu, ppc64-softmmu, riscv32-softmmu, riscv64-softmmu, rx-softmmu, x86_64-softmmu Commit [1] select BR2_PACKAGE_QEMU_FDT for each individual emulator targets but forgot to select is when BR2_PACKAGE_QEMU_CHOOSE_TARGETS is not set (building for all targets). Fixes: http://autobuild.buildroot.org/results/e44/e444a02b899d325a9d99daed96b8cb96108383e7 [1] 44be514b21fd94096702b80c62d46c31d72f15a5 Signed-off-by: Romain Naour Cc: Carlos Santos Cc: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/qemu/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 91a1b288c6e8..6fb34a0dae09 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -52,6 +52,7 @@ config BR2_PACKAGE_QEMU_SYSTEM bool "Enable systems emulation" depends on !BR2_STATIC_LIBS # dtc select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_QEMU_FDT if !BR2_PACKAGE_QEMU_CHOOSE_TARGETS help Say 'y' to build system emulators/virtualisers. From 0adcc6d693d97b57586d04955bd68613d78578c3 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 14 Jun 2023 23:09:26 +0200 Subject: [PATCH 0684/2890] package/qemu: security bump to version 8.0.2 Fixes CVE-2023-0330: A vulnerability in the lsi53c895a device affects the latest version of qemu. A DMA-MMIO reentrancy problem may lead to memory corruption bugs like stack overflow or use-after-free. See: https://lists.gnu.org/archive/html/qemu-devel/2023-06/msg00221.html Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index e76aef0b3a77..b6fcad83e28a 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 bb60f0341531181d6cc3969dd19a013d0427a87f918193970d9adb91131e56d0 qemu-8.0.0.tar.xz +sha256 f060abd435fbe6794125e2c398568ffc3cfa540042596907a8b18edca34cf6a5 qemu-8.0.2.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 6a6905d75ff1..c530896fa867 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -6,7 +6,7 @@ # When updating the version, check whether the list of supported targets # needs to be updated. -QEMU_VERSION = 8.0.0 +QEMU_VERSION = 8.0.2 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c From 89585576728ebf9362394ae6e26df595098f8bbc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Jun 2023 20:07:57 +0200 Subject: [PATCH 0685/2890] package/x11r7/xlib_libX11: security bump version to 1.8.6 Fixes CVE-2023-3138: https://lists.x.org/archives/xorg-announce/2023-June/003406.html Release notes: https://lists.x.org/archives/xorg-announce/2023-June/003407.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index ed68164d5fe2..f443d947a47c 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-February/003318.html -sha256 c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518 libX11-1.8.4.tar.xz -sha512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e libX11-1.8.4.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-June/003407.html +sha256 59535b7cc6989ba806a022f7e8533b28c4397b9d86e9d07b6df0c0703fa25cc9 libX11-1.8.6.tar.xz +sha512 b94a578003078a42cea43d80fae2c54a3aaa30f706088bb3546331e9abfc180131cafb37887117abcc5b6116992e299974981eef96ecfcf883cc8a1aba4d1ade libX11-1.8.6.tar.xz # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index add16f49dbfa..75199f1a3d61 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.4 +XLIB_LIBX11_VERSION = 1.8.6 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From 8ef7b2069dd6462508c3c61373fe2802761c4d63 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Jun 2023 18:20:49 +0200 Subject: [PATCH 0686/2890] DEVELOPERS: Update email address for Bernd Kuhls Signed-off-by: Bernd Kuhls Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 56316201af1b..694dfe0bdde5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -311,7 +311,7 @@ F: package/taskd/ N: Benjamin Kamath F: package/lapack/ -N: Bernd Kuhls +N: Bernd Kuhls F: package/alsa-lib/ F: package/alsa-utils/ F: package/apache/ From 1db3f0f84449843476c2887d2ea09323c66f33a4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Jun 2023 18:49:39 +0200 Subject: [PATCH 0687/2890] package/ccache: bump version to 4.8.2 Release notes: https://ccache.dev/releasenotes.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/ccache/ccache.hash | 2 +- package/ccache/ccache.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 9b11f026ec14..2b6cd65a74d9 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 df0c64d15d3efaf0b4f6837dd6b1467e40eeaaa807db25ce79c3a08a46a84e36 ccache-4.7.4.tar.xz +sha256 3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49 ccache-4.8.2.tar.xz sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt sha256 56cf64f68b7b8150300acd79899941615523ea5c56c120e92f5b175b7cc78e3c LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 6b7d57b40ccc..ac4bc4aba5f5 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 4.7.4 +CCACHE_VERSION = 4.8.2 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others From 1dcabece6fb8755c7a2786bde8cc75040bc3fbcb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 Jun 2023 08:04:19 +0200 Subject: [PATCH 0688/2890] package/python-docker: needs python-packaging after bump to 6.0.1 Commit d680db0ba77dab (package/python-docker: bump to version 6.0.1) forgot to add the new dependency on python-packaging, leading to runtime errors: import docker File "/usr/lib/python3.11/site-packages/docker/__init__.py", line 2, in File "/usr/lib/python3.11/site-packages/docker/api/__init__.py", line 2, in File "/usr/lib/python3.11/site-packages/docker/api/client.py", line 10, in File "/usr/lib/python3.11/site-packages/docker/auth.py", line 7, in File "/usr/lib/python3.11/site-packages/docker/utils/__init__.py", line 3, in File "/usr/lib/python3.11/site-packages/docker/utils/decorators.py", line 4, in File "/usr/lib/python3.11/site-packages/docker/utils/utils.py", line 9, in ModuleNotFoundError: No module named 'packaging' Signed-off-by: Peter Korsgaard --- package/python-docker/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in index b2296f42eb92..ae5a7a518190 100644 --- a/package/python-docker/Config.in +++ b/package/python-docker/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_DOCKER bool "python-docker" # docker-engine may be running on another host, so no other dependency select BR2_PACKAGE_PYTHON3_SSL # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime From 8d0c8f0c6805c100ab01c6ce9d9e9d46560f864c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Jun 2023 22:42:27 +0200 Subject: [PATCH 0689/2890] package/openvpn: bump version to 2.6.5 Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.6/ChangeLog https://github.com/OpenVPN/openvpn/blob/release/2.6/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 8078b411578b..16bffb7e5702 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 371a2a323a99a79299b9b4caa4a31bc7b2cdff63236e68d429f3ee50e75f3dd4 openvpn-2.6.4.tar.gz +sha256 e34efdb9a3789a760cfc91d57349dfb1e31da169c98c06cb490c6a8a015638e2 openvpn-2.6.5.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 920677e170bd..7c2506870e9a 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.4 +OPENVPN_VERSION = 2.6.5 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 From b3f0cc20250873ad1b2c2c3777c46fc41a2f36ca Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 Jun 2023 15:54:53 +0200 Subject: [PATCH 0690/2890] Update for 2023.02.2 Signed-off-by: Peter Korsgaard (cherry picked from commit c92cc8796ed951f0604e9272677a9cdfcd93680f) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/CHANGES b/CHANGES index fec806a21598..83034c48597a 100644 --- a/CHANGES +++ b/CHANGES @@ -72,6 +72,46 @@ #15376: Libiconv config #15461: QtVirtualKeyboard segfaults +2023.02.2, released June 16th, 2023 + + Important / security related fixes. + + Infrastructure: Add BR2_HOST_CMAKE_AT_LEAST_* for packages + needing a newer host-cmake than what is currently enforced + (3.18) - Up to the version provided by the cmake package (3.22). + + utils/docker-run: Now correctly handles git + workdirs/worktrees. + + Defconfigs: QEMU s390x: Bump rootfs size to make room for + kernel modules, Stm32f4xx: Tweak config to save RAM, Xilinx + Versal vck190: Use correct (A72) CPU variant + + Updated/fixed packages: atkmm, bird, busybox, cairomm1_14, + cmake, containerd, crudini, cups, delve, docker-cli, + docker-engine, earlyoom, edid-decode, fluent-bit, freeswitch, + gcc, gdb, glibmm_2_66, gnupg2, go, gptfdisk, graphicsmagick, + intel-microcode, libass, libcurl, libdeflate, libgeos, + libgtk3, libjxl, libnftl, libopenssl, libressl, libssh, llvm, + lua, mesa3d, micropython, minidlna, moby-buildkit, mpd, mupdf, + ncurses, nftables, openjdk, openjdk-bin, php, postgresql, + python-can, python-django, python-django, python-ipython, + python-matplotlib, python-mupdf, python-requests, python3, + qemu, redis, rpm, runc, sdl2_mixer, tzdata, uclibc, vdr, + wilc-firmware, xapp_xcalc, xapp_xdpyinfo, xapp_xinput, + xapp_xwininfo, xdata_xbitmaps, xdata_xcursor-themes, + xdriver_xf86-input-mouse, xdriver_xf86-video-ark, + xdriver_xf86-video-geode, xdriver_xf86-video-neomagic, + xfont_encodings, xlib_libX11, xlib_libXaw, xlib_libXi, + xlib_libXfixes, xlib_libXft, xlib_libXpm, zfs, znc + + New packages: perl-clone, perl-http-message, python-asttokens, + python-executing, python-pure-eval, python-stack-data + + Issues resolved (http://bugs.uclibc.org): + + #15421: qemu_aarch64_ebbr_defconfig: Missing Linux kernel source code + 2023.02.1, released May 9th, 2023 Important / security related fixes. From ba9de70c2838d5f916dab36c6affa235e4ac970c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 Jun 2023 17:50:29 +0200 Subject: [PATCH 0691/2890] docs/website: update for 2023.02.2 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 2af7db1861c2..0a97d9f8224a 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
                Download
                -

                Latest long term support release: 2023.02.1

                +

                Latest long term support release: 2023.02.2

                - +
                - +
                -

                buildroot-2023.02.1.tar.gz

                -

                PGP signature

                +

                buildroot-2023.02.2.tar.gz

                +

                PGP signature

                - +
                - +
                -

                buildroot-2023.02.1.tar.xz

                -

                PGP signature

                +

                buildroot-2023.02.2.tar.xz

                +

                PGP signature

                diff --git a/docs/website/news.html b/docs/website/news.html index 1a2af7ccfc5c..83c5f48e0461 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

                News

                  +
                • +
                  +
                  +
                  +

                  2023.02.2 released

                  +

                  16 June 2023

                  +
                  +
                  +

                  The 2023.02.2 bugfix release is out, fixing a number of important / + security related issues discovered since the 2023.02.1 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2023.02.2 release.

                  +
                  +
                  +
                  • +
                • From 0bb63c6f5adc07532da494d1118dd7b6f061fb00 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 Jun 2023 08:04:20 +0200 Subject: [PATCH 0692/2890] support/testing: add python-docker test Python-docker needs a working docker setup to do anything useful, so add it to the existing docker_compose (which tests docker and docker-compose) rather than adding a completely new test. Signed-off-by: Peter Korsgaard Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- .../testing/tests/package/sample_python_docker.py | 12 ++++++++++++ support/testing/tests/package/test_docker_compose.py | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 support/testing/tests/package/sample_python_docker.py diff --git a/support/testing/tests/package/sample_python_docker.py b/support/testing/tests/package/sample_python_docker.py new file mode 100644 index 000000000000..a69097b4125a --- /dev/null +++ b/support/testing/tests/package/sample_python_docker.py @@ -0,0 +1,12 @@ +import docker + +client = docker.from_env() +info = client.info() +images = client.images.list() + +assert len(images) > 0 + +print('Version:', info['ServerVersion']) +print('Images:') +for i in images: + print(i.tags[0]) diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py index 38b669fc6d61..16027c9c3ada 100644 --- a/support/testing/tests/package/test_docker_compose.py +++ b/support/testing/tests/package/test_docker_compose.py @@ -4,6 +4,8 @@ class TestDockerCompose(infra.basetest.BRTest): + scripts = ["conf/docker-compose.yml", + "tests/package/sample_python_docker.py"] config = \ """ BR2_x86_64=y @@ -18,6 +20,8 @@ class TestDockerCompose(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.262" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DOCKER=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_DOCKER_CLI=y BR2_PACKAGE_DOCKER_COMPOSE=y @@ -27,7 +31,7 @@ class TestDockerCompose(infra.basetest.BRTest): # BR2_TARGET_ROOTFS_TAR is not set """.format( infra.filepath("tests/package/copy-sample-script-to-target.sh"), - infra.filepath("conf/docker-compose.yml"), + " ".join([infra.filepath(i) for i in scripts]), infra.filepath("conf/docker-compose-kernel.config")) def wait_for_dockerd(self): @@ -46,6 +50,9 @@ def docker_compose_test(self): self.assertRunOk('wget -q -O /tmp/busybox http://127.0.0.1/busybox', 120) self.assertRunOk('cmp /bin/busybox /tmp/busybox', 120) + def python_docker_test(self): + self.assertRunOk('python3 ./sample_python_docker.py', 120) + def test_run(self): kernel = os.path.join(self.builddir, "images", "bzImage") rootfs = os.path.join(self.builddir, "images", "rootfs.ext2") @@ -62,3 +69,4 @@ def test_run(self): self.wait_for_dockerd() self.docker_test() self.docker_compose_test() + self.python_docker_test() From 7bee0f837999fce6f9b3483c40a706f34be8a3b5 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 17 Jun 2023 09:21:30 +0200 Subject: [PATCH 0693/2890] package/luaposix: bump to version 36.2.1 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/luaposix/luaposix.hash | 2 +- package/luaposix/luaposix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index 2d54a6901ef9..d54395c29b40 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7944c2b4fbcef0667d407302740d87645325e751fd8d819f2b253c5d9ad0d497 luaposix-36.1.tar.gz +sha256 44e5087cd3c47058f9934b90c0017e4cf870b71619f99707dd433074622debb1 luaposix-36.2.1.tar.gz sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index d17c8188b547..d09a1bcd1dfc 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 36.1 +LUAPOSIX_VERSION = 36.2.1 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE From 1c512cc5bd9a1a02ed32dfe1c5db2c04efe7a9a7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 17 Jun 2023 08:12:45 +0200 Subject: [PATCH 0694/2890] package/kodi-peripheral-joystick: bump version to 20.1.9-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 1ccb528526eb..ea22c603ac51 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6e8fb553309d3ad48fad21d2d6cebdb537a4e2b88878b6fdc43707c7bc37e160 kodi-peripheral-joystick-20.1.8-Nexus.tar.gz +sha256 b1b379e7eb24a16702745c78a57b2f246a013becf5c2daf7579651cbf2188b82 kodi-peripheral-joystick-20.1.9-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index c893ae1247a6..a8c250242044 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.8-Nexus +KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.9-Nexus KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From af9a5bd7bc98200f3f4ca64692f93b10e6cfb05b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 22:48:17 +0200 Subject: [PATCH 0695/2890] package/php: security bump version to 8.2.7 Changelog: https://www.php.net/ChangeLog-8.php#8.2.7 Release notes: https://www.php.net/releases/8_2_7.php Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 96e8803cb27c..4fe77f1c5bac 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca php-8.2.6.tar.xz +sha256 4b9fb3dcd7184fe7582d7e44544ec7c5153852a2528de3b6754791258ffbdfa0 php-8.2.7.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 981da5b15d41..3bb27f1306fa 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.6 +PHP_VERSION = 8.2.7 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From bfffbd7ed871332d2300684afd1c177e0209ca92 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 20:52:52 +0200 Subject: [PATCH 0696/2890] package/gnupg2: bump version to 2.4.2 Added sha256 hash provided by upstream. Release notes: https://lists.gnupg.org/pipermail/gnupg-announce/2023q2/000479.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/gnupg2/gnupg2.hash | 10 ++++------ package/gnupg2/gnupg2.mk | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index baee8241045f..aa71881f419b 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,5 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2023q2/000478.html -sha1 d7d021101361a5e1166a6c0cc1731276e7134547 gnupg-2.4.1.tar.bz2 -# Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.1.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 76b71e5aeb443bfd910ce9cbc8281b617c8341687afb67bae455877972b59de8 gnupg-2.4.1.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 3efd495a94dc81fd0ea8788bef6c69d1f13cedd7 gnupg-2.4.2.tar.bz2 +sha256 97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49 gnupg-2.4.2.tar.bz2 +# Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index f7c7ae847c16..760af3b05e3c 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.1 +GNUPG2_VERSION = 2.4.2 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From 9440d72ca9b95be2214a51d092ba59d0653f6148 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 20:52:53 +0200 Subject: [PATCH 0697/2890] package/libgcrypt: bump to version 1.10.2 Release notes: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;h=c9a239615f8070427a96688b1be40a81e59e9b8a;hb=1c5cbacf3d88dded5063e959ee68678ff7d0fa56 Added upstream sha1 & sha256 hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libgcrypt/libgcrypt.hash | 8 ++++---- package/libgcrypt/libgcrypt.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 96f5e6b76c07..cfbf9eaf17d1 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.1.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de libgcrypt-1.10.1.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 0b9555960d84a09ea14e52360808f2e02e9c12d2 libgcrypt-1.10.2.tar.bz2 +sha256 3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03 libgcrypt-1.10.2.tar.bz2 +# Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 9232debb3a5e..4fffe5360e1f 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.10.1 +LIBGCRYPT_VERSION = 1.10.2 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB From 51885982ff8ae213e1d678bc64b954e67b85d096 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 20:52:54 +0200 Subject: [PATCH 0698/2890] package/libgpg-error: bump version to 1.47 Release notes: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=NEWS;h=9be1b714e05dbd7de7b822d9dbbd998f6bc26025;hb=a25cea92798a5ece3f49924911507f5335915ecc Added upstream sha1 & sha256 hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libgpg-error/libgpg-error.hash | 8 ++------ package/libgpg-error/libgpg-error.mk | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index ffe27e9d99c6..5c445ba0b277 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,10 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 a6e5efdd72e848aab4064e5ef4c6835ba344bcf1 libgpg-error-1.46.tar.bz2 - -# Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.46.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d libgpg-error-1.46.tar.bz2 +sha1 94668233fd7bd8e7c0ec5e363134cd53c575da60 libgpg-error-1.47.tar.bz2 +sha256 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb libgpg-error-1.47.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 3ab8535a9ce4..60e3da9de14a 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.46 +LIBGPG_ERROR_VERSION = 1.47 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ From 13f3b8e124c4978cc21e780d68219ccdb20b73e5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 20:52:55 +0200 Subject: [PATCH 0699/2890] package/libgpgme: bump to version 1.20.0 Added upstream sha1 & sha256 hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libgpgme/libgpgme.hash | 7 +++---- package/libgpgme/libgpgme.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash index 7d02b9e1391f..a71cec1e382c 100644 --- a/package/libgpgme/libgpgme.hash +++ b/package/libgpgme/libgpgme.hash @@ -1,6 +1,5 @@ -# Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.1.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f gpgme-1.17.1.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 369deeec95f1bb77fafc0b6c8fa65995ba82fd1e gpgme-1.20.0.tar.bz2 +sha256 25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750 gpgme-1.20.0.tar.bz2 # Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 2120ee8e3c06..21a0b30d3bff 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPGME_VERSION = 1.17.1 +LIBGPGME_VERSION = 1.20.0 LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPL-2.1+ From dfe1ca7872a45bcdc825ff0900d7fd929097a635 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 20:59:30 +0200 Subject: [PATCH 0700/2890] package/libxml2: bump version to 2.11.4 Release notes: https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.0.news https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.1.news https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.2.news https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.3.news https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.4.news Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 37030bdfaa73..f3650c5ec585 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.4.sha256sum -sha256 ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45 libxml2-2.10.4.tar.xz +# From https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.4.sha256sum +sha256 737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7 libxml2-2.11.4.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index cf26a36cc4b6..9f7774f719ec 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXML2_VERSION_MAJOR = 2.10 +LIBXML2_VERSION_MAJOR = 2.11 LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).4 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ From 6794f14d485dbfd93ef167ba46d24e7095003729 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 20:59:31 +0200 Subject: [PATCH 0701/2890] package/libxslt: bump to version 1.1.38 Release notes: https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.38.news Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libxslt/libxslt.hash | 4 ++-- package/libxslt/libxslt.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index c771e1fd7ef0..458c1388d32e 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.37.sha256sum -sha256 3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4 libxslt-1.1.37.tar.xz +# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.38.sha256sum +sha256 1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1 libxslt-1.1.38.tar.xz # Hash for license file: sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 95b0325c94f8..ec066fbfa226 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.37 +LIBXSLT_VERSION = 1.1.38 LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES From 11adbe4135f8433867bfde53e790769c6e35ade7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 18:55:29 +0200 Subject: [PATCH 0702/2890] package/hwdata: bump version to 0.371 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/hwdata/hwdata.hash | 2 +- package/hwdata/hwdata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 16ab48654c04..84979a70fac0 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b17f3b81b887b9027fe5efa1ab1099afb472c843f89a9f5cc9ca4030b75bbdb2 hwdata-0.369.tar.gz +sha256 8059ed6f696b5be4bf77c59d57fc26e35d9e579ba2629e325400a6eb8b91089f hwdata-0.371.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 755a9c93f1cd..a7dd84f62c84 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.369 +HWDATA_VERSION = 0.371 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE From 3e096ca6c914a4999467d7fc4d04172c1de63637 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 19:49:38 +0200 Subject: [PATCH 0703/2890] package/meson: bump to version 1.1.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 6993b756ae49..cb36b674fa83 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/1.0.0/meson-1.0.0.tar.gz.asc -sha256 aa50a4ba4557c25e7d48446abfde857957dcdf58385fffbe670ba0e8efacce05 meson-1.0.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc +sha256 d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c meson-1.1.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e417d8d62721..503aca8c250e 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 1.0.0 +MESON_VERSION = 1.1.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From ed4792aaec66c963ca780b256c6c9f487a432c6b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 9 Jun 2023 16:40:26 +0200 Subject: [PATCH 0704/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index b4d32f6ea310..69bf91bbf9a1 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.3.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.3.7" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 18ede2d60f21..20e67fc4d190 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 7a6a1f0dfa0bf7f45f9d4a7b409315cf32267850adab4db033a17de0320a24ef linux-6.3.6.tar.xz -sha256 7c88b7a09ba2b9e47b78eba2b32b1db6a4d89636f7ddd586545f9671a2521a6c linux-6.1.32.tar.xz +sha256 fe369743996c522a7b473e99dcf8f88847bd5cc88546fd3b7a41d9fe5a5b97a9 linux-6.3.7.tar.xz +sha256 b87d6ba8ea7328e8007a7ea9171d1aa0d540d95eacfcab09578e0a3b623dd2cd linux-6.1.33.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 1b076860779235e90519e867c1ec78c7a34d1125d8fdba787ff495c7c14f1214 linux-5.15.115.tar.xz -sha256 de8ec58929460e3a14c1b0502f4a449f24c988a7a4a03ff04a82fb2d665fe9f6 linux-5.10.182.tar.xz -sha256 9607881878fbd21e0dec4e8192b0f6352d17fd74c3ec23ffe6b0a24093efb1a4 linux-5.4.245.tar.xz +sha256 f617c9d1bb5326cc93495938f43eb8cb9aea9d2f451e5a99bce2893f296e179a linux-5.15.116.tar.xz +sha256 409497c635caf49614de21950ec091eb621a5d5fe1f63fc418ef68ac38b56119 linux-5.10.183.tar.xz +sha256 0938790a858fd0af6aa6b27a3bdf4c5d4a46aba60e6178156980d58bef7ed9ea linux-5.4.246.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 7fb9ee20c7e52f9be6d9f501e8498a22f4b364abfde136143749a77e597fd03e linux-4.19.284.tar.xz -sha256 ac8318f1c1d387e23ccfa760ec042943372df23e3c4e2408177fb5a3f6488f76 linux-4.14.316.tar.xz +sha256 aaa1775359c7a066ec70852ea2709fe7e7109517b7d895f34e237132db8edc16 linux-4.19.285.tar.xz +sha256 8cf28f5aae6f77fa718861c415d646a189a7f9493ef0ccb461575a092af03c30 linux-4.14.317.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f9a164d78d31..00ec22d60645 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -396,13 +396,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.316" if BR2_KERNEL_HEADERS_4_14 - default "4.19.284" if BR2_KERNEL_HEADERS_4_19 - default "5.4.245" if BR2_KERNEL_HEADERS_5_4 - default "5.10.182" if BR2_KERNEL_HEADERS_5_10 - default "5.15.115" if BR2_KERNEL_HEADERS_5_15 - default "6.1.32" if BR2_KERNEL_HEADERS_6_1 - default "6.3.6" if BR2_KERNEL_HEADERS_6_3 + default "4.14.317" if BR2_KERNEL_HEADERS_4_14 + default "4.19.285" if BR2_KERNEL_HEADERS_4_19 + default "5.4.246" if BR2_KERNEL_HEADERS_5_4 + default "5.10.183" if BR2_KERNEL_HEADERS_5_10 + default "5.15.116" if BR2_KERNEL_HEADERS_5_15 + default "6.1.33" if BR2_KERNEL_HEADERS_6_1 + default "6.3.7" if BR2_KERNEL_HEADERS_6_3 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 479eb1b2dba323eef70a8f82223e6f17b909b781 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 9 Jun 2023 16:43:13 +0200 Subject: [PATCH 0705/2890] package/kodi-pvr-nextpvr: bump version to 20.4.2-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index b89320d9c09e..9ef0d4e75858 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bad9e7dd4f67348015f8fc477e0c4c8447e00dbd38b9f6548d1ce04f0845b1fd kodi-pvr-nextpvr-20.4.1-Nexus.tar.gz +sha256 1ce85447426ddf6d443a5e3444145a2d3af65ce73d9fb583e42cd8afc9d599a5 kodi-pvr-nextpvr-20.4.2-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index 7b1140795496..2629cd914765 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 20.4.1-Nexus +KODI_PVR_NEXTPVR_VERSION = 20.4.2-Nexus KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md From cf0cf882ee76c13356f818e1c2ae19b9de3d1ffb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 10:35:28 +0200 Subject: [PATCH 0706/2890] package/lcms2: bump version to 2.15 Release notes: https://littlecms.com/blog/2023/03/01/lcms2-2.15/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/lcms2/lcms2.hash | 6 +++--- package/lcms2/lcms2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index 700b9746f18f..45728a36f169 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.14 -sha1 94350a2638fe58da736e8726048c859b46a69e6f lcms2-2.14.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.15 +sha1 b143ff29b03676119dbca30f13cbed72af15cce8 lcms2-2.15.tar.gz # Locally computed: -sha256 28474ea6f6591c4d4cee972123587001a4e6e353412a41b3e9e82219818d5740 lcms2-2.14.tar.gz +sha256 b20cbcbd0f503433be2a4e81462106fa61050a35074dc24a4e356792d971ab39 lcms2-2.15.tar.gz sha256 46d4e05af3bce75332a12d01f19bcce7e32b6bac544be28a64043d0231291e31 COPYING diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 743b0ec8583c..3892dbfbdcf2 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LCMS2_VERSION = 2.14 +LCMS2_VERSION = 2.15 LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING From 34c2252e8c280d1d0bbdff2fed27c9c936f6f8c4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 10:39:57 +0200 Subject: [PATCH 0707/2890] package/leafpad: bump version to 0.8.19 Changelog: https://github.com/tarot231/leafpad/blob/main/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/leafpad/leafpad.hash | 2 +- package/leafpad/leafpad.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/leafpad/leafpad.hash b/package/leafpad/leafpad.hash index e21c07ad2cd6..4f6e68f0a2ac 100644 --- a/package/leafpad/leafpad.hash +++ b/package/leafpad/leafpad.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c leafpad-0.8.18.1.tar.gz +sha256 07d3f712f4dbd0a33251fd1dee14e21afdc9f92090fc768c11ab0ac556adbe97 leafpad-0.8.19.tar.gz # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk index c6c28d12e8ea..608fa37be4de 100644 --- a/package/leafpad/leafpad.mk +++ b/package/leafpad/leafpad.mk @@ -4,7 +4,7 @@ # ################################################################################ -LEAFPAD_VERSION = 0.8.18.1 +LEAFPAD_VERSION = 0.8.19 LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad LEAFPAD_DEPENDENCIES = libgtk2 host-intltool LEAFPAD_LICENSE = GPL-2.0+ From c136b777dfd8cff836a6483d9b7b6131c746acd3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 10:46:37 +0200 Subject: [PATCH 0708/2890] package/less: bump version to 633 Removed patch which is included in this version. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...-on-invalid-embedded-escape-sequence.patch | 27 ------------------- package/less/less.hash | 4 +-- package/less/less.mk | 5 +--- 4 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch diff --git a/.checkpackageignore b/.checkpackageignore index 5e1fec9e9732..29d816956a3d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -685,7 +685,6 @@ package/lcdproc/0001-LCDd.conf.patch Upstream package/lcdproc/0002-Add-missing-ioctl-header.patch Upstream package/lcdproc/0003-Fixcompilation-with-GCC-10-x.patch Upstream package/leafnode2/0001-cross_makefile.patch Upstream -package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch Upstream package/let-me-create/0001-fix-build-with-musl-C-library.patch Upstream package/leveldb/0001-Fix-compilation-with-g-4.8.2.patch Upstream package/leveldb/0002-CMake-install-libmemenv.a.patch Upstream diff --git a/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch deleted file mode 100644 index 233f949e2475..000000000000 --- a/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 -From: Mark Nudelman -Date: Fri, 7 Oct 2022 19:25:46 -0700 -Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. - -[Retrieved from: -https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c] -Signed-off-by: Fabrice Fontaine ---- - line.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/line.c b/line.c -index 236c49ae..cba7bdd1 100644 ---- a/line.c -+++ b/line.c -@@ -633,8 +633,8 @@ ansi_step(pansi, ch) - /* Hyperlink ends with \7 or ESC-backslash. */ - if (ch == '\7') - return ANSI_END; -- if (pansi->prev_esc && ch == '\\') -- return ANSI_END; -+ if (pansi->prev_esc) -+ return (ch == '\\') ? ANSI_END : ANSI_ERR; - pansi->prev_esc = (ch == ESC); - return ANSI_MID; - } diff --git a/package/less/less.hash b/package/less/less.hash index 19be26cae03b..8018c9fab1b5 100644 --- a/package/less/less.hash +++ b/package/less/less.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # using DSA key F153A7C833235259 -# https://www.greenwoodsoftware.com/less/less-608.sig -sha256 a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209 less-608.tar.gz +# https://www.greenwoodsoftware.com/less/less-633.sig +sha256 2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f less-633.tar.gz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/less/less.mk b/package/less/less.mk index dfbd411863a7..91ce08f4f0de 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -4,16 +4,13 @@ # ################################################################################ -LESS_VERSION = 608 +LESS_VERSION = 633 LESS_SITE = http://www.greenwoodsoftware.com/less LESS_LICENSE = GPL-3.0+ LESS_LICENSE_FILES = COPYING LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses -# 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch -LESS_IGNORE_CVES += CVE-2022-46663 - define LESS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less endef From 3fc82816b4a898e51a45e46d77b0bc1fec397a22 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 10:54:43 +0200 Subject: [PATCH 0709/2890] package/libcap: security bump version to 2.69 Fixes - CVE-2023-2602 https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=bc6b36682f188020ee4770fae1d41bde5b2c97bb - CVE-2023-2603 https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=422bec25ae4a1ab03fd4d6f728695ed279173b18 Updated license hash due to an upstream commit which added a SPDX header: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=70998415a87587f31063a26a1e52c6f7806b7834 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libcap/libcap.hash | 4 ++-- package/libcap/libcap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index 5fc81739057d..0f1501d31bc3 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 73e350020cc31fe15360879d19384ffa3395a825f065fcf6bda3a5cdf965bebd libcap-2.65.tar.xz +sha256 f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb libcap-2.69.tar.xz # Hash for license file: -sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License +sha256 68467e731f4744bd6e0bb69e8df9c3a994e09cd6b203d0c41327ac6d079c581d License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 728a6ba6ccff..c9727c75c969 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.65 +LIBCAP_VERSION = 2.69 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause From 6a70ffd6e9dd598b4a2c1a389a18350fd88a6a1e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 10:59:24 +0200 Subject: [PATCH 0710/2890] package/libcodec2: bump version to 1.1.0 Removed patch which is included in this version. Release notes: https://github.com/drowe67/codec2/releases/tag/v1.1.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - package/libcodec2/0001-update-cmake.patch | 301 ---------------------- package/libcodec2/libcodec2.hash | 2 +- package/libcodec2/libcodec2.mk | 2 +- 4 files changed, 2 insertions(+), 304 deletions(-) delete mode 100644 package/libcodec2/0001-update-cmake.patch diff --git a/.checkpackageignore b/.checkpackageignore index 29d816956a3d..c78168e5ea4d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -707,7 +707,6 @@ package/libcec/0001-cecloader-h-fix-null-return.patch Upstream package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch Upstream package/libcgicc/0001-disable-documentation-option.patch Sob Upstream package/libclc/0001-support-out-of-tree-build.patch Upstream -package/libcodec2/0001-update-cmake.patch Upstream package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch Upstream package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch Upstream package/libcuefile/0001-fix-static-link.patch Upstream diff --git a/package/libcodec2/0001-update-cmake.patch b/package/libcodec2/0001-update-cmake.patch deleted file mode 100644 index e983800e2787..000000000000 --- a/package/libcodec2/0001-update-cmake.patch +++ /dev/null @@ -1,301 +0,0 @@ -From 812d69af486e608a10380ed5817b03d08c6e786a Mon Sep 17 00:00:00 2001 -From: "A. Maitland Bottoms" -Date: Sun, 17 Jul 2022 17:04:44 -0400 -Subject: [PATCH] update cmake - -Some minor refactoring of Codec2 build to better use CMake -features to improve readability ans maintainability. - -[Retrieved from: -https://github.com/drowe67/codec2/commit/812d69af486e608a10380ed5817b03d08c6e786a] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 48 +++++--------------------- - src/CMakeLists.txt | 84 ++++++++++++++++++++++++---------------------- - 2 files changed, 53 insertions(+), 79 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 54ac1f4f4..998af5ddf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,19 +5,13 @@ - # Please report questions, comments, problems, or patches to the freetel - # mailing list: https://lists.sourceforge.net/lists/listinfo/freetel-codec2 - # --set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") -- --project(codec2) -- --cmake_minimum_required(VERSION 3.0) -- --# Set policies here, probably should move to cmake dir. --if(POLICY CMP0075) -- cmake_policy(SET CMP0075 NEW) --endif() --if(POLICY CMP0079) -- cmake_policy(SET CMP0079 NEW) --endif() -+cmake_minimum_required(VERSION 3.13) -+project(CODEC2 -+ VERSION 1.0.5 -+ DESCRIPTION "Next-Generation Digital Voice for Two-Way Radio" -+ HOMEPAGE_URL "https://www.rowetel.com/codec2.html" -+ LANGUAGES C -+ ) - - include(GNUInstallDirs) - mark_as_advanced(CLEAR -@@ -39,23 +33,6 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") - "separate build directory and run cmake from there.") - endif("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") - --# --# Set project version information. This should probably be done via external --# file at some point. --# --set(CODEC2_VERSION_MAJOR 1) --set(CODEC2_VERSION_MINOR 0) --# Set to patch level if needed, otherwise leave FALSE. --# Must be positive (non-zero) if set, since 0 == FALSE in CMake. --set(CODEC2_VERSION_PATCH 5) --set(CODEC2_VERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}") --# Patch level version bumps should not change API/ABI. --set(SOVERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}") --if(CODEC2_VERSION_PATCH) -- set(CODEC2_VERSION "${CODEC2_VERSION}.${CODEC2_VERSION_PATCH}") --endif() --message(STATUS "codec2 version: ${CODEC2_VERSION}") -- - # Set default build type - if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Debug") -@@ -65,6 +42,7 @@ endif() - if(BUILD_OSX_UNIVERSAL) - set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64") - endif(BUILD_OSX_UNIVERSAL) -+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") - - # - # Find the git hash if this is a working copy. -@@ -190,10 +168,6 @@ if (_GNU_SOURCE) - add_definitions(-D_GNU_SOURCE=1) - endif() - --if(UNIX) -- set(CMAKE_REQUIRED_LIBRARIES m) --endif() -- - check_symbol_exists(floor math.h HAVE_FLOOR) - check_symbol_exists(ceil math.h HAVE_CEIL) - check_symbol_exists(pow math.h HAVE_POW) -@@ -288,11 +262,7 @@ else() - endif() - - # Return the date (yyyy-mm-dd) --macro(DATE RESULT) -- execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE ${RESULT}) --endmacro() --DATE(DATE_RESULT) --string(REGEX REPLACE "\n$" "" DATE_RESULT "${DATE_RESULT}") -+string(TIMESTAMP DATE_RESULT "%Y-%m-%d" UTC) - message(STATUS "Compilation date = XX${DATE_RESULT}XX") - - set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}-${DATE_RESULT}-${FREEDV_HASH}") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 642404962..cb0990bc2 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -81,7 +81,7 @@ else(CMAKE_CROSSCOMPILING) - # Build code generator binaries. These do not get installed. - # generate_codebook - add_executable(generate_codebook generate_codebook.c) -- target_link_libraries(generate_codebook m ${CMAKE_REQUIRED_LIBRARIES}) -+ target_link_libraries(generate_codebook m) - # Make native builds available for cross-compiling. - export(TARGETS generate_codebook - FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake) -@@ -238,12 +238,16 @@ set(CODEC2_PUBLIC_HEADERS - # - # Setup the codec2 library - # -+# Patch level version bumps should not change API/ABI. -+set(SOVERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}") -+message(STATUS "codec2 version: ${CODEC2_VERSION}") - add_library(codec2 ${CODEC2_SRCS}) - if(UNIX) -- target_link_libraries(codec2 m) -+ target_link_libraries(codec2 PUBLIC m) - endif(UNIX) - if(LPCNET AND lpcnetfreedv_FOUND) -- target_link_libraries(codec2 lpcnetfreedv) -+ target_link_libraries(codec2 PRIVATE lpcnetfreedv) -+ list(APPEND CODEC2_PUBLIC_HEADERS ${CMAKE_SOURCE_DIR}/lpcnet/src/lpcnet_freedv.h) - endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - set_target_properties(codec2 PROPERTIES -@@ -269,70 +273,70 @@ export(TARGETS codec2 - ) - - add_executable(c2enc c2enc.c) --target_link_libraries(c2enc ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(c2enc codec2) - - add_executable(c2dec c2dec.c) --target_link_libraries(c2dec ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(c2dec codec2) - - add_executable(c2sim c2sim.c sd.c) --target_link_libraries(c2sim ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(c2sim codec2) - - add_executable(fdmdv_get_test_bits fdmdv_get_test_bits.c fdmdv.c kiss_fft.c codec2_fft.c kiss_fftr.c) --target_link_libraries(fdmdv_get_test_bits m ${CMAKE_REQUIRED_LIBRARIES}) -+target_link_libraries(fdmdv_get_test_bits m) - - add_executable(fdmdv_mod fdmdv_mod.c fdmdv.c kiss_fft.c codec2_fft.c kiss_fftr.c) --target_link_libraries(fdmdv_mod m ${CMAKE_REQUIRED_LIBRARIES}) -+target_link_libraries(fdmdv_mod m) - - add_executable(fdmdv_demod fdmdv_demod.c fdmdv.c kiss_fft.c octave.c modem_stats.c codec2_fft.c kiss_fftr.c) --target_link_libraries(fdmdv_demod m ${CMAKE_REQUIRED_LIBRARIES}) -+target_link_libraries(fdmdv_demod m) - - add_executable(fdmdv_put_test_bits fdmdv_put_test_bits.c fdmdv.c kiss_fft.c codec2_fft.c kiss_fftr.c) --target_link_libraries(fdmdv_put_test_bits m ${CMAKE_REQUIRED_LIBRARIES}) -+target_link_libraries(fdmdv_put_test_bits m) - - add_executable(fdmdv_channel fdmdv_channel.c) --target_link_libraries(fdmdv_channel ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(fdmdv_channel codec2) - - add_executable(insert_errors insert_errors.c) --target_link_libraries(insert_errors ${CMAKE_REQUIRED_LIBRARIES}) -+target_link_libraries(insert_errors) - - add_executable(freedv_tx freedv_tx.c) --target_link_libraries(freedv_tx ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(freedv_tx codec2) - - add_executable(freedv_rx freedv_rx.c) --target_link_libraries(freedv_rx ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(freedv_rx codec2) - - add_executable(freedv_data_raw_tx freedv_data_raw_tx.c) --target_link_libraries(freedv_data_raw_tx ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(freedv_data_raw_tx codec2) - - add_executable(freedv_data_raw_rx freedv_data_raw_rx.c octave.c) --target_link_libraries(freedv_data_raw_rx ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(freedv_data_raw_rx codec2) - - add_executable(freedv_data_tx freedv_data_tx.c) --target_link_libraries(freedv_data_tx ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(freedv_data_tx codec2) - - add_executable(freedv_data_rx freedv_data_rx.c) --target_link_libraries(freedv_data_rx ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(freedv_data_rx codec2) - - add_executable(freedv_mixed_tx freedv_mixed_tx.c) --target_link_libraries(freedv_mixed_tx ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(freedv_mixed_tx codec2) - - add_executable(freedv_mixed_rx freedv_mixed_rx.c) --target_link_libraries(freedv_mixed_rx ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(freedv_mixed_rx codec2) - - add_executable(fsk_mod fsk_mod.c) --target_link_libraries(fsk_mod ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(fsk_mod codec2) - - add_executable(fsk_mod_ext_vco fsk_mod_ext_vco.c) --target_link_libraries(fsk_mod_ext_vco m ${CMAKE_REQUIRED_LIBRARIES}) -+target_link_libraries(fsk_mod_ext_vco m) - - add_executable(fsk_demod fsk_demod.c modem_probe.c octave.c) --target_link_libraries(fsk_demod ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(fsk_demod codec2) - - add_executable(fsk_get_test_bits fsk_get_test_bits.c) - target_link_libraries(fsk_get_test_bits) - - add_executable(fsk_put_test_bits fsk_put_test_bits.c) --target_link_libraries(fsk_put_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(fsk_put_test_bits codec2) - - add_executable(framer framer.c) - target_link_libraries(framer) -@@ -341,46 +345,46 @@ add_executable(deframer deframer.c) - target_link_libraries(deframer) - - add_executable(fm_demod fm_demod.c fm.c) --target_link_libraries(fm_demod m ${CMAKE_REQUIRED_LIBRARIES}) -+target_link_libraries(fm_demod m) - - add_executable(cohpsk_mod cohpsk_mod.c) --target_link_libraries(cohpsk_mod ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(cohpsk_mod codec2) - - add_executable(ofdm_get_test_bits ofdm_get_test_bits.c) --target_link_libraries(ofdm_get_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(ofdm_get_test_bits codec2) - - add_executable(ofdm_put_test_bits ofdm_put_test_bits.c) --target_link_libraries(ofdm_put_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(ofdm_put_test_bits codec2) - - add_executable(ofdm_mod ofdm_mod.c) --target_link_libraries(ofdm_mod ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(ofdm_mod codec2) - - add_executable(ofdm_demod ofdm_demod.c octave.c) --target_link_libraries(ofdm_demod ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(ofdm_demod codec2) - - add_executable(fmfsk_mod fmfsk_mod.c) --target_link_libraries(fmfsk_mod ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(fmfsk_mod codec2) - - add_executable(fmfsk_demod fmfsk_demod.c modem_probe.c octave.c) --target_link_libraries(fmfsk_demod ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(fmfsk_demod codec2) - - add_executable(vhf_deframe_c2 vhf_deframe_c2.c) --target_link_libraries(vhf_deframe_c2 ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(vhf_deframe_c2 codec2) - - add_executable(vhf_frame_c2 vhf_frame_c2.c) --target_link_libraries(vhf_frame_c2 ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(vhf_frame_c2 codec2) - - add_executable(cohpsk_demod cohpsk_demod.c octave.c) --target_link_libraries(cohpsk_demod ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(cohpsk_demod codec2) - - add_executable(cohpsk_get_test_bits cohpsk_get_test_bits.c) --target_link_libraries(cohpsk_get_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(cohpsk_get_test_bits codec2) - - add_executable(cohpsk_put_test_bits cohpsk_put_test_bits.c octave.c) --target_link_libraries(cohpsk_put_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(cohpsk_put_test_bits codec2) - - add_executable(ch ch.c) --target_link_libraries(ch ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(ch codec2) - - add_executable(tollr tollr.c) - -@@ -388,10 +392,10 @@ add_executable(ldpc_noise ldpc_noise.c) - target_link_libraries(ldpc_noise m) - - add_executable(ldpc_enc ldpc_enc.c) --target_link_libraries(ldpc_enc ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(ldpc_enc codec2) - - add_executable(ldpc_dec ldpc_dec.c) --target_link_libraries(ldpc_dec ${CMAKE_REQUIRED_LIBRARIES} codec2) -+target_link_libraries(ldpc_dec codec2) - - install(TARGETS codec2 EXPORT codec2-config - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib diff --git a/package/libcodec2/libcodec2.hash b/package/libcodec2/libcodec2.hash index ba44aa015c19..b2de750c3440 100644 --- a/package/libcodec2/libcodec2.hash +++ b/package/libcodec2/libcodec2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cd9a065dd1c3477f6172a0156294f767688847e4d170103d1f08b3a075f82826 libcodec2-1.0.5.tar.gz +sha256 d56ba661008a780b823d576a5a2742c94d0b0507574643a7d4f54c76134826a3 libcodec2-1.1.0.tar.gz sha256 9ebb6f82b7380a62ac74c5f0322c88e6744dedf2ebe1f54d6f088282b39844bf COPYING diff --git a/package/libcodec2/libcodec2.mk b/package/libcodec2/libcodec2.mk index b97db8ff59d9..66758a169725 100644 --- a/package/libcodec2/libcodec2.mk +++ b/package/libcodec2/libcodec2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCODEC2_VERSION = 1.0.5 +LIBCODEC2_VERSION = 1.1.0 LIBCODEC2_SITE = $(call github,drowe67,codec2,v$(LIBCODEC2_VERSION)) LIBCODEC2_LICENSE = LGPL-2.1 LIBCODEC2_LICENSE_FILES = COPYING From cc69dbf8fdef6619c4ea09a4aaa97cd5ad3ee423 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 11:06:08 +0200 Subject: [PATCH 0711/2890] package/libedit: bump version to 20221030-3.1 Rebased patch, switched _SITE to https. Changelog: https://www.thrysoee.dk/editline/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libedit/0001-check-bsd-functions-in-libbsd.patch | 8 ++++---- package/libedit/libedit.hash | 2 +- package/libedit/libedit.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/libedit/0001-check-bsd-functions-in-libbsd.patch b/package/libedit/0001-check-bsd-functions-in-libbsd.patch index 0af9472f171c..5f056ff5adbc 100644 --- a/package/libedit/0001-check-bsd-functions-in-libbsd.patch +++ b/package/libedit/0001-check-bsd-functions-in-libbsd.patch @@ -3,20 +3,20 @@ configure: on Linux, the BSD functions require linking against libbsd Signed-off-by: "Fabrice Fontaine" (Rebased against 20210910-3.1) Signed-off-by: "Yann E. MORIN" -(Rebased against 20150325-3.1) +(Rebased against 20150325-3.1 & 20221030-3.1) Signed-off-by: Bernd Kuhls diff -durN libedit-20130712-3.1.orig/configure.ac libedit-20130712-3.1/configure.ac --- libedit-20130712-3.1.orig/configure.ac 2013-07-12 20:39:22.000000000 +0200 +++ libedit-20130712-3.1/configure.ac 2013-07-28 23:35:35.012676469 +0200 -@@ -117,6 +117,10 @@ +@@ -119,6 +119,10 @@ + #AC_FUNC_MALLOC #AC_FUNC_REALLOC - AC_TYPE_SIGNAL AC_FUNC_STAT + +# Search for libbsd for *vis functions +AC_CHECK_LIB([bsd], [vis]) + - AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat vis strvis strunvis __secure_getenv secure_getenv]) + AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat vis strvis strunvis __secure_getenv secure_getenv reallocarr]) # strlcpy diff --git a/package/libedit/libedit.hash b/package/libedit/libedit.hash index 6d139730e8df..2e7363d82838 100644 --- a/package/libedit/libedit.hash +++ b/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6792a6a992050762edcca28ff3318cdb7de37dccf7bc30db59fcd7017eed13c5 libedit-20210910-3.1.tar.gz +sha256 f0925a5adf4b1bf116ee19766b7daa766917aec198747943b1c4edf67a4be2bb libedit-20221030-3.1.tar.gz sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index 595a59f7029f..576a16317320 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBEDIT_VERSION = 20210910-3.1 -LIBEDIT_SITE = http://www.thrysoee.dk/editline +LIBEDIT_VERSION = 20221030-3.1 +LIBEDIT_SITE = https://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses LIBEDIT_LICENSE = BSD-3-Clause From 34f6e68a8cc32f4d645a1439f46f8f537a6e700e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 11:17:31 +0200 Subject: [PATCH 0712/2890] package/libinput: bump version to 1.23.0 Release notes: https://lists.freedesktop.org/archives/wayland-devel/2022-June/042245.html https://lists.freedesktop.org/archives/wayland-devel/2022-November/042515.html https://lists.freedesktop.org/archives/wayland-devel/2023-January/042583.html https://lists.freedesktop.org/archives/wayland-devel/2023-March/042642.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libinput/libinput.hash | 2 +- package/libinput/libinput.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index d8282ff03b5a..f6a67fc1ed70 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 08c003f724f361ed21f4dfbfe755a6c115b85385f1418907bb98f185457273f0 libinput-1.20.1.tar.bz2 +sha256 fad7011705a21f500229199f789f3e3e794b4c9826b70073745cdaec23bc1d0b libinput-1.23.0.tar.bz2 # License files sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index d9a7ed1519da..a4d30b591098 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.20.1 +LIBINPUT_VERSION = 1.23.0 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.bz2 LIBINPUT_SITE = https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION) LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From 5db037e1e544bfe18aa077ddf9a6c894bd308922 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 11:20:34 +0200 Subject: [PATCH 0713/2890] package/libplist: bump version to 2.3.0 Release notes: https://github.com/libimobiledevice/libplist/releases/tag/2.3.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libplist/libplist.hash | 2 +- package/libplist/libplist.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libplist/libplist.hash b/package/libplist/libplist.hash index 4dab755e5dbc..460f63516a78 100644 --- a/package/libplist/libplist.hash +++ b/package/libplist/libplist.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4a5517e5377ec421df84c586ba85bb4e1d26f11ad203d7d450a907c0156fbd9a libplist-2.2.0.tar.bz2 +sha256 4e8580d3f39d3dfa13cefab1a13f39ea85c4b0202e9305c5c8f63818182cac61 libplist-2.3.0.tar.bz2 sha256 7619c753cac95d4740220223bde48a032606fcaccde5e546f9bc444c81ab356d COPYING diff --git a/package/libplist/libplist.mk b/package/libplist/libplist.mk index e7cecb612db5..8f094c133dfb 100644 --- a/package/libplist/libplist.mk +++ b/package/libplist/libplist.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPLIST_VERSION = 2.2.0 +LIBPLIST_VERSION = 2.3.0 LIBPLIST_SOURCE = libplist-$(LIBPLIST_VERSION).tar.bz2 LIBPLIST_SITE = https://github.com/libimobiledevice/libplist/releases/download/$(LIBPLIST_VERSION) LIBPLIST_INSTALL_STAGING = YES From 043d0e6f6ca0e99ab36bf845a56a416850d70fb1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 10 Jun 2023 14:25:15 +0200 Subject: [PATCH 0714/2890] package/libgtk3: bump to version 3.24.38 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 22c37bf60565..4d6c210c62dc 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.37.sha256sum -sha256 6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57 gtk+-3.24.37.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.38.sha256sum +sha256 ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7 gtk+-3.24.38.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 8291b8d356bb..6655a0d0979b 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).37 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).38 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From 9a141f7ec5048a840f06d18f4812cacbb54cc2d3 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 10 Jun 2023 15:53:06 +0200 Subject: [PATCH 0715/2890] package/mc: bump to version 4.8.29 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/mc/mc.hash | 4 ++-- package/mc/mc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mc/mc.hash b/package/mc/mc.hash index b0381474ffde..5edfc79113c3 100644 --- a/package/mc/mc.hash +++ b/package/mc/mc.hash @@ -1,4 +1,4 @@ -# Hash from http://ftp.midnight-commander.org/mc-4.8.28.sha256 -sha256 e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803 mc-4.8.28.tar.xz +# Hash from http://ftp.midnight-commander.org/mc-4.8.29.sha256 +sha256 01d8a3b94f58180cca5bf17257b5078d1fd6fd27a9b5c0e970ec767549540ad4 mc-4.8.29.tar.xz # sha256 locally computed: sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING diff --git a/package/mc/mc.mk b/package/mc/mc.mk index 3858d6288674..894b2314456c 100644 --- a/package/mc/mc.mk +++ b/package/mc/mc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MC_VERSION = 4.8.28 +MC_VERSION = 4.8.29 MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ From 3c957d0df10d1b43756ed67283b9aac63fed246c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 16:07:43 +0200 Subject: [PATCH 0716/2890] package/ethtool: bump version to 6.3 Release notes: https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/tree/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 846ca7efc3f9..905b47fb06d0 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 86df0114064d4d73f6bf72bf03e85c33964a519ee0c1d1ba65005ad2d0e570e1 ethtool-6.2.tar.xz +sha256 d9425f0a3df138734001fccc4175fe178c025f938460ac25c4ebc39960168822 ethtool-6.3.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index a35e274bc442..9f1ef19e7b4a 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 6.2 +ETHTOOL_VERSION = 6.3 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From 8d3f69b4ea0372a6220e0e26579869c08d5fa3bb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 16:10:18 +0200 Subject: [PATCH 0717/2890] package/fetchmail: bump version to 6.4.37 Release notes: https://sourceforge.net/p/fetchmail/mailman/message/37770051/ https://sourceforge.net/p/fetchmail/mailman/message/37783197/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/fetchmail/fetchmail.hash | 4 ++-- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index bb03dcf94a08..9ca6b2c7a700 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37756758/ -sha256 7b0b56cbc0fca854504f167795fab532d5a54d5a7d3b6e3e36a33f34a0960a01 fetchmail-6.4.35.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37783197/ +sha256 4a182e5d893e9abe6ac37ae71e542651fce6d606234fc735c2aaae18657e69ea fetchmail-6.4.37.tar.xz # Locally computed: sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index d6053508a51d..6d418f97391a 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).35 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).37 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING From 914ef9cec2cbb8185da52448a82126c27e10e5bd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 16:14:36 +0200 Subject: [PATCH 0718/2890] package/flatbuffers: bump version to 23.5.26 Changelog: https://github.com/google/flatbuffers/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/flatbuffers/flatbuffers.hash | 2 +- package/flatbuffers/flatbuffers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flatbuffers/flatbuffers.hash b/package/flatbuffers/flatbuffers.hash index 2ff56a8b7657..3c3a90d6f394 100644 --- a/package/flatbuffers/flatbuffers.hash +++ b/package/flatbuffers/flatbuffers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8aff985da30aaab37edf8e5b02fda33ed4cbdd962699a8e2af98fdef306f4e4d flatbuffers-23.3.3.tar.gz +sha256 1cce06b17cddd896b6d73cc047e36a254fb8df4d7ea18a46acf16c4c0cd3f3f3 flatbuffers-23.5.26.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk index 58c0414533ad..3998a25cdf82 100644 --- a/package/flatbuffers/flatbuffers.mk +++ b/package/flatbuffers/flatbuffers.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLATBUFFERS_VERSION = 23.3.3 +FLATBUFFERS_VERSION = 23.5.26 FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) FLATBUFFERS_LICENSE = Apache-2.0 FLATBUFFERS_LICENSE_FILES = LICENSE From 1116fd46a477c58472e98b797dc67c96020883e1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 17:38:19 +0200 Subject: [PATCH 0719/2890] package/ghostscript: security bump version to 10.01.1 Switch tarball to .xz Fixes CVE-2023-28879: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-28879 Release notes: https://ghostscript.readthedocs.io/en/latest/News.html?utm_source=ghostscript&utm_medium=website&utm_content=inline-link Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/ghostscript/ghostscript.hash | 4 ++-- package/ghostscript/ghostscript.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index ca26a38a02fa..30c45a5a74a7 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/SHA512SUMS -sha512 f498384af80654c040635564b8bc9a64c4bb5b0769bb00aade4042bbe9117c482362dc1a1fac72db3ce9487dd5a5bb8fb81b35b360680fe598df33dfbbe79499 ghostscript-9.56.1.tar.gz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10011/SHA512SUMS +sha512 d944be9e8aef68d1176d64c40db6fa86d55d0c9e30047f2147c02806ab61cfe9ac2cb00d4e5b218ff3c51cc6ed47ceffe1bac4dd9d4cc1760b7974f30c6c2735 ghostscript-10.01.1.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 364fa1469aab..d215afccd29b 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,8 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 9.56.1 +GHOSTSCRIPT_VERSION = 10.01.1 +GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 GHOSTSCRIPT_LICENSE_FILES = LICENSE From b7b11d7e94e316632fcc8ec49831e7b372cc055a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 18:53:05 +0200 Subject: [PATCH 0720/2890] package/python3: security bump version to 3.11.4 Rebased two patches. Changelog: https://docs.python.org/release/3.11.4/whatsnew/changelog.html#python-3-11-4 Fixes the following security problems: - gh-99889: Fixed a security in flaw in uu.decode() that could allow for directory traversal based on the input if no out_file was specified. - gh-104049: Do not expose the local on-disk location in directory indexes produced by http.client.SimpleHTTPRequestHandler. - gh-102153: urllib.parse.urlsplit() now strips leading C0 control and space characters following the specification for URLs defined by WHATWG in response to CVE-2023-24329. Patch by Illia Volochii. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0012-Add-an-option-to-disable-lib2to3.patch | 8 +++++--- ...4-Add-an-option-to-disable-the-tk-module.patch | 15 +++++++++------ package/python3/python3.hash | 2 +- package/python3/python3.mk | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/package/python3/0012-Add-an-option-to-disable-lib2to3.patch b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch index 0085d5a63f36..228b86a90baf 100644 --- a/package/python3/0012-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch @@ -12,6 +12,8 @@ Signed-off-by: Samuel Martin Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Bernd Kuhls: ported to Python 3.11.4] +Signed-off-by: Bernd Kuhls --- Makefile.pre.in | 17 ++++++++++++----- configure.ac | 6 ++++++ @@ -48,9 +50,9 @@ index 403380e181..f5d0573067 100644 - lib2to3/tests/data \ - lib2to3/tests/data/fixers \ - lib2to3/tests/data/fixers/myfixes \ - test test/audiodata \ - test/capath test/cjkencodings \ - test/data test/decimaltestdata \ + test \ + test/audiodata \ + test/capath \ @@ -2013,6 +2010,14 @@ ifeq (@PYDOC@,yes) LIBSUBDIRS += pydoc_data endif diff --git a/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch index 04f7e34435a7..b89e1d27bce8 100644 --- a/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch @@ -9,6 +9,8 @@ Signed-off-by: Samuel Martin Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Bernd Kuhls: ported to Python 3.11.4] +Signed-off-by: Bernd Kuhls --- Makefile.pre.in | 10 +++++++--- configure.ac | 9 +++++++++ @@ -26,14 +28,15 @@ index 9f4cdf14cf..4f83911200 100644 tomllib \ turtledemo \ unittest \ -@@ -2001,8 +2000,6 @@ TESTSUBDIRS= ctypes/test \ - test/tracedmodules \ - test/xmltestdata test/xmltestdata/c14n-20 \ +@@ -2038,9 +2038,6 @@ + test/xmltestdata \ + test/xmltestdata/c14n-20 \ test/ziptestdata \ -- tkinter/test tkinter/test/test_tkinter \ +- tkinter/test \ +- tkinter/test/test_tkinter \ - tkinter/test/test_ttk \ - unittest/test unittest/test/testmock - + unittest/test \ + unittest/test/testmock ifeq (@PYDOC@,yes) @@ -2021,6 +2018,13 @@ ifeq (@SQLITE3@,yes) LIBSUBDIRS += sqlite3 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index b04ee7fa2cca..6c43e01a448d 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e Python-3.11.3.tar.xz +sha256 2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6 Python-3.11.4.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index ece5cad93e2a..bdb7cfd22f1f 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).3 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).4 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From c3c4b6356e866cc2d34075869e2e957b57ad2616 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 20:49:31 +0200 Subject: [PATCH 0721/2890] package/{mesa3d, mesa3d-headers}: bump version to 23.1.2 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-May/000721.html https://lists.freedesktop.org/archives/mesa-announce/2023-June/000722.html Removed patch which is included in this version bump: https://cgit.freedesktop.org/mesa/mesa/commit/?id=2630f4b310f534c830250be44d285e485da83869 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...arly-when-trying-to-create-an-unsupp.patch | 50 ------------------- package/mesa3d/mesa3d.hash | 6 +-- package/mesa3d/mesa3d.mk | 2 +- 4 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 package/mesa3d/0005-mesa-main-Exit-early-when-trying-to-create-an-unsupp.patch diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 6bfc61bcbf56..f7b0ecfd52ab 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.1.0 +MESA3D_HEADERS_VERSION = 23.1.2 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0005-mesa-main-Exit-early-when-trying-to-create-an-unsupp.patch b/package/mesa3d/0005-mesa-main-Exit-early-when-trying-to-create-an-unsupp.patch deleted file mode 100644 index 278d75e64ac5..000000000000 --- a/package/mesa3d/0005-mesa-main-Exit-early-when-trying-to-create-an-unsupp.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2a6908ff4c94284b39c3cd4c97e1069876720eb7 Mon Sep 17 00:00:00 2001 -From: Jordan Justen -Date: Tue, 16 May 2023 18:46:50 -0700 -Subject: [PATCH] mesa/main: Exit early when trying to create an unsupported - context API - -Fixes: adbe8b6c17a ("mesa: optimize out _mesa_is_desktop_gl*() and _mesa_is_gles*() calls when not built") -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9038 -Signed-off-by: Jordan Justen -Reviewed-by: Eric Engestrom -Part-of: -Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8bb1ecaa02177720758255bdd7ec34a5d15feca4 -[Romain: backport to 23.1] -Signed-off-by: Romain Naour ---- - src/mesa/main/context.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c -index d8eea2ea867..2b810b0d863 100644 ---- a/src/mesa/main/context.c -+++ b/src/mesa/main/context.c -@@ -996,6 +996,24 @@ _mesa_initialize_context(struct gl_context *ctx, - struct gl_shared_state *shared; - int i; - -+ switch (api) { -+ case API_OPENGL_COMPAT: -+ case API_OPENGL_CORE: -+ if (!HAVE_OPENGL) -+ return GL_FALSE; -+ break; -+ case API_OPENGLES2: -+ if (!HAVE_OPENGL_ES_2) -+ return GL_FALSE; -+ break; -+ case API_OPENGLES: -+ if (!HAVE_OPENGL_ES_1) -+ return GL_FALSE; -+ break; -+ default: -+ return GL_FALSE; -+ } -+ - ctx->API = api; - ctx->DrawBuffer = NULL; - ctx->ReadBuffer = NULL; --- -2.40.1 - diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index f1eed92fb6af..80272b70d642 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-May/000720.html -sha256 a9dde3c76571c4806245a05bda1cceee347c3267127e9e549e4f4e225d92e992 mesa-23.1.0.tar.xz -sha512 bbcfd0dd8e5414826631e80edbbe48218115a7461ef4ac1f2e4e090a48d6c0e1ab3b51dd45e988d5f1572f29bfc03c33769263c0f3e04033138d5b1ec102e8c9 mesa-23.1.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-June/000722.html +sha256 60b1f3adb1561830c158bf3c68508943674fb9d69f384c3c7289694385ab5c7e mesa-23.1.2.tar.xz +sha512 728e79720d950b0f39fa55c21dff7caed3650e88dff52a2f3e70540a049f1baf78178e62e5d6b1e59c76f6555ab0be3f0043cfbddd4745c0a742ccef2f5774d4 mesa-23.1.2.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 7e41442398a8..feb8547e7391 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.1.0 +MESA3D_VERSION = 23.1.2 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 39ffadd6ae8c472e083c431a957ec575c1cebce2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 17 Jun 2023 23:42:55 +0200 Subject: [PATCH 0722/2890] package/jhead: security bump to version 3.08 Fixes the following security issue: - CVE-2022-41751: Jhead 3.06.0.1 allows attackers to execute arbitrary OS commands by placing them in a JPEG filename and then using the regeneration -rgt50 option. Update readme.txt hash after a minor tweak of the text: https://github.com/Matthias-Wandel/jhead/commit/a0eed69daa6ad4b824eb81fb6e3be95de3f783c2 Signed-off-by: Peter Korsgaard --- package/jhead/jhead.hash | 4 ++-- package/jhead/jhead.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/jhead/jhead.hash b/package/jhead/jhead.hash index bd9c8560d5fd..1fe856198dc4 100644 --- a/package/jhead/jhead.hash +++ b/package/jhead/jhead.hash @@ -1,3 +1,3 @@ # Locally calculated from download (no sig, hash) -sha256 5c5258c3d7a840bf831e22174e4a24cb1de3baf442f7cb73d5ab31b4ae0b0058 jhead-3.06.0.1.tar.gz -sha256 8b709512c737fc0c1e1024800b9a44c54d14ab02132c636a66c3ac66955c3e95 readme.txt +sha256 999a81b489c7b2a7264118f194359ecf4c1b714996a2790ff6d5d2f3940f1e9f jhead-3.08.tar.gz +sha256 b3971a74d00c834bc7f112d8a0027b25663fd1637a21381a3e5df4bd2b614dff readme.txt diff --git a/package/jhead/jhead.mk b/package/jhead/jhead.mk index a206e2fe3429..f07739bc2134 100644 --- a/package/jhead/jhead.mk +++ b/package/jhead/jhead.mk @@ -4,7 +4,7 @@ # ################################################################################ -JHEAD_VERSION = 3.06.0.1 +JHEAD_VERSION = 3.08 JHEAD_SITE = $(call github,Matthias-Wandel,jhead,$(JHEAD_VERSION)) JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt From 88108f9793f5824fa058b878974f234ebe834325 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Jun 2023 18:31:12 +0200 Subject: [PATCH 0723/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 69bf91bbf9a1..70591f4a2590 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.3.7" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.3.8" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 20e67fc4d190..ee510f836d32 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 fe369743996c522a7b473e99dcf8f88847bd5cc88546fd3b7a41d9fe5a5b97a9 linux-6.3.7.tar.xz -sha256 b87d6ba8ea7328e8007a7ea9171d1aa0d540d95eacfcab09578e0a3b623dd2cd linux-6.1.33.tar.xz +sha256 927ba93d3da556c8e30b2640aa3f19c3c3cda66c655754e0798024020e2981b4 patch-6.3.8.xz +sha256 84c638ee9a36e30ef879e2944c5adfc2523a5a1553951b40e8cf4d873426d90a patch-6.1.33.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 f617c9d1bb5326cc93495938f43eb8cb9aea9d2f451e5a99bce2893f296e179a linux-5.15.116.tar.xz -sha256 409497c635caf49614de21950ec091eb621a5d5fe1f63fc418ef68ac38b56119 linux-5.10.183.tar.xz -sha256 0938790a858fd0af6aa6b27a3bdf4c5d4a46aba60e6178156980d58bef7ed9ea linux-5.4.246.tar.xz +sha256 c8c39191dc89ccb8f0fd05e4b06c9bcc77672156bdc64fe445d2109c116a3432 patch-5.15.117.xz +sha256 1bde9f3d8bace93e634ca0841fca14fcbd7b6d53cf877ee3e7f18778bf842455 patch-5.10.184.xz +sha256 5e627d9086f539e65c91f6e5c59c8bb66b59f9d369173dc0ccb14f70795d1876 patch-5.4.247.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 aaa1775359c7a066ec70852ea2709fe7e7109517b7d895f34e237132db8edc16 linux-4.19.285.tar.xz -sha256 8cf28f5aae6f77fa718861c415d646a189a7f9493ef0ccb461575a092af03c30 linux-4.14.317.tar.xz +sha256 663669feee6ad4814704bf6dcc89ebbf64e1862f4dc231bc6327e33acea99823 patch-4.19.286.xz +sha256 faa5db19c03aaa96417c2c3e76fbc10886d25b9f26179ff653e3c29f6707840f patch-4.14.318.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 00ec22d60645..5b16e659df20 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -396,13 +396,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.317" if BR2_KERNEL_HEADERS_4_14 - default "4.19.285" if BR2_KERNEL_HEADERS_4_19 - default "5.4.246" if BR2_KERNEL_HEADERS_5_4 - default "5.10.183" if BR2_KERNEL_HEADERS_5_10 - default "5.15.116" if BR2_KERNEL_HEADERS_5_15 - default "6.1.33" if BR2_KERNEL_HEADERS_6_1 - default "6.3.7" if BR2_KERNEL_HEADERS_6_3 + default "4.14.318" if BR2_KERNEL_HEADERS_4_14 + default "4.19.286" if BR2_KERNEL_HEADERS_4_19 + default "5.4.247" if BR2_KERNEL_HEADERS_5_4 + default "5.10.184" if BR2_KERNEL_HEADERS_5_10 + default "5.15.117" if BR2_KERNEL_HEADERS_5_15 + default "6.1.34" if BR2_KERNEL_HEADERS_6_1 + default "6.3.8" if BR2_KERNEL_HEADERS_6_3 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From afe56719db5c6de22521be651b677cd3fda418b2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 18:32:30 +0200 Subject: [PATCH 0724/2890] package/intel-gmmlib: bump version to 22.3.7 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 00a4654b125d..82da96f6b152 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 24200744a185d446329402e671555e7cd18be7a09374445f9b337c6d3a4f4c52 intel-gmmlib-22.3.5.tar.gz +sha256 49b9e40c75a5e3859f5166a2543f333bb8c618f433ca495965e0c13cd6525273 intel-gmmlib-22.3.7.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 74ba6e360317..1ccb49a390b9 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.5 +INTEL_GMMLIB_VERSION = 22.3.7 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 2043ee1ab3f1177a7a0024693209253adc96f549 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 18:36:38 +0200 Subject: [PATCH 0725/2890] package/mcelog: bump version to 194 Changelog: https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/log/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mcelog/mcelog.hash | 2 +- package/mcelog/mcelog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash index 23fd4e50f386..a82d6f2ed27f 100644 --- a/package/mcelog/mcelog.hash +++ b/package/mcelog/mcelog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b3b2616acde7afba4752d4dc447a2c2ad5a75da65e7496e0da30f8f8d2015cfa mcelog-191.tar.gz +sha256 52ad2771a8dc8e30b44a52864620cf1be1fce81f9ae83c4652a9e2d010b1a533 mcelog-194.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk index 9f7194e376e0..5cd00cc354a0 100644 --- a/package/mcelog/mcelog.mk +++ b/package/mcelog/mcelog.mk @@ -4,7 +4,7 @@ # ################################################################################ -MCELOG_VERSION = 191 +MCELOG_VERSION = 194 MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION)) MCELOG_LICENSE = GPL-2.0 MCELOG_LICENSE_FILES = LICENSE From f8af24707b196eb64121d29a829fc31b5506409c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 18:44:12 +0200 Subject: [PATCH 0726/2890] package/mpg123: bump version to 1.31.3 Removed md5 hash, switched _SITE to https. Updated license hash due to copyright year bump. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mpg123/mpg123.hash | 9 ++++----- package/mpg123/mpg123.mk | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/mpg123/mpg123.hash b/package/mpg123/mpg123.hash index e5fb09b46a00..39ded93fb980 100644 --- a/package/mpg123/mpg123.hash +++ b/package/mpg123/mpg123.hash @@ -1,7 +1,6 @@ -# From https://sourceforge.net/projects/mpg123/files/mpg123/1.25.15/ -sha1 286fcb83afad3ecbfea60434d3ee1b6d7f41bb7c mpg123-1.25.15.tar.bz2 -md5 9a050d4b3573661c606f8095a3f34ca3 mpg123-1.25.15.tar.bz2 +# From https://sourceforge.net/projects/mpg123/files/mpg123/1.31.3/ +sha1 c41b98e4c5ac55a5b3787b5aa309a71a6d458145 mpg123-1.31.3.tar.bz2 # Locally calculated -sha256 503a76d82d97f1a6513bbeb284e460a99fb17ef80f23a661d8fc026ce6adcbbc mpg123-1.25.15.tar.bz2 +sha256 1ca77d3a69a5ff845b7a0536f783fee554e1041139a6b978f6afe14f5814ad1a mpg123-1.31.3.tar.bz2 # License file -sha256 f40e0dd86b27b52e429b693a87b3ca63ae0a98a4d142e77207aa6bdf1db7a295 COPYING +sha256 c22482728a634a8dfdb4ff72a96d4c1ed64cd8f3e79335c401751ac591609366 COPYING diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index fbb011c2c2d2..64c8e0d8e5ef 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -4,9 +4,9 @@ # ################################################################################ -MPG123_VERSION = 1.25.15 +MPG123_VERSION = 1.31.3 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 -MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) +MPG123_SITE = https://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_INSTALL_STAGING = YES MPG123_LICENSE = LGPL-2.1 MPG123_LICENSE_FILES = COPYING From 21674cb1f7030d43e201d735b42621fd170e79b4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 18:49:59 +0200 Subject: [PATCH 0727/2890] package/ncurses: bump version to 6.4.20230603 Release notes: https://github.com/ThomasDickey/ncurses-snapshots/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/ncurses/ncurses.hash | 2 +- package/ncurses/ncurses.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index a5f83c8725d2..b82a7b29e469 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 004603a9b3ec51599ef0a0089482004ee3d33b0240d87ce17b6f77525b51fb4e ncurses-6.4-20230429.tar.gz +sha256 b0910671694c2c8377f579eea68477a15d67bd20ddd4b29328cfe15c62c7b3fd ncurses-6.4-20230603.tar.gz # Locally computed sha256 0413b2f4ea863194c174673032f0fca84f1ea1ed4eed6476baea68c075a631ce COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 4753da299c34..3b805cb1fd56 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -6,7 +6,7 @@ # When there is no snapshost yet for a new version, set it to the empty string NCURSES_VERSION_MAJOR = 6.4 -NCURSES_SNAPSHOT_DATE = 20230429 +NCURSES_SNAPSHOT_DATE = 20230603 NCURSES_VERSION = $(NCURSES_VERSION_MAJOR)$(if $(NCURSES_SNAPSHOT_DATE),-$(NCURSES_SNAPSHOT_DATE)) NCURSES_VERSION_GIT = $(subst .,_,$(subst -,_,$(NCURSES_VERSION))) NCURSES_SITE = $(call github,ThomasDickey,ncurses-snapshots,v$(NCURSES_VERSION_GIT)) From b91524f373ad5f82b0cfa3d00aa36689eb4f4ef4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 18:53:42 +0200 Subject: [PATCH 0728/2890] package/nettle: bump version to 3.9.1 Release notes: https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00007.html https://lists.gnu.org/archive/html/info-gnu/2023-06/msg00000.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/nettle/nettle.hash | 4 ++-- package/nettle/nettle.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nettle/nettle.hash b/package/nettle/nettle.hash index d726cb94c613..6c2486e26034 100644 --- a/package/nettle/nettle.hash +++ b/package/nettle/nettle.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/nettle/nettle-3.8.1.tar.gz.sig -sha256 364f3e2b77cd7dcde83fd7c45219c834e54b0c75e428b6f894a23d12dd41cbfe nettle-3.8.1.tar.gz +# https://ftp.gnu.org/gnu/nettle/nettle-3.9.1.tar.gz.sig +sha256 ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3 nettle-3.9.1.tar.gz # Locally calculated sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk index dd4dfbbe386b..d1987d427fca 100644 --- a/package/nettle/nettle.mk +++ b/package/nettle/nettle.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETTLE_VERSION = 3.8.1 +NETTLE_VERSION = 3.9.1 NETTLE_SITE = https://ftp.gnu.org/gnu/nettle NETTLE_DEPENDENCIES = gmp NETTLE_INSTALL_STAGING = YES From 49109a317eb20c90818d4b9afff19ff1b0e8d1a2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:03:34 -0600 Subject: [PATCH 0729/2890] package/python-setuptools-rust: bump to version 1.6.0 Drop no longer required host-python-setuptools-scm and host-python-toml dependencies. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-setuptools-rust/python-setuptools-rust.hash | 4 ++-- package/python-setuptools-rust/python-setuptools-rust.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-setuptools-rust/python-setuptools-rust.hash b/package/python-setuptools-rust/python-setuptools-rust.hash index ff1b9a127f94..f8282277a18a 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.hash +++ b/package/python-setuptools-rust/python-setuptools-rust.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-rust/json -md5 fd3412ca77ffd6e06e2e83d0e9636084 setuptools-rust-1.5.2.tar.gz -sha256 d8daccb14dc0eae1b6b6eb3ecef79675bd37b4065369f79c35393dd5c55652c7 setuptools-rust-1.5.2.tar.gz +md5 f7a1602f3c34e9a5bb82603d4d80c9e3 setuptools-rust-1.6.0.tar.gz +sha256 c86e734deac330597998bfbc08da45187e6b27837e23bd91eadb320732392262 setuptools-rust-1.6.0.tar.gz # Locally computed sha256 checksums sha256 b20668c1590582b3882854050ccfbdb7aee1f71a1ffe9eacc4c5aeb08a14161b LICENSE diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index 7f19ece1a3a5..a3e4d7a9d30b 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_SETUPTOOLS_RUST_VERSION = 1.5.2 +PYTHON_SETUPTOOLS_RUST_VERSION = 1.6.0 PYTHON_SETUPTOOLS_RUST_SOURCE = setuptools-rust-$(PYTHON_SETUPTOOLS_RUST_VERSION).tar.gz -PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/99/db/e4ecb483ffa194d632ed44bda32cb740e564789fed7e56c2be8e2a0e2aa6 +PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/0e/c9/6f9de9f7a8404416d5d22484ccdeb138f469cc1e11bbd62a2bd26d5c1385 PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE -HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-setuptools-scm host-python-toml host-python-semantic-version host-python-typing-extensions +HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-semantic-version host-python-typing-extensions $(eval $(host-python-package)) From 155ccd677556c51a209d94615fdfb67910bb0836 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 00:47:46 -0600 Subject: [PATCH 0730/2890] package/{rust, rust-bin}: bump to version 1.70.0 Link to Rust 1.70.0 announcement: https://blog.rust-lang.org/2023/06/01/Rust-1.70.0.html Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 4cb1f0c1cda0..f6c72f7555c3 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.68.2-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.2-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 1731add9b04d0fcbd096b610a67e1b1ae5740ce1171dd904d944ff504a84bcc7 rust-1.68.2-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.2-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.2-i686-unknown-linux-gnu.tar.xz.asc -sha256 cade060a15c5064763cd67ebba418989cdbdfb1dc4b6fe8dd4310f187540f66a rust-1.68.2-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.2-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.2-mips-unknown-linux-gnu.tar.xz.asc -sha256 a453eca326c676d6b6deda8c444dfc30288d2ccf66bcbad3fafbbad2d4dc9506 rust-1.68.2-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.2-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.2-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 80694caccab8903456de2b09fce15458e2aaa6dac97e706051a7aaa2df069dd0 rust-1.68.2-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.2-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.2-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 1cda60a097c983a5da0564aac365b6edb59452ac8474dbb48575c34ddaa1f8d4 rust-1.68.2-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.2-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.2-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 8a0062a66a6deedddb47778e3092dddc32a934c3127999a1abde6ff2a39ae7f1 rust-1.68.2-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 5e305ddc26861daa1516e1eba53ac3372506351950dbf5ada492a7f2fc65cfe5 rust-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 198054527500cb57cc8cad5b24c56e8ab1df6b48ae85b7c41a6ddbf2e008eb00 rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.2-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.2-s390x-unknown-linux-gnu.tar.xz.asc -sha256 5039fde5d70691cecd21449b543967db6590ddfd2d4b3c2064924bb154866e72 rust-1.68.2-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 7f0f19d50f32a353ca78bc5d6d7c483efeced684e2c37ff847e4fd9699c7e063 rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 cbe60945af743804be6822704f986c812dd1fe1d167602aec5350a8f519f9861 rust-std-1.68.2-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-aarch64-unknown-linux-musl.tar.xz.asc -sha256 718c073d24f3627750049bb74420f90d1ac29843ca16933e11aa301a806a0b10 rust-std-1.68.2-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 59da96890b0a2881799b21a3f49e51f730d67b8dc09b87602dd599e8f980e247 rust-std-1.68.2-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 565730a2ba02357251f9805b5efe0423adf5411892e0d01cf441456234f81e70 rust-std-1.68.2-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 4ea9588934eec3d83bee2789f3a15b48aaea05fc8ec1bc175951ec1d0eb6ed22 rust-std-1.68.2-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-arm-unknown-linux-musleabi.tar.xz.asc -sha256 fd065db4269b5131c2f52638b8f30d0159109850c74c87bdf4c623dc0b32d5c2 rust-std-1.68.2-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 a7e19b68c44efe52df159f89f8b37790ca613adaa3f77937eb460747552d1e59 rust-std-1.68.2-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 74188e1a1f4f7418d946636b4280c03dc80933f6eedda75ece82b7034f32c6db rust-std-1.68.2-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 2b9b98eaf7d18049e4c8625a4cf3c2d610d905c9478a377c6cc3d48f8b31db32 rust-std-1.68.2-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 39009be69f01e30714c657a5f55475ce9f9c6a591cae85b5d7386944a8e87a80 rust-std-1.68.2-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 05bef3f9e66537d9f1271dd6b6bf2261ba1db52672223712a8eb9178d036ae53 rust-std-1.68.2-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 b9992ee3b16c7b3b2fcf15339ade26084936d6088f578f8b2fab9b0c5c5b085c rust-std-1.68.2-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-i586-unknown-linux-gnu.tar.xz.asc -sha256 07fc71adf63691ae5e103c57c295e665b6dfc096fe4bedfeb5e1d33c133bb9f4 rust-std-1.68.2-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-i586-unknown-linux-musl.tar.xz.asc -sha256 884c3b6cbe8d38bb15943917df8bc87470566014ec50200ed70094c12abbb6bd rust-std-1.68.2-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-i686-unknown-linux-gnu.tar.xz.asc -sha256 695d4469c131b9993c939db0ce73a3866ab8e69dd657ec3137f3d594857f7812 rust-std-1.68.2-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-i686-unknown-linux-musl.tar.xz.asc -sha256 216a647fb15ffce5271b82c2c016f01b3d69095ab4635d6a895f9b76b6c1c528 rust-std-1.68.2-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips-unknown-linux-gnu.tar.xz.asc -sha256 4ab007f223cf723f8f7adf26a6014f4f5aa444f88c19daccc5ac81ea30275c66 rust-std-1.68.2-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips-unknown-linux-musl.tar.xz.asc -sha256 0c77f06f410091371b7f6f4952d759fcc0365025213f925afe80e04ab4b53540 rust-std-1.68.2-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 b1b44819454c920980e66473112003212920136e4904113258566d130686de09 rust-std-1.68.2-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 af586b37cac123774addc78d8c4568f22d94cec622ca9de80631f33da2700a6e rust-std-1.68.2-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 24028147dd7733637cbfe58b7f7acc8e8131ebbb39969a6c3c61ce56203b4af3 rust-std-1.68.2-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 a6ae7b9b1710100f52d96dab59c6e7c46a4b057b8ea3d25b8ea2f792aee2f006 rust-std-1.68.2-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 c299d65b3594c309d092f6a0fe15c205ab489ffa50910fb8126e944a2727cbe5 rust-std-1.68.2-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-mipsel-unknown-linux-musl.tar.xz.asc -sha256 a6bbd8949dc8514161de4e367c5255e8b83a3cf78c8426ffacbb6e8077d0e5e0 rust-std-1.68.2-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 e75bdc8a6e3f00285a37606240862cdad69a986c3e3d47d6af1376613281233a rust-std-1.68.2-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 354322352cd8b661b84f5e97729d5d7adb7df9cb9bfd43cac378271c40214d7f rust-std-1.68.2-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 e69c8c1b7b0df839b271a2c12985b1c56565a34f9b357631ed99fa9263f3d326 rust-std-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 8388ac7a5f924d5d6aa441ae97c33c1abf11fd9516f2b9853f7edc0c5d6c453b rust-std-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-s390x-unknown-linux-gnu.tar.xz.asc -sha256 7f909658496692a05dd241c15f79a02f80658d353013dace127fdc69dc5026b4 rust-std-1.68.2-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 787f5cbbcec4e75b9beba3804ea05e36b7cb9b164c291cf7ce8f775d05634d61 rust-std-1.68.2-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 c8a3eaf26b83f1926d86b4db99ca16cbbff8e746e4c63f25f4d75a02a34a3b16 rust-std-1.68.2-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.68.2-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.68.2-x86_64-unknown-linux-musl.tar.xz.asc -sha256 6c2a91e60f4be6538fdb0e4ff0344038f282c23808ca018f526ec586f4ba43ab rust-std-1.68.2-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.70.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.70.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 a36e20a55e39c857f9ec69b146ae04572d5e666e76ff2dd6422cc8f575aed1c7 rust-1.70.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.70.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.70.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 e3fb7f9d825e1bd1720765a358361ba4517584f6d0c1a1d80b2230e2f97c9b88 rust-1.70.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.70.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.70.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 c77505fd6ef54e9ff2819e876a67acb8fe5aa1628e9ebe7c1931ce7d0b41b247 rust-1.70.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.70.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.70.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 7771203dfd675fc7425508a106973725d976fb7334b35facb96f164934044bd0 rust-1.70.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.70.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.70.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 a98a6606a23622d608159f71cc870748c0b406e89d5ff5bf58fb5365ef0e4d40 rust-1.70.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.70.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.70.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 2ca5701b4ea5555afd6cc4d1063097e52828583f2c205c7b23717074d91a4096 rust-1.70.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 41093804c33ea79f8643566ad6cfff5c4f0755418d73abcdf774c870dd8a2e0e rust-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 2da9c69e6ce28da52a2b5ec78db090f41a393bf4b290012058be4f09559662a3 rust-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.70.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.70.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 34bfb5bb95b3f107e82b260a108df796bcf57a5eecda0efac5fd997ed4d3ae88 rust-1.70.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 991b59d1d0cd0dfcb2463bd79d2df1a235380f725557cdee831ee3c1d87a3122 rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 966e85187b6b76dc520b23aadc886c5fe54b209a21c68f959ff00ef8542b7f9f rust-std-1.70.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 277c2313f0ee420851c4009f15ba4d474000e0495deef38b0b636d6837e4f15f rust-std-1.70.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 a6bf20e4eb5b88cd193ea2a126efe1a33651dc0be47080488be2cfff41c29272 rust-std-1.70.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 6ad1231aeb34fef9c9db267859b0db3c6846bbade8227e6c9f456b6264c1278c rust-std-1.70.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 0b021ad310e638e90ae64b60c5a898f2f30ec77fcc1622e3775abb5476200de4 rust-std-1.70.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 f72c1983fcd90c338c62747b15964103518ec377530df2e71e35f7ea16eeede8 rust-std-1.70.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 93929160b961ea6feb0dd0c64aa0571e1e2dc3024a4e2d7ae9ab5f75b1950fd9 rust-std-1.70.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 4c4614c95bbd62665258248cc59d03d0d36e2034971892bd8f01659cdb953740 rust-std-1.70.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 9baaca8ed2a71040480654a1ff3c9917e017ddfe78030b054ad82aed9b94c11e rust-std-1.70.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 3edd71ce8102783c99b9b6661577ac1acf6a633156234ee220a20aa3d7190ebb rust-std-1.70.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 aaceb71de5268510cbfb59c356ef2f7fb539f89b57116a2d3a513d06c411bb35 rust-std-1.70.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 f9d5ce6b4bff635151579726ebf264b905679f42917283fa1268d86f7c82a55f rust-std-1.70.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 f52e3ac35157e90f86e5ca6c177a43774425c24a51b15655ed61f6209c7db6f0 rust-std-1.70.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-i586-unknown-linux-musl.tar.xz.asc +sha256 1a42665bb54eeff908f833dca12e917d6ce87140139ec56702b9d88cda61be79 rust-std-1.70.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 0e5543c35196ca5b08f1b7e49fa3f3b671444d75648504cdbcfd854e2e7efd2d rust-std-1.70.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-i686-unknown-linux-musl.tar.xz.asc +sha256 19ef3b0f6e52f81cd17f0d98a692c48fe02e85570d1e36b6369a7294ae875e2a rust-std-1.70.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 0cd85a53e328b1c445a8ec13af87f74280c1d344744076b102227f626456caec rust-std-1.70.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips-unknown-linux-musl.tar.xz.asc +sha256 5e1abc99236050e0371ffdce8f4924e7fe46957daa7509cabc21355f62ee05e7 rust-std-1.70.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 9624b99d806b64e11916b78afac1fac7561578c23b1321486f73f22f5e7d8710 rust-std-1.70.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 de3adfd43245dadff1fdb172250189f85dbcbc848badf29d5512d5bd10ff8e53 rust-std-1.70.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 55153a84e1a00d8426b08bb745de7eae8bd34dc65ece529a46c2b76448404338 rust-std-1.70.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 39edcc0d4cc184ec320c710b41cc7401ab6f2408da3d8a6bc9c1a836429d429f rust-std-1.70.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 58bf8a6407d92cd4786991f1cbdec7380001e07c057c3a8946c2e54593bb7f8c rust-std-1.70.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 4dd7f934ab4d21f933e5287b7ea194d34e36b6d5a17a5a7ef3bf0b705c59f8ca rust-std-1.70.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 101f358b08381b9c37c2f061bac1ff3e60c6036be20059c451f322a55f72376b rust-std-1.70.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 468672f84e5b140269e188b836ec82494d65c18bda8b7cf1f9bf6fce19f222ab rust-std-1.70.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 bbd882f9ec7f01a732ecc60cf50b7d8a10cd52c3de41c205f62938b6dc2b4dbc rust-std-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 cdecf32e245898306a27a0b164451b2ee9a2122176ce3a65f2ec73c200986dc3 rust-std-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 7084afbe9fb1a0e8a0c3e760f45475ebba400b72030ae8359bdccef67cb48992 rust-std-1.70.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 b06933f6f94cd30e1c2415b37db97a94533a727aa5d32a34ee80c6742ee418d2 rust-std-1.70.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 0c0129717da1e27ccf2c56da950d2fe56973f71beec9e80ae6904b282d2f0ee9 rust-std-1.70.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.70.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 7ebaba08385d1ec87d0a27ca8b4e1eb454374da18ffa12621bd1578973754101 rust-std-1.70.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index c5fdd9a862b1..78e36317619f 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.68.2 +RUST_BIN_VERSION = 1.70.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 40ab7dedc636..1ceed7683c35 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.68.2-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.68.2-src.tar.xz.asc -sha256 ce1a115f6aafa912b4622906a92b626354973afa9288e2c7750df4dcf3390fc0 rustc-1.68.2-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.70.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.70.0-src.tar.xz.asc +sha256 bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843bfbaf5c34639 rustc-1.70.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 27eb11f095d9..d4566b3142bf 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.68.2 +RUST_VERSION = 1.70.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From 795f4ffbd9c30fd70eea5601832a79ec1c90ae86 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:08:59 -0600 Subject: [PATCH 0731/2890] package/python-setuptools: bump to version 67.8.0 License hash changed due to name removal: https://github.com/pypa/setuptools/commit/5957d58266e479f124b31f30e4322e798fdf386b Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-setuptools/python-setuptools.hash | 6 +++--- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 76ad1ba1ce3a..be130637285a 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 1fd8bd04b0bed95ad6c81f03b1c080bc setuptools-65.6.3.tar.gz -sha256 a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75 setuptools-65.6.3.tar.gz -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE +md5 628ab1ae7d14185e5e536740ea31b5ce setuptools-67.8.0.tar.gz +sha256 62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102 setuptools-67.8.0.tar.gz +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 226ef2b479f4..6d10172cdc81 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 65.6.3 +PYTHON_SETUPTOOLS_VERSION = 67.8.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b6/21/cb9a8d0b2c8597c83fce8e9c02884bce3d4951e41e807fc35791c6b23d9a +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/03/20/630783571e76e5fa5f3e9f29398ca3ace377207b8196b54e0ffdf09f12c1 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From 7c46dd628e708e249253f123bf465e5c60f9b51a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:13:51 -0600 Subject: [PATCH 0732/2890] package/python-txaio: bump to version 23.1.1 License has changed due to company name update: https://github.com/crossbario/txaio/commit/91dace6ad1ddef3741d8c4db70d0e8728db046f0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-txaio/python-txaio.hash | 6 +++--- package/python-txaio/python-txaio.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash index f06c14b21f96..d561cec6356a 100644 --- a/package/python-txaio/python-txaio.hash +++ b/package/python-txaio/python-txaio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txaio/json -md5 9b692af4c4fce73cadd36374c138936b txaio-22.2.1.tar.gz -sha256 2e4582b70f04b2345908254684a984206c0d9b50e3074a24a4c55aba21d24d01 txaio-22.2.1.tar.gz +md5 297409f2dff8e71bad24467374aa8775 txaio-23.1.1.tar.gz +sha256 f9a9216e976e5e3246dfd112ad7ad55ca915606b60b84a757ac769bd404ff704 txaio-23.1.1.tar.gz # Locally computed sha256 checksums -sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE +sha256 ab1dd7a42dbdae302346c5a4571f2149691cc1ec06836232bf4923527e3fe41c LICENSE diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk index 1a8a88896302..585b3a5f5751 100644 --- a/package/python-txaio/python-txaio.mk +++ b/package/python-txaio/python-txaio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXAIO_VERSION = 22.2.1 +PYTHON_TXAIO_VERSION = 23.1.1 PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz -PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/6d/4b/28313388dfb2bdedb71b35b900459c56ba08ccb7ad2885487df037808c06 +PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/51/91/bc9fd5aa84703f874dea27313b11fde505d343f3ef3ad702bddbe20bfd6e PYTHON_TXAIO_LICENSE = MIT PYTHON_TXAIO_LICENSE_FILES = LICENSE PYTHON_TXAIO_SETUP_TYPE = setuptools From 7978383cb055d05b4ca4da6dea2f8192c7898725 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:20:21 -0600 Subject: [PATCH 0733/2890] package/python-weasyprint: bump to version 59.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-weasyprint/python-weasyprint.hash | 4 ++-- package/python-weasyprint/python-weasyprint.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index d6026cf034a3..c22677cad0a7 100644 --- a/package/python-weasyprint/python-weasyprint.hash +++ b/package/python-weasyprint/python-weasyprint.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/weasyprint/json -md5 497030cecafffca06bae2b161846b461 weasyprint-57.2.tar.gz -sha256 b8e9ef2dcbcfbc82e99215acfd68f947b2b5f1999b5b156db75fabe380ba7e9a weasyprint-57.2.tar.gz +md5 2cb135e7c5318bb1652205035f083922 weasyprint-59.0.tar.gz +sha256 223a76636b3744eaa4ab8a2885f50cf46cf8ebb1acb99b5276d02feccf507492 weasyprint-59.0.tar.gz # Locally computed sha256 checksums sha256 bfd14eccfa6100575460e685556b183399d4bd335904e3c9521b0116d21c54da LICENSE diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk index 27b07226d9fb..a1e3d23b7514 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 57.2 +PYTHON_WEASYPRINT_VERSION = 59.0 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/b1/88/335dd6cb71a9d58584c975bf1db0ab9a3a9f15f9bffef1cbfac0fb1ee72e +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/1d/69/11343bbb46d4f2a311677058e19cc2f7bc55a769b64c547a64ea1e2b6045 PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE From 4f50a8cad0efb5783e9d93d62d932e0f114bf346 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:24:54 -0600 Subject: [PATCH 0734/2890] package/python-yarl: bump to version 1.9.2 License file now contains the full Apache 2.0 license instead of just a reference to it: https://github.com/aio-libs/yarl/commit/cc4a11e961fb24b5658df1c5125b26cb44c0b875 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-yarl/python-yarl.hash | 6 +++--- package/python-yarl/python-yarl.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-yarl/python-yarl.hash b/package/python-yarl/python-yarl.hash index 9725e0058bda..624297aeba1e 100644 --- a/package/python-yarl/python-yarl.hash +++ b/package/python-yarl/python-yarl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/yarl/json -md5 57c82725b9f4895eecee45faf5e61a54 yarl-1.8.2.tar.gz -sha256 49d43402c6e3013ad0978602bf6bf5328535c48d192304b91b97a3c6790b1562 yarl-1.8.2.tar.gz +md5 4e46a0c7078d34d9734a7c5d182dee92 yarl-1.9.2.tar.gz +sha256 04ab9d4b9f587c06d801c2abfe9317b77cdf996c65a90d5e84ecc45010823571 yarl-1.9.2.tar.gz # Locally computed sha256 checksums -sha256 56d6ac6c8105c0a51304c21db060e361af9a8ea0af9a75c239c28b5d13693838 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-yarl/python-yarl.mk b/package/python-yarl/python-yarl.mk index 77e0c91383be..e4424ff5773c 100644 --- a/package/python-yarl/python-yarl.mk +++ b/package/python-yarl/python-yarl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YARL_VERSION = 1.8.2 +PYTHON_YARL_VERSION = 1.9.2 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz -PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/c4/1e/1b204050c601d5cd82b45d5c8f439cb6f744a2ce0c0a6f83be0ddf0dc7b2 +PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/5f/3f/04b3c5e57844fb9c034b09c5cb6d2b43de5d64a093c30529fd233e16cf09 PYTHON_YARL_LICENSE = Apache-2.0 PYTHON_YARL_LICENSE_FILES = LICENSE PYTHON_YARL_SETUP_TYPE = setuptools From c46b025420ff4f5dd399ddfcb7f0a789e95c503b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:29:37 -0600 Subject: [PATCH 0735/2890] package/python-selenium: bump to version 4.9.1 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-selenium/python-selenium.hash | 4 ++-- package/python-selenium/python-selenium.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-selenium/python-selenium.hash b/package/python-selenium/python-selenium.hash index d462abc62b75..03a9683a219d 100644 --- a/package/python-selenium/python-selenium.hash +++ b/package/python-selenium/python-selenium.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/selenium/json -md5 e9054eb95920bb2a1d594090f0773f61 selenium-4.8.0.tar.gz -sha256 fee36724d6cf0b18c73781bb8ec7be4a35ab1e2564e64e64e64da75e50e052af selenium-4.8.0.tar.gz +md5 02404033a10b2b29aa098f50503c0a1a selenium-4.9.1.tar.gz +sha256 3444f4376321530c36ce8355b6b357d8cf4a7d588ce5cf772183465930bbed0e selenium-4.9.1.tar.gz diff --git a/package/python-selenium/python-selenium.mk b/package/python-selenium/python-selenium.mk index 6dbea6fb7e6c..d59a16a57d20 100644 --- a/package/python-selenium/python-selenium.mk +++ b/package/python-selenium/python-selenium.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SELENIUM_VERSION = 4.8.0 +PYTHON_SELENIUM_VERSION = 4.9.1 PYTHON_SELENIUM_SOURCE = selenium-$(PYTHON_SELENIUM_VERSION).tar.gz -PYTHON_SELENIUM_SITE = https://files.pythonhosted.org/packages/2e/3d/492cf1a6823c48369328572c6bc63b7a957ba25c0009ee6bdb507cd9a6a4 +PYTHON_SELENIUM_SITE = https://files.pythonhosted.org/packages/fd/e2/0e5bee6762a7bf7852b47a79c5b12f9e526e6962958dbb9719fa490ba24c PYTHON_SELENIUM_SETUP_TYPE = setuptools PYTHON_SELENIUM_LICENSE = Apache-2.0 From c94922beac62e66a993e0a6bc14567af4827d8d1 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:33:24 -0600 Subject: [PATCH 0736/2890] package/python-requests: bump to version 2.31.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-requests/python-requests.hash | 4 ++-- package/python-requests/python-requests.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index b6f696000b5a..c4aeabb25da7 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 09b752e0b0a672d805ae54455c128d42 requests-2.28.2.tar.gz -sha256 98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf requests-2.28.2.tar.gz +md5 941e175c276cd7d39d098092c56679a4 requests-2.31.0.tar.gz +sha256 942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 requests-2.31.0.tar.gz # Locally computed sha256 checksums sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 8f9f4b2db4bd..2c74db37113f 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.28.2 +PYTHON_REQUESTS_VERSION = 2.31.0 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/9d/ee/391076f5937f0a8cdf5e53b701ffc91753e87b07d66bae4a09aa671897bf +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/9d/be/10918a2eac4ae9f02f6cfe6414b7a155ccd8f7f9d4380d62fd5b955065c3 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE From 962b1a702356595919e3b28dff7eb876d00c69e7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:37:34 -0600 Subject: [PATCH 0737/2890] package/python-pyphen: bump to version 0.14.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyphen/python-pyphen.hash | 4 ++-- package/python-pyphen/python-pyphen.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyphen/python-pyphen.hash b/package/python-pyphen/python-pyphen.hash index 39af62e0851d..47b9009ea187 100644 --- a/package/python-pyphen/python-pyphen.hash +++ b/package/python-pyphen/python-pyphen.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/Pyphen/json -md5 a5039d1a4d8d4bad784cb864927f83f8 pyphen-0.13.2.tar.gz -sha256 847f57a043a58408f24670ae0184ff6edfb5fd5731743208228c028ddc514438 pyphen-0.13.2.tar.gz +md5 19e799bbf459ac675698c37c5fae34a8 pyphen-0.14.0.tar.gz +sha256 596c8b3be1c1a70411ba5f6517d9ccfe3083c758ae2b94a45f2707346d8e66fa pyphen-0.14.0.tar.gz # Locally computed sha256 checksums sha256 9f0bffde4fbbbbc61c46f6577b6f472919dba9fdffabe74e8a7e44ac5dbef7a2 LICENSE sha256 2233a3eecf299bc271f1a9f57f0b3198343ad4ab16571d70320133002c51496b COPYING.GPL diff --git a/package/python-pyphen/python-pyphen.mk b/package/python-pyphen/python-pyphen.mk index 9ca064c293cd..9baa2e7b9819 100644 --- a/package/python-pyphen/python-pyphen.mk +++ b/package/python-pyphen/python-pyphen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPHEN_VERSION = 0.13.2 +PYTHON_PYPHEN_VERSION = 0.14.0 PYTHON_PYPHEN_SOURCE = pyphen-$(PYTHON_PYPHEN_VERSION).tar.gz -PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/46/12/aeb28a1e1a3f3cede967cea98ef3a1da844418ab8296a4bb9513f232736c +PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/4b/52/46b119f94b3f68e4193ada36941606d8e26852b67bb6e099b0e310540b41 PYTHON_PYPHEN_SETUP_TYPE = flit PYTHON_PYPHEN_LICENSE = LGPL-2.1+, MPL-1.1, GPL-2.0+ PYTHON_PYPHEN_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LGPL COPYING.MPL From 20e92185133eba97b11bc323c54747eb2ec8f598 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:41:23 -0600 Subject: [PATCH 0738/2890] package/python-pygments: bump to version 2.15.1 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pygments/python-pygments.hash | 4 ++-- package/python-pygments/python-pygments.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash index f7396cb3d6b4..9714fd2ea0ab 100644 --- a/package/python-pygments/python-pygments.hash +++ b/package/python-pygments/python-pygments.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pygments/json -md5 447be4afb076c8325a7dc659aff5b931 Pygments-2.14.0.tar.gz -sha256 b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297 Pygments-2.14.0.tar.gz +md5 e40631bb812bbd15954027c23b23013a Pygments-2.15.1.tar.gz +sha256 8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c Pygments-2.15.1.tar.gz # Locally computed sha256 checksums sha256 a9d66f1d526df02e29dce73436d34e56e8632f46c275bbdffc70569e882f9f17 LICENSE diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk index 9c4f0be6c890..f151f0061bb7 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.14.0 +PYTHON_PYGMENTS_VERSION = 2.15.1 PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/da/6a/c427c06913204e24de28de5300d3f0e809933f376e0b7df95194b2bb3f71 +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/89/6b/2114e54b290824197006e41be3f9bbe1a26e9c39d1f5fa20a6d62945a0b3 PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_CPE_ID_VENDOR = pygments From 78c9982d71a5a31e6b635d9f97acbce3ca447beb Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:44:59 -0600 Subject: [PATCH 0739/2890] package/python-pydyf: bump to version 0.6.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pydyf/python-pydyf.hash | 4 ++-- package/python-pydyf/python-pydyf.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydyf/python-pydyf.hash b/package/python-pydyf/python-pydyf.hash index 1b37e90e7315..c01270be50d9 100644 --- a/package/python-pydyf/python-pydyf.hash +++ b/package/python-pydyf/python-pydyf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydyf/json -md5 6b2a02162a3f4be9464d7b4043953d33 pydyf-0.5.0.tar.gz -sha256 51e751ae1504037c1fc1f4815119137b011802cd5f6c3539db066c455b14a7e1 pydyf-0.5.0.tar.gz +md5 6f06b2c08717e25f17de043a02b71062 pydyf-0.6.0.tar.gz +sha256 b44a38855d7e47b740b3cd31ab63a2f5b9b2793931d50b0ccaed3bb7b86912fc pydyf-0.6.0.tar.gz # Locally computed sha256 checksums sha256 75461e438973e1ba0f93a7de9e3fe5b2f49e1ab49251d392878a9cdae8ce7e47 LICENSE diff --git a/package/python-pydyf/python-pydyf.mk b/package/python-pydyf/python-pydyf.mk index 6327a3efe253..8d8cf56889c0 100644 --- a/package/python-pydyf/python-pydyf.mk +++ b/package/python-pydyf/python-pydyf.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDYF_VERSION = 0.5.0 +PYTHON_PYDYF_VERSION = 0.6.0 PYTHON_PYDYF_SOURCE = pydyf-$(PYTHON_PYDYF_VERSION).tar.gz -PYTHON_PYDYF_SITE = https://files.pythonhosted.org/packages/f4/4c/6d31b36a46714d8206b8ca84b8dc9aaf42093415b1f50471538552abe501 +PYTHON_PYDYF_SITE = https://files.pythonhosted.org/packages/9d/c5/d5e4536968c36c0838459b5c482b9228e9aae839847837623d0d04576ba0 PYTHON_PYDYF_SETUP_TYPE = flit PYTHON_PYDYF_LICENSE = BSD-3-Clause PYTHON_PYDYF_LICENSE_FILES = LICENSE From 4e15d69160dfa975022de4c9f05a1a99be852322 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:47:32 -0600 Subject: [PATCH 0740/2890] package/python-pydantic: bump to version 1.10.8 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pydantic/python-pydantic.hash | 4 ++-- package/python-pydantic/python-pydantic.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index e73a3099a865..88b17f4575d8 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 2e036b5f993b93dd83f6a7009252ae78 pydantic-1.10.4.tar.gz -sha256 b9a3859f24eb4e097502a3be1fb4b2abb79b6103dd9e2e0edb70613a4459a648 pydantic-1.10.4.tar.gz +md5 f0e286c32f40ec45aba9603742739cd6 pydantic-1.10.8.tar.gz +sha256 1410275520dfa70effadf4c21811d755e7ef9bb1f1d077a21958153a92c8d9ca pydantic-1.10.8.tar.gz # Locally computed sha256 checksums sha256 9e3946690ac88b6b73e8f001a0586af13568be8852fd514e4393f39761764387 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index a1a4dc9b16fc..b800426d222d 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 1.10.4 +PYTHON_PYDANTIC_VERSION = 1.10.8 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/53/17/34e54e352f6a3d304044e52d5ddd5cd621a62ec8fb7af08cc73af65dd3e1 +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/23/65/2aa13873e9e0084ecaec00fbe6c6096b65e1ab99ba66bdbf7e4e7c4cc915 PYTHON_PYDANTIC_SETUP_TYPE = setuptools PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE From 3f1f0597e2f1db8c864ee7a54d95fb64209fcb97 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:51:00 -0600 Subject: [PATCH 0741/2890] package/python-pydal: bump to version 20230521.1 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pydal/python-pydal.hash | 4 ++-- package/python-pydal/python-pydal.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index c55a17a54574..8ed25084d122 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydal/json -md5 eeaf44cdcdb6bd2040713c710a4a04be pydal-20221110.1.tar.gz -sha256 7c3e891c70f8d8918e36276f210a1959bb7badf3b276f47191986ffcf5b6a390 pydal-20221110.1.tar.gz +md5 47f0425745bcd1bb413aa9208cd06b3c pydal-20230521.1.tar.gz +sha256 10478a61e627c5b8cb7691f7f7ebf7210845485316493d37d740c297fb6d1845 pydal-20230521.1.tar.gz # Locally computed sha256 checksums sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index f55c7fc2c520..1cc7e90b11e2 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20221110.1 +PYTHON_PYDAL_VERSION = 20230521.1 PYTHON_PYDAL_SOURCE = pydal-$(PYTHON_PYDAL_VERSION).tar.gz -PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/73/83/b904c464b6ab060e12b3f406f1fab7deb97bcd9d2021d8c87325e6225c2d +PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/68/b4/15dc227f965cc0525ca7f432368706cc4087ad6d587a5a05b251d133023e PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt PYTHON_PYDAL_SETUP_TYPE = setuptools From c97e81251d977223620348aba8aa5fcd93dc9b02 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:54:49 -0600 Subject: [PATCH 0742/2890] package/python-pycryptodomex: bump to version 3.18.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pycryptodomex/python-pycryptodomex.hash | 4 ++-- package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index eb011dddb8d8..954f4a89386a 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 9d27f03c036c89afd3d66970bb49cd06 pycryptodomex-3.16.0.tar.gz -sha256 e9ba9d8ed638733c9e95664470b71d624a6def149e2db6cc52c1aca5a6a2df1d pycryptodomex-3.16.0.tar.gz +md5 3b8d868cef13ea41cb3bfeab66a7707c pycryptodomex-3.18.0.tar.gz +sha256 3e3ecb5fe979e7c1bb0027e518340acf7ee60415d79295e5251d13c68dde576e pycryptodomex-3.18.0.tar.gz # Locally computed sha256 checksums sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index b566bdd066dc..3790aa4787b4 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.16.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.18.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/5d/22/575c7dd7c86843e07a791cfa2143e7292d6b380f5a7cce966a49b9d6c9f4 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/40/92/efd675dba957315d705f792b28d900bddc36f39252f6713961b4221ee9af PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ From 9aa45c0f892a129cc56f57fd0c9dffbe0af3b4fb Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 02:00:25 -0600 Subject: [PATCH 0743/2890] package/python-pillow: bump to version 9.5.0 License hash changed due to wording update: https://github.com/python-pillow/Pillow/commit/997932bc93c778919fe22f4838ef0929482fe520 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pillow/python-pillow.hash | 6 +++--- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index d514bdfe561f..43bb824b6ab0 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 ee6e9a6c729ed9e9a78ccd3f6e9d7143 Pillow-9.4.0.tar.gz -sha256 a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e Pillow-9.4.0.tar.gz +md5 ed80942ad1ade1aab0fcf3790d0be3ec Pillow-9.5.0.tar.gz +sha256 bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1 Pillow-9.5.0.tar.gz # Locally computed sha256 checksums -sha256 4e1755595052d843e2f350c930759f945ecf707bf812883948d181016b12dd0f LICENSE +sha256 0fdb68ffb39062553be40be4e6eaea9700b4f5e870a720ae86b8925d67613ddd LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index c02968610ff3..b69d329cde8d 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 9.4.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/bc/07/830784e061fb94d67649f3e438ff63cfb902dec6d48ac75aeaaac7c7c30e +PYTHON_PILLOW_VERSION = 9.5.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/00/d5/4903f310765e0ff2b8e91ffe55031ac6af77d982f0156061e20a4d1a8b2d PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From da7db0d5537516e867c3b4049da1484bd3e37e4a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 02:09:11 -0600 Subject: [PATCH 0744/2890] package/python-installer: bump to version 0.7.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-installer/python-installer.hash | 4 ++-- package/python-installer/python-installer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-installer/python-installer.hash b/package/python-installer/python-installer.hash index 97d455b87c6d..577b23a7ab9d 100644 --- a/package/python-installer/python-installer.hash +++ b/package/python-installer/python-installer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/installer/json -md5 ac5fee994b04f228c151306f5ad96b04 installer-0.6.0.tar.gz -sha256 f3bd36cd261b440a88a1190b1becca0578fee90b4b62decc796932fdd5ae8839 installer-0.6.0.tar.gz +md5 d961d1105c9270049528b1167ed021bc installer-0.7.0.tar.gz +sha256 a26d3e3116289bb08216e0d0f7d925fcef0b0194eedfa0c944bcaaa106c4b631 installer-0.7.0.tar.gz # Locally computed sha256 checksums sha256 37b8b9f2569892fa54406383d431169dbb2115980d78b7efba6eeae5664c484f LICENSE diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 3430e46b5113..094a91809034 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INSTALLER_VERSION = 0.6.0 +PYTHON_INSTALLER_VERSION = 0.7.0 PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz -PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/c9/ab/a9141dc175ec7b620fffe7e0295251a7b6a0ffb4325d64aeb128dff8c698 +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/05/18/ceeb4e3ab3aa54495775775b38ae42b10a92f42ce42dfa44da684289b8c8 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE PYTHON_INSTALLER_SETUP_TYPE = flit-bootstrap From 374c6be2695056701c15b81fc40375c1237b3537 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 02:14:23 -0600 Subject: [PATCH 0745/2890] package/python-flit-core: bump to version 3.9.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-flit-core/python-flit-core.hash | 4 ++-- package/python-flit-core/python-flit-core.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index f63a64ed1b9b..4d4907f5dc44 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flit_core/json -md5 7c41da13273f7787709a24f74e0f5a99 flit_core-3.8.0.tar.gz -sha256 b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3 flit_core-3.8.0.tar.gz +md5 3bc52f1952b9a78361114147da63c35b flit_core-3.9.0.tar.gz +sha256 72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba flit_core-3.9.0.tar.gz # Locally computed sha256 35b4f1dec512e617077fd6980dbb43ef8c2887adc5d0185edb4c04da175dd816 LICENSE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index f96191ade686..ea887a02589d 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLIT_CORE_VERSION = 3.8.0 +PYTHON_FLIT_CORE_VERSION = 3.9.0 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz -PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/c4/e6/c1ac50fe3eebb38a155155711e6e864e254ce4b6e17fe2429b4c4d5b9e80 PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap From eee958dcc4b5474a1dc1c8536e54ae3b335ffa86 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 02:21:30 -0600 Subject: [PATCH 0746/2890] package/python-cython: bump to version 0.29.35 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-cython/python-cython.hash | 4 ++-- package/python-cython/python-cython.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index e7e86264d2d4..dc75d098d3ff 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 bd42c555cb2298b8a94fa8de7ee679ba Cython-0.29.33.tar.gz -sha256 5040764c4a4d2ce964a395da24f0d1ae58144995dab92c6b96f44c3f4d72286a Cython-0.29.33.tar.gz +md5 138dba31e20e178b431a2e403154f906 Cython-0.29.35.tar.gz +sha256 6e381fa0bf08b3c26ec2f616b19ae852c06f5750f4290118bf986b6f85c8c527 Cython-0.29.35.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index b11d75b33d36..145e804bd7b7 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.33 +PYTHON_CYTHON_VERSION = 0.29.35 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/dc/f6/e8e302f9942cbebede88b1a0c33d0be3a738c3ac37abae87254d58ffc51c +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/da/a0/298340fb8412574a0b00a0d9856aa27e7038da429b9e31d6825173d1e6bd PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt From 049adbb6073f3f8b08c04df231565f8661f29c16 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 22:18:19 -0600 Subject: [PATCH 0747/2890] package/zxing-cpp: bump to version 2.0.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/zxing-cpp/zxing-cpp.hash | 2 +- package/zxing-cpp/zxing-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zxing-cpp/zxing-cpp.hash b/package/zxing-cpp/zxing-cpp.hash index 5457ede44a61..4018e95fde32 100644 --- a/package/zxing-cpp/zxing-cpp.hash +++ b/package/zxing-cpp/zxing-cpp.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862 zxing-cpp-1.4.0.tar.gz +sha256 12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76 zxing-cpp-2.0.0.tar.gz # License files sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index 1051376808e4..b11814d114cb 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZXING_CPP_VERSION = 1.4.0 +ZXING_CPP_VERSION = 2.0.0 ZXING_CPP_SITE = $(call github,zxing-cpp,zxing-cpp,v$(ZXING_CPP_VERSION)) ZXING_CPP_LICENSE = Apache-2.0 ZXING_CPP_LICENSE_FILES = LICENSE From 7faf0389fd6a999f877b037e1bbbd1b04c36fa49 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 6 Jun 2023 09:01:25 +0200 Subject: [PATCH 0748/2890] package/inadyn: bump to v2.11.0 Upstream ChageLog, summary: - Add wildcard support for Cloudflare - New DDNS providers from DD-WRT; - goip.de - myonlineportal.net - desec.io (a.k.a. dedyn.io) - domaindiscount24.com - dy.fi - do.de (Domain-Offensive) - Domopoli.de - inwx - It's DNS - Joker.com - all-inkl.com - core-networks.de - dnsever.com - dnshome.de - dnsmadeeasy.com - dnsmax.com - schokokeks.org - variomedia.de - udmedia.de - moniker.com - dyndns.it - infomaniak.com - oray.com - simply.com - mydns.jp - myonlineportal.net - namecheap.com - regfish.de - twodns.de - Support for updating both ipv4 and ipv6 address for same provider - Add new command line options -L and -S NAME to list supported providers and their respective details - Add 'success' as a valid generic response to DNS update - Fix use after free in logger at inadyn exit - Use dynv6 'auto' IP only if we have not detected an address - Replace unstable api.ipify.org with http://ifconfig.me - Fix default checkip server for dnsexit.com - Fix easydns response code problem Signed-off-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle --- package/inadyn/inadyn.hash | 2 +- package/inadyn/inadyn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/inadyn/inadyn.hash b/package/inadyn/inadyn.hash index 2c0995babfce..94af9f87b70b 100644 --- a/package/inadyn/inadyn.hash +++ b/package/inadyn/inadyn.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 1727b6aae6727f99eba584e46950369d7b259d2ef09e5bc02566e9c3c1d6daf6 inadyn-2.10.0.tar.gz +sha256 9ddac7b6b0a1ed372c6cb5afaec6bea927ab539db02c8536dd10d73bd1d37c95 inadyn-2.11.0.tar.gz # Locally computed sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk index 5a24c1eced89..3e346fd76919 100644 --- a/package/inadyn/inadyn.mk +++ b/package/inadyn/inadyn.mk @@ -4,7 +4,7 @@ # ################################################################################ -INADYN_VERSION = 2.10.0 +INADYN_VERSION = 2.11.0 INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION) INADYN_LICENSE = GPL-2.0+ INADYN_LICENSE_FILES = COPYING From d7a7d93be42b022a7444e9ff48f3cb588f310a69 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 6 Jun 2023 09:01:26 +0200 Subject: [PATCH 0749/2890] package/inadyn: update description, how to enable HTTPS support Signed-off-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle --- package/inadyn/Config.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/inadyn/Config.in b/package/inadyn/Config.in index 3589823da4a2..63b2d9ad5f6a 100644 --- a/package/inadyn/Config.in +++ b/package/inadyn/Config.in @@ -4,9 +4,13 @@ config BR2_PACKAGE_INADYN depends on !BR2_STATIC_LIBS # dlopen() select BR2_PACKAGE_LIBCONFUSE help - INADYN is a free DynDNS client. It gives the possibility - to have your own fixed hostname registered on the internet, - although your IP might be changing. + In-a-Dyn is Dynamic DNS (DDNS) client with HTTPS support used + to automate the task of keeping your Internet name in sync + with your public (DHCP/PPPoE) IP address. It can also be used + when you have backup connections to the Internet. + + For HTTPS support you need to select one of the libraries: + OpenSSL, GnuTLS, or mbed TLS (PolarSSL). https://github.com/troglobit/inadyn From f36c57728aa43df2355db731d90712a5a29cc501 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 16:23:18 +0200 Subject: [PATCH 0750/2890] package/hwdata: install to staging hwdata provides a .pc file, which other packages can look up to find the location where hwdata files are, and use them at build time. This is the case for the upcoming libdisplay-info package, which requires the hwdata's PNP IDs at build time. However, installing the .pc file is not enough. Indeed, meson (which libdisplay-info uses) will look for the corresponding data files in datadir, which it locates relative to the sysroot, which is our staging. So, we also need to install the hwdata files in staging. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/hwdata/hwdata.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index a7dd84f62c84..cac6b80185ec 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -8,6 +8,7 @@ HWDATA_VERSION = 0.371 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE +HWDATA_INSTALL_STAGING = YES HWDATA_FILES = \ $(if $(BR2_PACKAGE_HWDATA_IAB_OUI_TXT),iab.txt oui.txt) \ @@ -15,7 +16,22 @@ HWDATA_FILES = \ $(if $(BR2_PACKAGE_HWDATA_PNP_IDS),pnp.ids) \ $(if $(BR2_PACKAGE_HWDATA_USB_IDS),usb.ids) +define HWDATA_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) +endef + +define HWDATA_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) hwdata.pc +endef + ifneq ($(strip $(HWDATA_FILES)),) +define HWDATA_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0644 $(@D)/hwdata.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/hwdata.pc + $(INSTALL) -d -m 755 $(STAGING_DIR)/usr/share/hwdata + $(INSTALL) -m 644 -t $(STAGING_DIR)/usr/share/hwdata \ + $(addprefix $(@D)/,$(HWDATA_FILES)) +endef define HWDATA_INSTALL_TARGET_CMDS $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/hwdata $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/hwdata \ From d4a96ee46e3656b95151ab8e27d3fd3407e4633a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Jun 2023 15:34:10 +0200 Subject: [PATCH 0751/2890] linux: fix kernel hashes Fixes commit which added hashes for wrong files: https://git.busybox.net/buildroot/commit/?id=88108f9793f5824fa058b878974f234ebe834325 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- linux/linux.hash | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index ee510f836d32..d90f6cb2a365 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 927ba93d3da556c8e30b2640aa3f19c3c3cda66c655754e0798024020e2981b4 patch-6.3.8.xz -sha256 84c638ee9a36e30ef879e2944c5adfc2523a5a1553951b40e8cf4d873426d90a patch-6.1.33.xz +sha256 4323d421250e2e444c35d36f4aa8ddb56591dedc25c68d359d19c4ef9dd20955 linux-6.3.8.tar.xz +sha256 b26f7cbcbf8031efc49f11f236f372fc34a4fd5fc6ad3151b893d1aa038ed603 linux-6.1.34.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 c8c39191dc89ccb8f0fd05e4b06c9bcc77672156bdc64fe445d2109c116a3432 patch-5.15.117.xz -sha256 1bde9f3d8bace93e634ca0841fca14fcbd7b6d53cf877ee3e7f18778bf842455 patch-5.10.184.xz -sha256 5e627d9086f539e65c91f6e5c59c8bb66b59f9d369173dc0ccb14f70795d1876 patch-5.4.247.xz +sha256 a9a8331f3c0e004b40a41f30d688b53bf85405597ac41c2c89be7f4fbcf7239f linux-5.15.117.tar.xz +sha256 77a9bebc1d1fa057212a3ac62c2a0784aafcdef149032df8898ebc9ed3c62908 linux-5.10.184.tar.xz +sha256 33010d4f02314dd4eb51ab5d09f49ce970f2cfefe9f2133a2e085cac5dfffed7 linux-5.4.247.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 663669feee6ad4814704bf6dcc89ebbf64e1862f4dc231bc6327e33acea99823 patch-4.19.286.xz -sha256 faa5db19c03aaa96417c2c3e76fbc10886d25b9f26179ff653e3c29f6707840f patch-4.14.318.xz +sha256 47841504f334b24fe411270954423202ed84e21251edf5a61d40bde59051089d linux-4.19.286.tar.xz +sha256 c63a327e799b8a30ca96167f66100d4d7788338ac0a8cf5fc492c97e303211bc linux-4.14.318.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz From 6dfc789f4f21367bc5f4b5454db0922821a765bc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 19 Jun 2023 19:20:46 +0200 Subject: [PATCH 0752/2890] package/check: switch to cmake The autoconf-build system fails to properly detect vsnprintf checking for vsnprintf... yes checking whether vsnprintf is C99 compliant... no which leads to a build error snprintf.c:495:1: error: inlining failed in call to 'always_inline' 'rpl_vsnprintf.localalias': function not inlinable Building with cmake fixes the problem: -- Looking for vsnprintf -- Looking for vsnprintf - found The cmake build system has an option to disable checkmk, so we don't need to remove it from target anymore. Fixes: http://autobuild.buildroot.net/results/e55/e5562513226de902dae642526165b1555a540144/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/check/check.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/package/check/check.mk b/package/check/check.mk index ccffd08ee39d..d3977154df2f 100644 --- a/package/check/check.mk +++ b/package/check/check.mk @@ -10,12 +10,6 @@ CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf CHECK_LICENSE = LGPL-2.1+ CHECK_LICENSE_FILES = COPYING.LESSER -CHECK_CONF_OPTS = --disable-build-docs +CHECK_CONF_OPTS = -DBUILD_TESTING=OFF -DINSTALL_CHECKMK=OFF -# Having checkmk in the target makes no sense -define CHECK_REMOVE_CHECKMK - rm -f $(TARGET_DIR)/usr/bin/checkmk -endef -CHECK_POST_INSTALL_TARGET_HOOKS += CHECK_REMOVE_CHECKMK - -$(eval $(autotools-package)) +$(eval $(cmake-package)) From 6508581652ce4cc9c98cd23601ce3a5fc3e8e2c6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 19 Jun 2023 19:04:40 +0200 Subject: [PATCH 0753/2890] package/ccache: fix license hash Buildroot commit 1db3f0f84449843476c2887d2ea09323c66f33a4 failed to update the license hash which is needed due to various commits in 2023 updating package versions and copyright year: https://github.com/ccache/ccache/commits/master/LICENSE.adoc Fixes: http://autobuild.buildroot.net/results/41b/41b3427e30b6e44352fc78b27360fdadf9e46393/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/ccache/ccache.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 2b6cd65a74d9..736122e0abf6 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally sha256 3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49 ccache-4.8.2.tar.xz sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt -sha256 56cf64f68b7b8150300acd79899941615523ea5c56c120e92f5b175b7cc78e3c LICENSE.adoc +sha256 55ce274f2b898dad70d3695ab13f82656fd455bd8fb6d1c85d6f7c453bef0b2e LICENSE.adoc From fa1d011a05c526c06b27edd388378e255b2f055c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Jun 2023 16:47:27 +0200 Subject: [PATCH 0754/2890] package/python-django: security bump to version 4.1.9 Fixes the following security issues: - CVE-2023-31047: Potential bypass of validation when uploading multiple files using one form field https://www.djangoproject.com/weblog/2023/may/03/security-releases/ In addition, 4.1.8 fixed a bug related to secrets rotation: https://docs.djangoproject.com/en/4.2/releases/4.1.8/ Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index cb03b33bfe82..922f468a67ad 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 626f96c63ddfab24bab90d80c87a7aad Django-4.1.7.tar.gz -sha256 44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8 Django-4.1.7.tar.gz +md5 1a6f4e5318e3272deaa9cfd61e252fab Django-4.1.9.tar.gz +sha256 e9f074a84930662104871bfcea55c3c180c50a0a47739db82435deae6cbaf032 Django-4.1.9.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index e8c91cf51f42..fa58f657978f 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.7 +PYTHON_DJANGO_VERSION = 4.1.9 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/9f/a7/07939866241b7e8f8d3bf164b7d6ad428163723e29dd472700f8ab0e5fd5 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/11/ea/8b514434c57c3bef89a475b75f74d768471d8e1bc61f4e5c79daeae9b5ef PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From 0afcfe5a48bd0cb33b1431bb92a5b43ba1109270 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Jun 2023 16:36:17 +0200 Subject: [PATCH 0755/2890] package/c-ares: security bump to version 1.19.1 Fixes the following security issues: - CVE-2023-32067: High. 0-byte UDP payload causes Denial of Service - CVE-2023-31147 Moderate. Insufficient randomness in generation of DNS query IDs - CVE-2023-31130. Moderate. Buffer Underwrite in ares_inet_net_pton() - CVE-2023-31124. Low. AutoTools does not set CARES_RANDOM_FILE during cross compilation Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index edf891674ba5..3e1573f2cfeb 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3 c-ares-1.19.0.tar.gz +sha256 321700399b72ed0e037d0074c629e7741f6b2ec2dda92956abe3e9671d3e268e c-ares-1.19.1.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 4332fc6919d0..46b8acd67369 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.19.0 +C_ARES_VERSION = 1.19.1 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From a240f9da855fc4a01ae1a1a755722f8fc3773705 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Jun 2023 16:32:20 +0200 Subject: [PATCH 0756/2890] package/nodejs: security bump to version 16.20.0 Fixes the following security issues: - CVE-2023-23918: Node.js Permissions policies can be bypassed via process.mainModule (High) - CVE-2023-23919: Node.js OpenSSL error handling issues in nodejs crypto library (Medium) - CVE-2023-23920: Node.js insecure loading of ICU data through ICU\_DATA environment variable (Low) - CVE-2023-23936: Fetch API in Node.js did not protect against CRLF injection in host headers (Medium) https://github.com/nodejs/undici/security/advisories/GHSA-5r9g-qh6m-jxff - CVE-2023-24807: Regular Expression Denial of Service in Headers in Node.js fetch API (Low) https://github.com/nodejs/undici/security/advisories/GHSA-r6ch-mqf9-qc9w For more details, see the advisory: https://nodejs.org/en/blog/vulnerability/february-2023-security-releases Update LICENSE hash after an update of the openssl license snippet: https://github.com/nodejs/node/commit/e7ed56f501389978e4619ab697a812631c4061ff Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- package/nodejs/nodejs.hash | 6 +++--- package/nodejs/nodejs.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 4408782248ec..6ab4c53e79db 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v16.18.1/SHASUMS256.txt -sha256 1f8051a88f86f42064f4415fe7a980e59b0a502ecc8def583f6303bc4d445238 node-v16.18.1.tar.xz +# From https://nodejs.org/dist/v16.20.0/SHASUMS256.txt +sha256 e0990f992234e40a51fe11f92c3816c93a77e1b081145d3dd762cd1026345349 node-v16.20.0.tar.xz # Hash for license file -sha256 0bec08634ba79b5404f6b7f92ea850f3c2a06e27e6f83f2267e4f5e55ae33334 LICENSE +sha256 ba325815d3df8819bebaf37cad67d6e1f82271e1e4a1189b53abd28e261977d6 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 539ded06cd9e..fe629ada21d5 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 16.18.1 +NODEJS_VERSION = 16.20.0 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = \ From 66681bd4a6b9faadf9a6f772efb2705b06084cfc Mon Sep 17 00:00:00 2001 From: Florian Larysch Date: Wed, 14 Jun 2023 16:42:02 +0200 Subject: [PATCH 0757/2890] linux: make kconfig depend on host-make Commit 0b9efc991f ("linux: use BR2_MAKE") switched LINUX_MAKE to $(BR2_MAKE). However, this also implicitly sets LINUX_KCONFIG_MAKE. Thus, when host-make is being used in a build that has PER_PACKAGE_DIRECTORIES enabled, the dotconfig step will try to use the make instance from the host directory, but since it is not listed in LINUX_KCONFIG_DEPENDENCIES, it won't be available yet at that point in time. Add an explicit dependency to LINUX_KCONFIG_DEPENDENCIES to have it copied over early enough. Signed-off-by: Florian Larysch Signed-off-by: Arnout Vandecappelle --- linux/linux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index cc36b5251dbb..1c4fe45ac945 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -88,7 +88,8 @@ LINUX_DEPENDENCIES += \ # only if the host does not have them. LINUX_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ - $(BR2_FLEX_HOST_DEPENDENCY) + $(BR2_FLEX_HOST_DEPENDENCY) \ + $(BR2_MAKE_HOST_DEPENDENCY) # Starting with 4.18, the kconfig in the kernel calls the # cross-compiler to check its capabilities. So we need the From 4c8ab13b960edcd290ea5ca7a7e739cb993fb863 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Tue, 13 Jun 2023 12:50:12 +0200 Subject: [PATCH 0758/2890] petitboot: add pb-discover daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Laurent Vivier Reviewed-by: Cédric Le Goater Reviewed-by: Joel Stanley [Arnout: also source /etc/default file] Signed-off-by: Arnout Vandecappelle --- package/petitboot/S15pb-discover | 57 ++++++++++++++++++++++++++++++++ package/petitboot/petitboot.mk | 4 +++ 2 files changed, 61 insertions(+) create mode 100644 package/petitboot/S15pb-discover diff --git a/package/petitboot/S15pb-discover b/package/petitboot/S15pb-discover new file mode 100644 index 000000000000..7ecc12e99103 --- /dev/null +++ b/package/petitboot/S15pb-discover @@ -0,0 +1,57 @@ +#!/bin/sh + +DAEMON="pb-discover" +PIDFILE="/var/run/$DAEMON.pid" +LOGFILE="/var/log/$DAEMON.log" + +PB_DISCOVER_ARGS="-l $LOGFILE" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +if [ "$(pb-config debug)" = "enabled" ] ; then + PB_DISCOVER_ARGS="$PB_DISCOVER_ARGS --verbose" +fi + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -b -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $PB_DISCOVER_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 + ;; +esac diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index a798e7ca614f..4d56b73938e7 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -53,6 +53,10 @@ define PETITBOOT_POST_INSTALL $(TARGET_DIR)/etc/petitboot/boot.d/01-create-default-dtb $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ $(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb + $(INSTALL) -m 0755 -D $(PETITBOOT_PKGDIR)/S15pb-discover \ + $(TARGET_DIR)/etc/init.d/S15pb-discover + ln -sf /usr/sbin/pb-udhcpc \ + $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ endef PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL From 5206492d6a749191fc9395479438a35007417cc2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 11:06:08 +0200 Subject: [PATCH 0759/2890] =?UTF-8?q?DEVELOPERS:=20remove=20Jos=C3=A9=20Pe?= =?UTF-8?q?kkarinen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit E-mails are bouncing: : host ASPMX.L.GOOGLE.com[74.125.133.26] said: 550-5.1.1 The email account that you tried to reach does not exist. Please try 550-5.1.1 double-checking the recipient's email address for typos or 550-5.1.1 unnecessary spaces. Learn more at 550 5.1.1 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- DEVELOPERS | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 694dfe0bdde5..794c2ebdfe6e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1619,19 +1619,6 @@ N: José Luis Salvador Rufo F: package/zfs/ F: support/testing/tests/package/test_zfs.py -N: José Pekkarinen -F: package/alfred/ -F: package/avocado/ -F: package/bmx7/ -F: package/opensc/ -F: package/python-aexpect/ -F: package/python-alembic/ -F: package/python-lark/ -F: package/softhsm2/ -F: support/testing/tests/package/sample_python_aexpect.py -F: support/testing/tests/package/test_avocado.py -F: support/testing/tests/package/test_python_aexpect.py - N: Joseph Kogut F: package/at-spi2-core/ F: package/clang/ From c02707a34226c15426b9cac35aefda7d7e9b0125 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 10:50:49 +0200 Subject: [PATCH 0760/2890] package/opensc: bump version to 0.23.0 Release notes: https://github.com/OpenSC/OpenSC/blob/master/NEWS Also carry two patches from upstream to fix build against newer LibreSSL. Those patches can't be backported to pre-0.23.0 versions, though. Fixes: http://autobuild.buildroot.net/results/913/91318abb98146dd967115ed6233949daa60d8bba/ Signed-off-by: Bernd Kuhls [yann.morin.1998@free.fr: squash LibreSSL fixes together with bump] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 - .../0001-Fix-maybe-uninitialized-errors.patch | 82 --------- ...ed-compatibility-with-LibreSSL-3.5.0.patch | 54 ++++++ ...ed-compatibility-with-LibreSSL-3.7.0.patch | 28 +++ ...02-added-compatibility-with-LibreSSL.patch | 173 ------------------ .../0003-Fix-build-with-libressl-3.5.0.patch | 47 ----- package/opensc/opensc.hash | 2 +- package/opensc/opensc.mk | 2 +- 8 files changed, 84 insertions(+), 306 deletions(-) delete mode 100644 package/opensc/0001-Fix-maybe-uninitialized-errors.patch create mode 100644 package/opensc/0001-fixed-compatibility-with-LibreSSL-3.5.0.patch create mode 100644 package/opensc/0001-fixed-compatibility-with-LibreSSL-3.7.0.patch delete mode 100644 package/opensc/0002-added-compatibility-with-LibreSSL.patch delete mode 100644 package/opensc/0003-Fix-build-with-libressl-3.5.0.patch diff --git a/.checkpackageignore b/.checkpackageignore index c78168e5ea4d..4a40bc7fcc17 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1136,8 +1136,6 @@ package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch Upstre package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch Upstream package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch Upstream package/openrc/0006-Also-create-run-lock-subsys-directory.patch Upstream -package/opensc/0002-added-compatibility-with-LibreSSL.patch Upstream -package/opensc/0003-Fix-build-with-libressl-3.5.0.patch Upstream package/openssh/S50sshd EmptyLastLine Indent Variables package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch Upstream package/opentyrian/0001-Move-definitions-that-don-t-need-to-be-exposed-from-opl-h-to-opl-c.patch Upstream diff --git a/package/opensc/0001-Fix-maybe-uninitialized-errors.patch b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch deleted file mode 100644 index 671d92c150db..000000000000 --- a/package/opensc/0001-Fix-maybe-uninitialized-errors.patch +++ /dev/null @@ -1,82 +0,0 @@ -From bcb39d6f4d2dee6beb035cb2f3618174ec1cb2b0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= -Date: Fri, 10 Dec 2021 13:54:26 +0200 -Subject: [PATCH] Fix maybe uninitialized errors -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: José Pekkarinen -Upstream: https://github.com/OpenSC/OpenSC/commit/05ec8c7fe785a2b9aeaac1164adb349df42b7f80 ---- - src/libopensc/pkcs15-coolkey.c | 12 ++++++------ - src/pkcs15init/pkcs15-asepcos.c | 2 +- - src/tools/opensc-explorer.c | 2 +- - 3 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/libopensc/pkcs15-coolkey.c b/src/libopensc/pkcs15-coolkey.c -index 586475dd..15684cef 100644 ---- a/src/libopensc/pkcs15-coolkey.c -+++ b/src/libopensc/pkcs15-coolkey.c -@@ -147,9 +147,9 @@ coolkey_find_matching_cert(sc_card_t *card, sc_cardctl_coolkey_object_t *in_obj, - static int - coolkey_get_attribute_ulong(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, CK_ULONG *value) - { -- const u8 *val; -- size_t val_len; -- u8 data_type; -+ const u8 *val = NULL; -+ size_t val_len = 0; -+ u8 data_type = 0; - int r; - - r = coolkey_get_attribute(card, obj, type, &val, &val_len, &data_type); -@@ -168,8 +168,8 @@ static int - coolkey_get_attribute_boolean(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE attr_type) - { - int r; -- const u8 *val; -- size_t val_len; -+ const u8 *val = NULL; -+ size_t val_len = 0; - - r = coolkey_get_attribute(card, obj, attr_type, &val, &val_len, NULL); - if (r < 0) { -@@ -186,7 +186,7 @@ static int - coolkey_get_attribute_bytes(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, u8 *data, size_t *data_len, size_t max_data_len) - { - const u8 *val; -- size_t val_len; -+ size_t val_len = 0; - int r; - - r = coolkey_get_attribute(card, obj, type, &val, &val_len, NULL); -diff --git a/src/pkcs15init/pkcs15-asepcos.c b/src/pkcs15init/pkcs15-asepcos.c -index d7122012..bc0efb5c 100644 ---- a/src/pkcs15init/pkcs15-asepcos.c -+++ b/src/pkcs15init/pkcs15-asepcos.c -@@ -221,7 +221,7 @@ static int asepcos_do_store_pin(sc_profile_t *profile, sc_card_t *card, - { - sc_file_t *nfile = NULL; - u8 buf[64], sbuf[64], *p = buf, *q = sbuf; -- int r, akn; -+ int r, akn = 0; - - if (auth_info->auth_type != SC_PKCS15_PIN_AUTH_TYPE_PIN) - return SC_ERROR_OBJECT_NOT_VALID; -diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c -index 9ec4daa1..04efdf8f 100644 ---- a/src/tools/opensc-explorer.c -+++ b/src/tools/opensc-explorer.c -@@ -2472,7 +2472,7 @@ int main(int argc, char *argv[]) - char *line; - int cargc; - char *cargv[260]; -- int multiple; -+ int multiple = 0; - struct command *cmd; - char prompt[3*SC_MAX_PATH_STRING_SIZE]; - --- -2.25.1 - diff --git a/package/opensc/0001-fixed-compatibility-with-LibreSSL-3.5.0.patch b/package/opensc/0001-fixed-compatibility-with-LibreSSL-3.5.0.patch new file mode 100644 index 000000000000..0daf75d5ba8a --- /dev/null +++ b/package/opensc/0001-fixed-compatibility-with-LibreSSL-3.5.0.patch @@ -0,0 +1,54 @@ +From da01e5fab9be9865db1aac203e574e0edbfd6584 Mon Sep 17 00:00:00 2001 +From: Frank Morgner +Date: Wed, 14 Dec 2022 09:31:29 +0100 +Subject: [PATCH] fixed compatibility with LibreSSL >= 3.5.0 + +fixes https://github.com/OpenSC/OpenSC/issues/2664 + +Upstream: https://github.com/OpenSC/OpenSC/commit/da01e5fab9be9865db1aac203e574e0edbfd6584 + +Signed-off-by: Bernd Kuhls +--- + src/libopensc/card-iasecc.c | 12 +----------- + src/libopensc/sc-ossl-compat.h | 1 + + 2 files changed, 2 insertions(+), 11 deletions(-) + +diff --git a/src/libopensc/card-iasecc.c b/src/libopensc/card-iasecc.c +index 480c1cf87b..1347ed2393 100644 +--- a/src/libopensc/card-iasecc.c ++++ b/src/libopensc/card-iasecc.c +@@ -38,21 +38,11 @@ + #include + #include + +-/* +- * OpenSSL-3.0.0 does not allow access to the SHA data +- * so this driver can not produces signatures +- * OpenSSL 1.1.1 uses EVP_MD_CTX_md_data +- * LibreSSL +- */ +- +-#if defined(LIBRESSL_VERSION_NUMBER) +-# define EVP_MD_CTX_md_data(x) (x->md_data) +-#endif +- + #include "internal.h" + #include "asn1.h" + #include "cardctl.h" + #include "opensc.h" ++#include "sc-ossl-compat.h" + /* #include "sm.h" */ + #include "pkcs15.h" + /* #include "hash-strings.h" */ +diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h +index da53ca8cee..8c0f96701c 100644 +--- a/src/libopensc/sc-ossl-compat.h ++++ b/src/libopensc/sc-ossl-compat.h +@@ -42,6 +42,7 @@ extern "C" { + #define X509_get_extension_flags(x) (x->ex_flags) + #define X509_get_key_usage(x) (x->ex_kusage) + #define X509_get_extended_key_usage(x) (x->ex_xkusage) ++#define EVP_MD_CTX_md_data(x) (x->md_data) + #endif + + #if defined(LIBRESSL_VERSION_NUMBER) diff --git a/package/opensc/0001-fixed-compatibility-with-LibreSSL-3.7.0.patch b/package/opensc/0001-fixed-compatibility-with-LibreSSL-3.7.0.patch new file mode 100644 index 000000000000..6bbbea6ce610 --- /dev/null +++ b/package/opensc/0001-fixed-compatibility-with-LibreSSL-3.7.0.patch @@ -0,0 +1,28 @@ +From 98ad0f93b0a7673cdce82e1b3faa7dc314c64dd6 Mon Sep 17 00:00:00 2001 +From: Frank Morgner +Date: Fri, 16 Dec 2022 11:56:28 +0100 +Subject: [PATCH] fixed compatibility with LibreSSL 3.7.0 + +Upstream: https://github.com/OpenSC/OpenSC/commit/98ad0f93b0a7673cdce82e1b3faa7dc314c64dd6 + +Signed-off-by: Bernd Kuhls +--- + src/libopensc/sc-ossl-compat.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h +index 8c0f96701c..4425da93f3 100644 +--- a/src/libopensc/sc-ossl-compat.h ++++ b/src/libopensc/sc-ossl-compat.h +@@ -54,9 +54,11 @@ extern "C" { + #define EVP_sha3_256() (NULL) + #define EVP_sha3_384() (NULL) + #define EVP_sha3_512() (NULL) ++#if LIBRESSL_VERSION_NUMBER < 0x3070000fL + #define EVP_PKEY_new_raw_public_key(t, e, p, l) (NULL) + #define EVP_PKEY_get_raw_public_key(p, pu, l) (0) + #endif ++#endif + + /* OpenSSL 1.1.1 has FIPS_mode function */ + #if OPENSSL_VERSION_NUMBER >= 0x30000000L diff --git a/package/opensc/0002-added-compatibility-with-LibreSSL.patch b/package/opensc/0002-added-compatibility-with-LibreSSL.patch deleted file mode 100644 index 86a17448f85f..000000000000 --- a/package/opensc/0002-added-compatibility-with-LibreSSL.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 302ad70471efa279b033d4d5511d979ec5d965fe Mon Sep 17 00:00:00 2001 -From: Frank Morgner -Date: Thu, 20 Jan 2022 17:01:46 +0100 -Subject: [PATCH] added compatibility with LibreSSL - -[Retrieved (and backported) from: -https://github.com/OpenSC/OpenSC/commit/302ad70471efa279b033d4d5511d979ec5d965fe] -Signed-off-by: Fabrice Fontaine ---- - src/libopensc/sc-ossl-compat.h | 7 +++++++ - src/tests/p11test/p11test_case_common.c | 14 ++++++++++++++ - src/tests/p11test/p11test_case_ec_derive.c | 4 ++++ - src/tests/p11test/p11test_case_readonly.c | 9 +++++++-- - 4 files changed, 32 insertions(+), 2 deletions(-) - -diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h -index f885f85bb9..ec694ad48d 100644 ---- a/src/libopensc/sc-ossl-compat.h -+++ b/src/libopensc/sc-ossl-compat.h -@@ -105,6 +105,13 @@ extern "C" { - /* workaround unused value warning for a macro that does nothing */ - #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L - #define OPENSSL_malloc_init() -+#define FIPS_mode() (0) -+#define EVP_sha3_224() (NULL) -+#define EVP_sha3_256() (NULL) -+#define EVP_sha3_384() (NULL) -+#define EVP_sha3_512() (NULL) -+#define EVP_PKEY_new_raw_public_key(t, e, p, l) (NULL) -+#define EVP_PKEY_get_raw_public_key(p, pu, l) (0) - #endif - - #if OPENSSL_VERSION_NUMBER >= 0x30000000L -diff --git a/src/tests/p11test/p11test_case_common.c b/src/tests/p11test/p11test_case_common.c -index e432f8f4ed..f091dbcc10 100644 ---- a/src/tests/p11test/p11test_case_common.c -+++ b/src/tests/p11test/p11test_case_common.c -@@ -164,6 +164,7 @@ add_supported_mechs(test_cert_t *o) - o->mechs[0].result_flags = 0; - o->mechs[0].usage_flags = CKF_SIGN | CKF_VERIFY; - } -+#ifdef EVP_PKEY_ED25519 - } else if (o->type == EVP_PKEY_ED25519) { - if (token.num_ed_mechs > 0 ) { - o->num_mechs = token.num_ed_mechs; -@@ -184,6 +185,8 @@ add_supported_mechs(test_cert_t *o) - o->mechs[0].result_flags = 0; - o->mechs[0].usage_flags = CKF_SIGN | CKF_VERIFY; - } -+#endif -+#ifdef EVP_PKEY_X25519 - } else if (o->type == EVP_PKEY_X25519) { - if (token.num_montgomery_mechs > 0 ) { - o->num_mechs = token.num_montgomery_mechs; -@@ -204,6 +207,7 @@ add_supported_mechs(test_cert_t *o) - o->mechs[0].result_flags = 0; - o->mechs[0].usage_flags = CKF_DERIVE; - } -+#endif - } - } - -@@ -601,6 +605,7 @@ int callback_public_keys(test_certs_t *objects, - a = template[6].pValue; - if (d2i_ASN1_PRINTABLESTRING(&curve, &a, (long)template[6].ulValueLen) != NULL) { - switch (o->key_type) { -+#ifdef EVP_PKEY_ED25519 - case CKK_EC_EDWARDS: - if (strcmp((char *)curve->data, "edwards25519")) { - debug_print(" [WARN %s ] Unknown curve name. " -@@ -608,6 +613,8 @@ int callback_public_keys(test_certs_t *objects, - } - evp_type = EVP_PKEY_ED25519; - break; -+#endif -+#ifdef EVP_PKEY_X25519 - case CKK_EC_MONTGOMERY: - if (strcmp((char *)curve->data, "curve25519")) { - debug_print(" [WARN %s ] Unknown curve name. " -@@ -615,16 +622,20 @@ int callback_public_keys(test_certs_t *objects, - } - evp_type = EVP_PKEY_X25519; - break; -+#endif - default: - debug_print(" [WARN %s ] Unknown key type %lu", o->id_str, o->key_type); - return -1; - } - ASN1_PRINTABLESTRING_free(curve); - } else if (d2i_ASN1_OBJECT(&obj, &a, (long)template[6].ulValueLen) != NULL) { -+#if defined(EVP_PKEY_ED25519) || defined (EVP_PKEY_X25519) - int nid = OBJ_obj2nid(obj); -+#endif - ASN1_OBJECT_free(obj); - - switch (o->key_type) { -+#ifdef EVP_PKEY_ED25519 - case CKK_EC_EDWARDS: - if (nid != NID_ED25519) { - debug_print(" [WARN %s ] Unknown OID. " -@@ -632,6 +643,8 @@ int callback_public_keys(test_certs_t *objects, - } - evp_type = EVP_PKEY_ED25519; - break; -+#endif -+#ifdef EVP_PKEY_X25519 - case CKK_EC_MONTGOMERY: - if (nid != NID_X25519) { - debug_print(" [WARN %s ] Unknown OID. " -@@ -639,6 +652,7 @@ int callback_public_keys(test_certs_t *objects, - } - evp_type = EVP_PKEY_X25519; - break; -+#endif - default: - debug_print(" [WARN %s ] Unknown key type %lu", o->id_str, o->key_type); - return -1; -diff --git a/src/tests/p11test/p11test_case_ec_derive.c b/src/tests/p11test/p11test_case_ec_derive.c -index 9f13b3e9d6..f7a5f92f9e 100644 ---- a/src/tests/p11test/p11test_case_ec_derive.c -+++ b/src/tests/p11test/p11test_case_ec_derive.c -@@ -89,6 +89,7 @@ pkcs11_derive(test_cert_t *o, token_info_t * info, - - int test_derive_x25519(test_cert_t *o, token_info_t *info, test_mech_t *mech) - { -+#ifdef EVP_PKEY_X25519 - unsigned char *secret = NULL, *pkcs11_secret = NULL; - EVP_PKEY_CTX *pctx = NULL; - EVP_PKEY *pkey = NULL; /* This is peer key */ -@@ -210,6 +211,9 @@ int test_derive_x25519(test_cert_t *o, token_info_t *info, test_mech_t *mech) - free(secret); - free(pkcs11_secret); - return 1; -+#else -+ return 0; -+#endif - } - - int test_derive(test_cert_t *o, token_info_t *info, test_mech_t *mech) -diff --git a/src/tests/p11test/p11test_case_readonly.c b/src/tests/p11test/p11test_case_readonly.c -index 624bd6a54d..2aefdc7a70 100644 ---- a/src/tests/p11test/p11test_case_readonly.c -+++ b/src/tests/p11test/p11test_case_readonly.c -@@ -522,6 +522,7 @@ int verify_message_openssl(test_cert_t *o, token_info_t *info, CK_BYTE *message, - rv, ERR_error_string(ERR_peek_last_error(), NULL)); - return -1; - } -+#ifdef EVP_PKEY_ED25519 - } else if (o->type == EVP_PKEY_ED25519) { - /* need to be created even though we do not do any MD */ - EVP_MD_CTX *ctx = EVP_MD_CTX_create(); -@@ -547,7 +548,7 @@ int verify_message_openssl(test_cert_t *o, token_info_t *info, CK_BYTE *message, - EVP_MD_CTX_free(ctx); - return -1; - } -- -+#endif - } else { - fprintf(stderr, " [ KEY %s ] Unknown type. Not verifying\n", o->id_str); - } -@@ -641,7 +642,11 @@ int sign_verify_test(test_cert_t *o, token_info_t *info, test_mech_t *mech, - return 0; - } - -- if (o->type != EVP_PK_EC && o->type != EVP_PK_RSA && o->type != EVP_PKEY_ED25519) { -+ if (o->type != EVP_PK_EC && o->type != EVP_PK_RSA -+#ifdef EVP_PKEY_ED25519 -+ && o->type != EVP_PKEY_ED25519 -+#endif -+ ) { - debug_print(" [SKIP %s ] Skip non-RSA and non-EC key", o->id_str); - return 0; - } diff --git a/package/opensc/0003-Fix-build-with-libressl-3.5.0.patch b/package/opensc/0003-Fix-build-with-libressl-3.5.0.patch deleted file mode 100644 index 1d262362d66f..000000000000 --- a/package/opensc/0003-Fix-build-with-libressl-3.5.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d13059d1ec2bbb8fe7068db0d66d521daa4b71ce Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 13 Aug 2022 14:27:22 +0200 -Subject: [PATCH] Fix build with libressl >= 3.5.0 - -libressl added back FIPS_mode since version 3.5.0 and -https://github.com/libressl-portable/openbsd/commit/a97eabc90d7647e374c1c6da686aeec63c49ff14 - -libressl provides X509_get_extension_flags since version 3.5.0 and -https://github.com/libressl-portable/openbsd/commit/3180723224c1b2c7856a110b8213e4966995d7e0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/OpenSC/OpenSC/pull/2593 & - https://github.com/OpenSC/OpenSC/pull/2595 (merged)] ---- - src/libopensc/sc-ossl-compat.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h -index f0d55279..2c42794c 100644 ---- a/src/libopensc/sc-ossl-compat.h -+++ b/src/libopensc/sc-ossl-compat.h -@@ -86,9 +86,11 @@ extern "C" { - #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay - -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L - #define X509_get_extension_flags(x) (x->ex_flags) - #define X509_get_key_usage(x) (x->ex_kusage) - #define X509_get_extended_key_usage(x) (x->ex_xkusage) -+#endif - #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2050300fL - #define X509_up_ref(cert) CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509) - #endif -@@ -104,7 +106,9 @@ extern "C" { - /* workaround unused value warning for a macro that does nothing */ - #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L - #define OPENSSL_malloc_init() -+#if LIBRESSL_VERSION_NUMBER < 0x30500000L - #define FIPS_mode() (0) -+#endif - #define EVP_sha3_224() (NULL) - #define EVP_sha3_256() (NULL) - #define EVP_sha3_384() (NULL) --- -2.35.1 - diff --git a/package/opensc/opensc.hash b/package/opensc/opensc.hash index 517cfe503a35..e8e675667e25 100644 --- a/package/opensc/opensc.hash +++ b/package/opensc/opensc.hash @@ -1,5 +1,5 @@ # Computed locally from https://https://github.com/OpenSC/OpenSC/releases/ -sha256 8d4e5347195ebea332be585df61dcc470331c26969e4b0447c851fb0844c7186 opensc-0.22.0.tar.gz +sha256 a4844a6ea03a522ecf35e49659716dacb6be03f7c010a1a583aaf3eb915ed2e0 opensc-0.23.0.tar.gz # Computed locally sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index f9e2f5083e5c..253b6b26f88b 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSC_VERSION = 0.22.0 +OPENSC_VERSION = 0.23.0 OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) OPENSC_LICENSE = LGPL-2.1+ OPENSC_LICENSE_FILES = COPYING From 35b57c9e879389bcec045bc00d3c1e0761379ad1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 10:29:53 +0200 Subject: [PATCH 0761/2890] package/kodi: fix build error with flatbuffers 23.x Fixes build error with defconfig BR2_x86_64=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y caused by bumping flatbuffers to version >= 23.x in commit 3d1ee7d624b71009ff61d4fa5ed860c52eb89b47 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...fer-Remove-forward-declararion-of-Fl.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch diff --git a/package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch b/package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch new file mode 100644 index 000000000000..87df0e4c9aa1 --- /dev/null +++ b/package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch @@ -0,0 +1,42 @@ +From 07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20H=C3=A4rer?= +Date: Sun, 28 May 2023 00:49:40 +0200 +Subject: [PATCH] SavestateFlatBuffer: Remove forward declararion of + FlatBufferBuilder + +This caused a compiler error with recent faltbuffers because the type changed: + +In file included from xbmc/cores/RetroPlayer/savestates/SavestateDatabase.cpp:12: +xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h:19:7: error: definition of type 'FlatBufferBuilder' conflicts with type alias of the same name +class FlatBufferBuilder; + ^ +/usr/include/flatbuffers/flatbuffer_builder.h:1414:7: note: 'FlatBufferBuilder' declared here +using FlatBufferBuilder = FlatBufferBuilderImpl; + ^ +1 error generated. + +(cherry picked from commit 351184d7e4e3edc447d04a297769eb41a477ba68) + +Upstream: https://github.com/xbmc/xbmc/commit/07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c + +Signed-off-by: Bernd Kuhls +--- + xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h b/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h +index cb93e6bbc2e12..fa42a9bad7034 100644 +--- a/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h ++++ b/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h +@@ -14,11 +14,6 @@ + + #include + +-namespace flatbuffers +-{ +-class FlatBufferBuilder; +-} +- + namespace KODI + { + namespace RETRO From d521d6b756864b926f5eb98c111a8989347ee0e6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 10:13:08 +0200 Subject: [PATCH 0762/2890] package/fftw: bump version to 3.3.10 Release notes: http://fftw.org/release-notes.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/fftw/fftw.hash | 6 +++--- package/fftw/fftw.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fftw/fftw.hash b/package/fftw/fftw.hash index b07aad8f1843..9e7364d76c79 100644 --- a/package/fftw/fftw.hash +++ b/package/fftw/fftw.hash @@ -1,5 +1,5 @@ -# From http://www.fftw.org/fftw-3.3.8.tar.gz.md5sum -md5 8aac833c943d8e90d51b697b27d4384d fftw-3.3.8.tar.gz +# From http://fftw.org/fftw-3.3.10.tar.gz.md5sum +md5 8ccbf6a5ea78a16dbc3e1306e234cc5c fftw-3.3.10.tar.gz # Locally computed -sha256 6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303 fftw-3.3.7.tar.gz +sha256 56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467 fftw-3.3.10.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index 279244a5dcef..1bb537aeb807 100644 --- a/package/fftw/fftw.mk +++ b/package/fftw/fftw.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFTW_VERSION = 3.3.8 +FFTW_VERSION = 3.3.10 FFTW_SITE = http://www.fftw.org FFTW_INSTALL_STAGING = YES FFTW_LICENSE = GPL-2.0+ From da19c18af2d531b63b6d54f02dc2f16785756e66 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 24 Jun 2023 10:10:07 +0200 Subject: [PATCH 0763/2890] package/mesa3d: fix 002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch Update 002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch to fix an syntax error introduced by commit 'package/{mesa3d, mesa3d-headers}: bump version to 23.1.0' ([1]) Fixes: .../build/mesa3d-23.1.2/src/gallium/drivers/vc4/meson.build:87:76: ERROR: Trying to compare values of different types (UserFeatureOption, str) using !=. This was deprecated and undefined behavior previously and is as of 0.60.0 a hard error. [1] https://git.buildroot.net/buildroot/commit/?id=e6203db11ed40122a2d9f29012db5683a7eb10d0 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...tion-to-disable-optional-neon-suppor.patch | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch index a5564fcf3a67..430bd3b4b96b 100644 --- a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +++ b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch @@ -1,4 +1,4 @@ -From e3b47c1b84964c62b3e1fa782f1ffa4be0ae62f9 Mon Sep 17 00:00:00 2001 +From f719e942dde0a46a9ff0080001cb3466012ffcc0 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 9 Mar 2020 13:01:14 +0100 Subject: [PATCH] vc4: add meson option to disable optional neon support @@ -11,6 +11,8 @@ Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114 Signed-off-by: Peter Seiderer Signed-off-by: Bernd Kuhls [rebased for 20.2.0, 20.3.0, 21.1.0 & 23.1.0] +Signed-off-by: Peter Seiderer +[fix syntax error after previous rebases] --- meson_options.txt | 7 +++++++ src/gallium/drivers/vc4/meson.build | 4 ++-- @@ -18,25 +20,25 @@ Signed-off-by: Bernd Kuhls 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index a39596a6f19..0f6b6c62b55 100644 +index 8e0bf2a..1cf0e07 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -117,6 +117,13 @@ +@@ -116,6 +116,13 @@ option( + description : 'enable gallium va frontend.', ) - option( ++option( + 'gallium-vc4-neon', + type : 'feature', + deprecated: {'true': 'enabled', 'false': 'disabled'}, + description : 'enable gallium vc4 optional neon support.', +) + -+option( + option( 'va-libs-path', type : 'string', - value : '', diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build -index 5ce5af5f6b4..e3f7d8d62ae 100644 +index 84da951..7f950de 100644 --- a/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build @@ -84,7 +84,7 @@ files_libvc4 = files( @@ -44,7 +46,7 @@ index 5ce5af5f6b4..e3f7d8d62ae 100644 libvc4_neon = [] -if host_machine.cpu_family() == 'arm' -+if host_machine.cpu_family() == 'arm' and get_option('gallium-vc4-neon') != 'disabled' ++if host_machine.cpu_family() == 'arm' and not get_option('gallium-vc4-neon').disabled() libvc4_neon = static_library( 'vc4_neon', 'vc4_tiling_lt_neon.c', @@ -58,7 +60,7 @@ index 5ce5af5f6b4..e3f7d8d62ae 100644 if dep_simpenrose.found() diff --git a/src/gallium/drivers/vc4/vc4_tiling.h b/src/gallium/drivers/vc4/vc4_tiling.h -index 66767e7f1f8..7446f1c3d0c 100644 +index 5afe329..919b299 100644 --- a/src/gallium/drivers/vc4/vc4_tiling.h +++ b/src/gallium/drivers/vc4/vc4_tiling.h @@ -89,7 +89,7 @@ vc4_load_lt_image(void *dst, uint32_t dst_stride, @@ -80,5 +82,5 @@ index 66767e7f1f8..7446f1c3d0c 100644 vc4_store_lt_image_neon(dst, dst_stride, src, src_stride, cpp, box); -- -2.25.1 +2.41.0 From 840b5527466502f02b86c95f9bf95557d35c8571 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 09:52:07 +0200 Subject: [PATCH 0764/2890] package/dahdi-linux: fix build with kernel >= 6.3 Fixes: http://autobuild.buildroot.net/results/2bb/2bb8a38b12cb3a7650162f1f7f65b56b20711d64/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...rivers-dahdi-fix-build-with-clang-16.patch | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 package/dahdi-linux/0005-drivers-dahdi-fix-build-with-clang-16.patch diff --git a/package/dahdi-linux/0005-drivers-dahdi-fix-build-with-clang-16.patch b/package/dahdi-linux/0005-drivers-dahdi-fix-build-with-clang-16.patch new file mode 100644 index 000000000000..535e1628c9b4 --- /dev/null +++ b/package/dahdi-linux/0005-drivers-dahdi-fix-build-with-clang-16.patch @@ -0,0 +1,106 @@ +From d51c10dae5a06709983b929fc6f9fb18eec41951 Mon Sep 17 00:00:00 2001 +From: Brahmajit Das +Date: Thu, 22 Jun 2023 15:52:18 +0000 +Subject: [PATCH] drivers/dahdi: fix build with clang-16 + +clang-16 enables -Werror=incompatible-pointer-types (along with buch of +other warnings) by default, thus resulting in errors such as: + +/var/tmp/portage/net-misc/dahdi-3.2.0/work/dahdi-linux-3.2.0/drivers/dahdi/dahdi-sysfs.c:272:20: error: incompatible function + pointer types initializing 'int (*)(const struct device *, struct kobj_uevent_env *)' with an expression of type + 'int (struct device *, struct kobj_uevent_env *)' [-Wincompatible-function-pointer-types] + .uevent = span_uevent, + ^~~~~~~~~~~ +/var/tmp/portage/net-misc/dahdi-3.2.0/work/dahdi-linux-3.2.0/drivers/dahdi/dahdi-sysfs.c:709:20: error: incompatible function + pointer types initializing 'int (*)(const struct device *, struct kobj_uevent_env *)' with an expression of type + 'int (struct device *, struct kobj_uevent_env *)' [-Wincompatible-function-pointer-types] + .uevent = device_uevent, + ^~~~~~~~~~~~~ +2 errors generated. + +This is due the change in bus_type strcut made in upstream commit +https://github.com/torvalds/linux/commit/2a81ada32f0e584fc0c943e0d3a8c9f4fae411d6. +Where they make uevent take a const *, as the strcut should not be +modifying the device that is passed into it. + +This patch modifes some of the fucntions parameter types, making dahdi +possible to be built with clang-16. + +Bug: https://bugs.gentoo.org/906179 +Signed-off-by: Brahmajit Das + +Upstream: https://github.com/asterisk/dahdi-linux/pull/21 + +Signed-off-by: Bernd Kuhls +--- + drivers/dahdi/dahdi-sysfs.c | 8 ++++---- + drivers/dahdi/wctc4xxp/base.c | 2 +- + drivers/dahdi/xpp/xbus-sysfs.c | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c +index ca29ddba..0c5bd982 100644 +--- a/drivers/dahdi/dahdi-sysfs.c ++++ b/drivers/dahdi/dahdi-sysfs.c +@@ -47,7 +47,7 @@ static int span_match(struct device *dev, struct device_driver *driver) + return 1; + } + +-static inline struct dahdi_span *dev_to_span(struct device *dev) ++static inline struct dahdi_span *dev_to_span(const struct device *dev) + { + return dev_get_drvdata(dev); + } +@@ -68,7 +68,7 @@ static inline struct dahdi_span *dev_to_span(struct device *dev) + return err; \ + } while (0) + +-static int span_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++static int span_uevent(const struct device *dev, struct kobj_uevent_env *kenv) + { + struct dahdi_span *span; + +@@ -415,7 +415,7 @@ static struct { + unsigned int clean_chardev:1; + } should_cleanup; + +-static inline struct dahdi_device *to_ddev(struct device *dev) ++static inline struct dahdi_device *to_ddev(const struct device *dev) + { + return container_of(dev, struct dahdi_device, dev); + } +@@ -438,7 +438,7 @@ static inline struct dahdi_device *to_ddev(struct device *dev) + return err; \ + } while (0) + +-static int device_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++static int device_uevent(const struct device *dev, struct kobj_uevent_env *kenv) + { + struct dahdi_device *ddev; + +diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c +index ec6fc436..db70ea7e 100644 +--- a/drivers/dahdi/wctc4xxp/base.c ++++ b/drivers/dahdi/wctc4xxp/base.c +@@ -643,7 +643,7 @@ wctc4xxp_net_register(struct wcdte *wc) + return -ENOMEM; + priv = netdev_priv(netdev); + priv->wc = wc; +- memcpy(netdev->dev_addr, our_mac, sizeof(our_mac)); ++ memcpy((void *)netdev->dev_addr, our_mac, sizeof(our_mac)); + + # ifdef HAVE_NET_DEVICE_OPS + netdev->netdev_ops = &wctc4xxp_netdev_ops; +diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c +index d8c11dc3..29ad3619 100644 +--- a/drivers/dahdi/xpp/xbus-sysfs.c ++++ b/drivers/dahdi/xpp/xbus-sysfs.c +@@ -418,7 +418,7 @@ static int astribank_match(struct device *dev, struct device_driver *driver) + return err; \ + } while (0) + +-static int astribank_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++static int astribank_uevent(const struct device *dev, struct kobj_uevent_env *kenv) + { + xbus_t *xbus; + extern char *initdir; From dfdf613e3bc709dc58d7490103220fa820e489be Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 09:43:42 +0200 Subject: [PATCH 0765/2890] package/{mesa3d, mesa3d-headers}: bump version to 23.1.3 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-June/000723.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 4 ++-- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index f7b0ecfd52ab..a89ab984a8ac 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.1.2 +MESA3D_HEADERS_VERSION = 23.1.3 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 80272b70d642..71583d5f6783 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ # From https://lists.freedesktop.org/archives/mesa-announce/2023-June/000722.html -sha256 60b1f3adb1561830c158bf3c68508943674fb9d69f384c3c7289694385ab5c7e mesa-23.1.2.tar.xz -sha512 728e79720d950b0f39fa55c21dff7caed3650e88dff52a2f3e70540a049f1baf78178e62e5d6b1e59c76f6555ab0be3f0043cfbddd4745c0a742ccef2f5774d4 mesa-23.1.2.tar.xz +sha256 2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9 mesa-23.1.3.tar.xz +sha512 44f0658138ef99dcede5e4c33d5733af836283f05b031b07f3f8b3bc03b301bc7ab9dc15248829cf3dfc423f2da8935b372b25df8b9ef15a511ba16ccd913959 mesa-23.1.3.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index feb8547e7391..191fa15eefff 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.1.2 +MESA3D_VERSION = 23.1.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 95b7465e746c9d51929e9dd6896ec9940188b3b5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 16:18:47 +0200 Subject: [PATCH 0766/2890] package/samba4: update patch 0004 Fix typo in title, add upstream URL Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...dparty-heindal-Use-perl-module-JSON-part-of-core-i.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch index 7eb31e5d0781..aa55c0989150 100644 --- a/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch +++ b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch @@ -1,15 +1,15 @@ From bd8fc19c8383914b518a9d56f4c08fba3baeb967 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 7 May 2023 11:02:26 +0200 -Subject: [PATCH] 3rdparty/heindal: Use perl module JSON, part of core, instead - of JSON:PP package +Subject: [PATCH] 3rdparty/heimdal: Use perl module JSON:PP, part of core, instead + of JSON package Downloaded from https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN -Upstream: unknown +Upstream: https://github.com/heimdal/heimdal/pull/1176 --- third_party/heimdal/cf/make-proto.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) From 770f097ee6f22e48ee4ceba517bd8bb75bc419fa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 16:18:46 +0200 Subject: [PATCH 0767/2890] package/heimdal: Use perl module JSON:PP, part of core, instead of JSON package Fixes: http://autobuild.buildroot.net/results/48b/48b52d205150e30e522b40d1c7b51f339ae8b0db/ This patch ports the existing patch for the samba4 package: https://git.busybox.net/buildroot/tree/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch Signed-off-by: Bernd Kuhls Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...JSON-PP-part-of-core-instead-of-JSON.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch diff --git a/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch new file mode 100644 index 000000000000..7323ac70df02 --- /dev/null +++ b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch @@ -0,0 +1,57 @@ +From f6fdb0a28e3bfcb3fd0aa1c81ad59c5411c0d660 Mon Sep 17 00:00:00 2001 +From: Andrew Sim +Date: Sat, 10 Jun 2023 09:00:24 +0200 +Subject: [PATCH] Use perl module JSON:PP, part of core, instead of JSON + package + +This patch removes the need for an external package. + +Ported from +https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch +https://github.com/openwrt/packages/commit/402f4ba4eff65b80a9deaa6085256112bec4d67b#diff-208d4e0345c9d29fbec23d6f655ba794afd3052f5cb8dd73944db72ce81b847b + +Upstream: https://github.com/heimdal/heimdal/pull/1176 + +Signed-off-by: Bernd Kuhls +--- + cf/make-proto.pl | 4 ++-- + configure.ac | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/cf/make-proto.pl b/cf/make-proto.pl +index 36a040ce6..4af21916b 100644 +--- a/cf/make-proto.pl ++++ b/cf/make-proto.pl +@@ -4,7 +4,7 @@ + use Getopt::Std; + use File::Compare; + +-use JSON; ++use JSON::PP + + my $comment = 0; + my $doxygen = 0; +@@ -70,7 +70,7 @@ if($opt_x) { + my $EXP; + local $/; + open(EXP, '<', $opt_x) || die "open ${opt_x}"; +- my $obj = JSON->new->utf8->decode(); ++ my $obj = JSON::PP->new->utf8->decode(); + close $EXP; + + foreach my $x (keys %$obj) { +diff --git a/configure.ac b/configure.ac +index cedb4c01f..cecd030e6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,6 @@ if ! test -f "$srcdir/lib/asn1/der-protos.h" || + AC_KRB_PROG_PERL + AC_KRB_PERL_MOD(Getopt::Std) + AC_KRB_PERL_MOD(File::Compare) +- AC_KRB_PERL_MOD(JSON) + fi + + AC_KRB_PROG_YACC +-- +2.39.2 + From adabd0b8b03c36c660784b685a49ac7d41c9b472 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 23 Jun 2023 01:11:36 -0600 Subject: [PATCH 0768/2890] package/python-cryptography: bump to version 39.0.2 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index a23944a06f68..e08301475005 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 531348679f144d118156be5b17ddac750974cdcd9f44bb0a7cfd7ddcfee79c80 cryptography-39.0.1.tar.gz +sha256 405c9a6271e1a088ea0b432bc2094e2e8baadb2241e192ce9c73a7cc9793b127 cryptography-39.0.2.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a130b2d10d96..67aa20742dd2 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.1 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.2 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6a/f5/a729774d087e50fffd1438b3877a91e9281294f985bda0fd15bf99016c78 +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/fa/f3/f4b8c175ea9a1de650b0085858059050b7953a93d66c97ed89b93b232996 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From 42356e1d0908eec82254d64145226bfae78eb6b3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 23 Jun 2023 01:24:57 -0600 Subject: [PATCH 0769/2890] package/python-setuptools: bump to version 68.0.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index be130637285a..45413af27ed8 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 628ab1ae7d14185e5e536740ea31b5ce setuptools-67.8.0.tar.gz -sha256 62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102 setuptools-67.8.0.tar.gz +md5 c5e4ff6557d99204464aa300c0bad7d4 setuptools-68.0.0.tar.gz +sha256 baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235 setuptools-68.0.0.tar.gz sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 6d10172cdc81..267494716245 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 67.8.0 +PYTHON_SETUPTOOLS_VERSION = 68.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/03/20/630783571e76e5fa5f3e9f29398ca3ace377207b8196b54e0ffdf09f12c1 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/dc/98/5f896af066c128669229ff1aa81553ac14cfb3e5e74b6b44594132b8540e PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From 044c38b71d8cda99e893f0bdcfb18992a229d017 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 22 Jun 2023 13:49:51 -0300 Subject: [PATCH 0770/2890] configs/mx53loco: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1383:12: fatal error: openssl/evp.h: No such file or directory Reported-by: Jan-Benedict Glaw Signed-off-by: Fabio Estevam Signed-off-by: Yann E. MORIN --- configs/mx53loco_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index 212a032d84aa..d03c7d0916e8 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -24,6 +24,7 @@ BR2_TARGET_UBOOT_BOARDNAME="mx53loco" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y From a0c5f9c4edcbdd965eccb586ca58128fbf826cc2 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 22 Jun 2023 23:39:17 +0200 Subject: [PATCH 0771/2890] package/gstreamer1/gst1-plugins-good: add adaptivedemux2 plugin option Currently there is no explicit way to enable/disable the adaptivedemux2 plugin. Create a menu entry allowing users to disable or enable the plugin, like we have for other features. Signed-off-by: Dario Binacchi [yann.morin.1998@free.fr: use plugin name in prompt, drop useless help] Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-good/Config.in | 5 +++++ package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index d7ec16e80014..36a542227ab2 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -258,6 +258,11 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M comment "plugins with external dependencies" +config BR2_PACKAGE_GST1_PLUGINS_GOOD_ADAPTIVEMUX2 + bool "adaptivedemux2 (Adaptive Streaming 2)" + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_LIBSOUP + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME bool "lame (*.mp3 audio encoder)" select BR2_PACKAGE_LAME diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index bbcd3aecabd1..41f4c727f3a8 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -58,6 +58,13 @@ GST1_PLUGINS_GOOD_CONF_OPTS += -Dorc=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += orc endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ADAPTIVEMUX2),y) +GST1_PLUGINS_GOOD_CONF_OPTS += -Dadaptivedemux2=enabled +GST1_PLUGINS_GOOD_DEPENDENCIES += libsoup libxml2 +else +GST1_PLUGINS_GOOD_CONF_OPTS += -Dadaptivedemux2=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dalpha=enabled else From 11ca48bc4bb6f1be7fb22bb87507a99bd1e446f4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Jun 2023 19:24:45 +0200 Subject: [PATCH 0772/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 70591f4a2590..315af971db09 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.3.8" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.3.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index d90f6cb2a365..f49ab52afb85 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 4323d421250e2e444c35d36f4aa8ddb56591dedc25c68d359d19c4ef9dd20955 linux-6.3.8.tar.xz -sha256 b26f7cbcbf8031efc49f11f236f372fc34a4fd5fc6ad3151b893d1aa038ed603 linux-6.1.34.tar.xz +sha256 41ecf21399b17ab85163750ba22347d09b54fa099b80b63d0e2ef0066129b13e linux-6.3.9.tar.xz +sha256 be368143bc5d0dc73dd3e8c6191630c1620520379baf6f47c16116b2c0bc26ac linux-6.1.35.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 a9a8331f3c0e004b40a41f30d688b53bf85405597ac41c2c89be7f4fbcf7239f linux-5.15.117.tar.xz -sha256 77a9bebc1d1fa057212a3ac62c2a0784aafcdef149032df8898ebc9ed3c62908 linux-5.10.184.tar.xz -sha256 33010d4f02314dd4eb51ab5d09f49ce970f2cfefe9f2133a2e085cac5dfffed7 linux-5.4.247.tar.xz +sha256 4e6bf4dadb04d5d11d1d4cc37c0eabcf33bc333b7dd3dc2143c3099a823eb5b3 linux-5.15.118.tar.xz +sha256 280662ec8dc8738cf947ad66e748141abd58cbe3b5ed66b7f2b153222b7c7090 linux-5.10.185.tar.xz +sha256 3abed132e76c6575733acba39eaa54f6d8f4b1dc951b0e601a33959743b13e35 linux-5.4.248.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 47841504f334b24fe411270954423202ed84e21251edf5a61d40bde59051089d linux-4.19.286.tar.xz -sha256 c63a327e799b8a30ca96167f66100d4d7788338ac0a8cf5fc492c97e303211bc linux-4.14.318.tar.xz +sha256 286a9b8c75bff7bdf66985e12a3a650b2bd638a776a5a6e93415930855662a73 linux-4.19.287.tar.xz +sha256 aca4750f02f4090b753c1445db44dfa90de535eca73a7b0a7aa4453f65ba1ff9 linux-4.14.319.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 5b16e659df20..10e33a730634 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -396,13 +396,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.318" if BR2_KERNEL_HEADERS_4_14 - default "4.19.286" if BR2_KERNEL_HEADERS_4_19 - default "5.4.247" if BR2_KERNEL_HEADERS_5_4 - default "5.10.184" if BR2_KERNEL_HEADERS_5_10 - default "5.15.117" if BR2_KERNEL_HEADERS_5_15 - default "6.1.34" if BR2_KERNEL_HEADERS_6_1 - default "6.3.8" if BR2_KERNEL_HEADERS_6_3 + default "4.14.319" if BR2_KERNEL_HEADERS_4_14 + default "4.19.287" if BR2_KERNEL_HEADERS_4_19 + default "5.4.248" if BR2_KERNEL_HEADERS_5_4 + default "5.10.185" if BR2_KERNEL_HEADERS_5_10 + default "5.15.118" if BR2_KERNEL_HEADERS_5_15 + default "6.1.35" if BR2_KERNEL_HEADERS_6_1 + default "6.3.9" if BR2_KERNEL_HEADERS_6_3 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 55d0c96e0a4b8d26a421dd04d874f499af9c2ba8 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 22 Jun 2023 18:55:21 +0200 Subject: [PATCH 0773/2890] package/libubox: bump version to 75a3b87 Changelog: - be3dc7223a6d uloop: avoid integer overflow in tv_diff - 123e976f3d01 uloop: restore return type of uloop_timeout_remaining - 334415738150 uloop: add uloop_timeout_remaining64 - c87d3e1fb67d lua/uloop: use uloop_timeout_remaining64 - c86a894ec63d uloop: deprecate uloop_timeout_remaining - cce5e351278b vlist: define vlist_for_each_element_safe - f2d6752901f2 blob: clear buf->head when freeing a buffer - 45210ce14136 list.h: add container_of_safe macro - cfa372ff8aed blobmsg: implicitly reserve space for 0-terminator in string buf alloc - d2223ef9da71 blobmsg: work around false positive gcc -Warray-bounds warnings - ea56013409d5 jshn.sh: add json_add_fields function for adding multiple fields at once - b09b316aeaf6 blobmsg: add blobmsg_parse_attr function - eac92a4d5d82 blobmsg: add blobmsg_parse_array_attr - ef5e8e38bd38 usock: fix poll return code check - 6fc29d1c4292 jshn.sh: Add pretty-printing to json_dump - 5893cf78da40 blobmsg: Don't do at run-time what can be done at compile-time - 362951a2d96e uloop: fix uloop_run_timeout - 75a3b870cace uloop: add support for integrating with a different event loop Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libubox/libubox.hash | 2 +- package/libubox/libubox.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libubox/libubox.hash b/package/libubox/libubox.hash index 27754274856d..48b6432f5db9 100644 --- a/package/libubox/libubox.hash +++ b/package/libubox/libubox.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 54f65299439dab4be8f203588bcefd9b60052ae87d12c6d012f6278a2a111b4e libubox-d716ac4bc4236031d4c3cc1ed362b502e20e3787-br1.tar.gz +sha256 b06311e7d857583303e9256f58787857944572012fbfd4a5d83e92e0e684f654 libubox-75a3b870cace1171faf57bd55e5a9a2f1564f757-br1.tar.gz diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index 90ba57a88312..d6da078c7b53 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUBOX_VERSION = d716ac4bc4236031d4c3cc1ed362b502e20e3787 +LIBUBOX_VERSION = 75a3b870cace1171faf57bd55e5a9a2f1564f757 LIBUBOX_SITE = https://git.openwrt.org/project/libubox.git LIBUBOX_SITE_METHOD = git LIBUBOX_LICENSE = ISC, BSD-3-Clause From c4eb3544a0fb8023678f35556a9a359d806cac4a Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 22 Jun 2023 18:55:22 +0200 Subject: [PATCH 0774/2890] package/ubus: bump version to f787c97 Changelog: - 66baa44b8dee libubus: introduce new status messages - b3cd5ab4c010 cli: use UBUS_STATUS_PARSE_ERROR - 584f56a23314 cli: improve error logging for call command - 2f793a4eb063 lua: add optional path filter to objects() method - 2bebf93cd334 ubusd: handle invoke on event object without data - 9913aa61de73 ubusd: add lookup command queuing support - f787c97b3489 libubus: add missing uloop_fd_delete call in ubus_shutdown Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/ubus/ubus.hash | 2 +- package/ubus/ubus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ubus/ubus.hash b/package/ubus/ubus.hash index 2b7181e5d235..faa2e2626e22 100644 --- a/package/ubus/ubus.hash +++ b/package/ubus/ubus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 275d184006f2f60c9b0172d8fd0ccc8952f182960c0d3d0945be640873c1bef6 ubus-a72457b61df045d3c499a6211362b751710590d7-br1.tar.gz +sha256 e3022aa3cf6c38a4d3c0d798d9a9c7069ada063a0a5fe6894b466b71b17ce9cc ubus-f787c97b34894a38b15599886cacbca01271684f-br1.tar.gz sha256 a3caa6c0e90c87b7c97c2ac3d0c0d416082ef777215faec2e9b24ea6e68f6988 ubusd_acl.h diff --git a/package/ubus/ubus.mk b/package/ubus/ubus.mk index fa856fb36acf..1f9891411ac0 100644 --- a/package/ubus/ubus.mk +++ b/package/ubus/ubus.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBUS_VERSION = a72457b61df045d3c499a6211362b751710590d7 +UBUS_VERSION = f787c97b34894a38b15599886cacbca01271684f UBUS_SITE = https://git.openwrt.org/project/ubus.git UBUS_SITE_METHOD = git From 8436a33d0fe95678152fcf7f1f8451fdff675ccb Mon Sep 17 00:00:00 2001 From: Oleg Lyovin Date: Sun, 25 Jun 2023 15:48:47 +0300 Subject: [PATCH 0775/2890] package/libcgroup: bump to version 2.0.3 https://github.com/libcgroup/libcgroup/releases/tag/v2.0.3 Also remove redundant LIBCGROUP_SOURCE definition, since there's no longer an uploaded bz2 archive. Signed-off-by: Oleg Lyovin Signed-off-by: Arnout Vandecappelle --- package/libcgroup/libcgroup.hash | 4 ++-- package/libcgroup/libcgroup.mk | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/libcgroup/libcgroup.hash b/package/libcgroup/libcgroup.hash index 70671212ef24..65b98d94e2e5 100644 --- a/package/libcgroup/libcgroup.hash +++ b/package/libcgroup/libcgroup.hash @@ -1,5 +1,5 @@ -# From https://github.com/libcgroup/libcgroup/releases/download/v0.42.2/libcgroup-0.42.2.tar.bz2.sha256 -sha256 18939381324d418e11be4f5fdca37b01652c18917bfaf1f6b0c505f157e18d07 libcgroup-0.42.2.tar.bz2 +# From https://github.com/libcgroup/libcgroup/releases/download/v2.0.3/libcgroup-2.0.3.tar.gz.sha256 +sha256 b29b5704de3d0fadf199fe4e17eeeaecba7f0dd1b85569c96eec37c7672e3026 libcgroup-2.0.3.tar.gz # Hash for license file sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk index 156b066162b1..fb0b646c5160 100644 --- a/package/libcgroup/libcgroup.mk +++ b/package/libcgroup/libcgroup.mk @@ -4,8 +4,7 @@ # ################################################################################ -LIBCGROUP_VERSION = 0.42.2 -LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2 +LIBCGROUP_VERSION = 2.0.3 LIBCGROUP_SITE = https://github.com/libcgroup/libcgroup/releases/download/v$(LIBCGROUP_VERSION) LIBCGROUP_LICENSE = LGPL-2.1 LIBCGROUP_LICENSE_FILES = COPYING From 0eb4ac98a3a29201ebc80c4356b4519639344e2a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 17:21:19 +0200 Subject: [PATCH 0776/2890] package/ell: bump version to 0.57 Changelog: https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index c0f1731676b3..dd4722480c2a 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63 ell-0.56.tar.xz +sha256 7603928ee584b758ca27c67e4dc513049a09b038d7d28459a9440f8443c91018 ell-0.57.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 994b0e19f014..08deb62abe56 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.56 +ELL_VERSION = 0.57 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From 4d6fe4ae3e3ad0f5a0c9289f1e4c78070c05ef56 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 17:21:20 +0200 Subject: [PATCH 0777/2890] package/iwd: bump version to 2.6 Changelog: https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Depends on ell >= 0.57: https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/configure.ac?id=464f5c25db8150dc8cea21042a5bac09a8880edc Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 1647f93d9ef7..4eea644842c6 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64 iwd-2.3.tar.xz +sha256 f7ac93aeef672604f5b5194ca038035ae222925be392c4345873c9742f477797 iwd-2.6.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index c54031b1021e..f20427114b56 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.3 +IWD_VERSION = 2.6 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From 39fef045414b5dde70401d197033eb8cf15e3099 Mon Sep 17 00:00:00 2001 From: "Kai Stuhlemmer (ebee Engineering)" Date: Thu, 22 Jun 2023 08:38:53 +0200 Subject: [PATCH 0778/2890] package/open-plc-utils: bump to version 1ba7d5a042e4e8ff6858b08e113eec5dc4e89cf2 Other changes: - Remove 0002-plc-plc.h-fix-build-with-gcc-10.patch as related MR https://github.com/qca/open-plc-utils/pull/141 has been merged. Notable changes since last version: - Drop privileges after opening the channel file descriptor - Remove all checks for root permissions - Add chip identification for QCA7006AQ Signed-off-by: Kai Stuhlemmer (ebee Engineering) Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - ...0002-plc-plc.h-fix-build-with-gcc-10.patch | 37 ------------------- package/open-plc-utils/open-plc-utils.hash | 2 +- package/open-plc-utils/open-plc-utils.mk | 2 +- 4 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch diff --git a/.checkpackageignore b/.checkpackageignore index 4a40bc7fcc17..d0378929ee3b 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1115,7 +1115,6 @@ package/olsr/S50olsr Indent Shellcheck Variables package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch Upstream package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch Upstream package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch Upstream -package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch Upstream package/open2300/0001-fix-makefile.patch Upstream package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream package/openldap/0001-fix_cross_strip.patch Upstream diff --git a/package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch b/package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch deleted file mode 100644 index 063bfc536cf8..000000000000 --- a/package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 27222be0b8db59cae30a5fcca93255daea147bb6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 23 Sep 2020 19:05:23 +0200 -Subject: [PATCH] plc/plc.h: fix build with gcc 10 - -Drop plcproperty from plc/plc.h to avoid the following build failure -with gcc 10 (which defaults to -fno-common): - -/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: rules.o:(.bss+0x0): multiple definition of `plcproperty'; pibruin.o:(.bss+0x0): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/6b3064b64dea3d4aaf219f787429c25918101483 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/qca/open-plc-utils/pull/141] ---- - plc/plc.h | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/plc/plc.h b/plc/plc.h -index 1fa32b53..208cf91a 100644 ---- a/plc/plc.h -+++ b/plc/plc.h -@@ -496,9 +496,7 @@ struct __packed plcproperty - uint8_t DATA_FORMAT; - uint32_t DATA_LENGTH; - uint8_t DATA_BUFFER [128]; --} -- --plcproperty; -+}; - - #ifndef __GNUC__ - #pragma pack (pop) --- -2.28.0 - diff --git a/package/open-plc-utils/open-plc-utils.hash b/package/open-plc-utils/open-plc-utils.hash index 1788b42fc0e9..0ab661231a44 100644 --- a/package/open-plc-utils/open-plc-utils.hash +++ b/package/open-plc-utils/open-plc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b0156567a71c608cc1a0b18bbb1c5a97dd0ad9180097435f7e99119712bb299b open-plc-utils-32408520fcebe785983a68e39ec83830a3005779.tar.gz +sha256 4b1b55896939f178321ffe1ec2dc6937ea688d577b3671a5f0edb5c3326dfa3d open-plc-utils-1ba7d5a042e4e8ff6858b08e113eec5dc4e89cf2.tar.gz sha256 3137c632bbcec5e88b72dc13f4fe06ee184eea364fec8f7494bdfa57672ef921 LICENSE diff --git a/package/open-plc-utils/open-plc-utils.mk b/package/open-plc-utils/open-plc-utils.mk index d2ac39aca47f..086552e09b24 100644 --- a/package/open-plc-utils/open-plc-utils.mk +++ b/package/open-plc-utils/open-plc-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN_PLC_UTILS_VERSION = 32408520fcebe785983a68e39ec83830a3005779 +OPEN_PLC_UTILS_VERSION = 1ba7d5a042e4e8ff6858b08e113eec5dc4e89cf2 OPEN_PLC_UTILS_SITE = $(call github,qca,open-plc-utils,$(OPEN_PLC_UTILS_VERSION)) OPEN_PLC_UTILS_LICENSE = BSD-3-Clause OPEN_PLC_UTILS_LICENSE_FILES = LICENSE From 592b66b30a13813b09ec2672bc8ba7b941a9f2f3 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 22 Jun 2023 08:14:41 +0200 Subject: [PATCH 0779/2890] package/python-pytest: bump to version 7.3.2 Signed-off-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- package/python-pytest/python-pytest.hash | 4 ++-- package/python-pytest/python-pytest.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytest/python-pytest.hash b/package/python-pytest/python-pytest.hash index 2ae1e61ed404..c648a85c04ef 100644 --- a/package/python-pytest/python-pytest.hash +++ b/package/python-pytest/python-pytest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest/json -md5 49decbade40109f9c6970df60c22a230 pytest-7.2.0.tar.gz -sha256 c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59 pytest-7.2.0.tar.gz +md5 67e2aa27bb98e5af13b45a1b2e67b144 pytest-7.3.2.tar.gz +sha256 ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b pytest-7.3.2.tar.gz # Locally computer sha256 sha256 ca836a5f9ecca3b2f350230faa20a48fb8b145653b5568d784862df864706b9b LICENSE diff --git a/package/python-pytest/python-pytest.mk b/package/python-pytest/python-pytest.mk index 1794582dd3e6..27277163d238 100644 --- a/package/python-pytest/python-pytest.mk +++ b/package/python-pytest/python-pytest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_VERSION = 7.2.0 +PYTHON_PYTEST_VERSION = 7.3.2 PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/0b/21/055f39bf8861580b43f845f9e8270c7786fe629b2f8562ff09007132e2e7 +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/58/2a/07c65fdc40846ecb8a9dcda2c38fcb5a06a3e39d08d4a4960916431951cb PYTHON_PYTEST_SETUP_TYPE = setuptools PYTHON_PYTEST_LICENSE = MIT PYTHON_PYTEST_LICENSE_FILES = LICENSE From 9ab02a6ba7d1fe439ba8c7d9f55a77a0b895f588 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 22 Jun 2023 08:15:10 +0200 Subject: [PATCH 0780/2890] package/python-pytest-asyncio: bump to version 0.21.0 Signed-off-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- package/python-pytest-asyncio/python-pytest-asyncio.hash | 4 ++-- package/python-pytest-asyncio/python-pytest-asyncio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash index 051670aa5128..6198a4660852 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.hash +++ b/package/python-pytest-asyncio/python-pytest-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json -md5 dce438c7b0081d7f580b5a79d7105570 pytest-asyncio-0.20.3.tar.gz -sha256 83cbf01169ce3e8eb71c6c278ccb0574d1a7a3bb8eaaf5e50e0ad342afb33b36 pytest-asyncio-0.20.3.tar.gz +md5 805da62a533c75a9bccadee485f98c27 pytest-asyncio-0.21.0.tar.gz +sha256 2b38a496aef56f56b0e87557ec313e11e1ab9276fc3863f6a7be0f1d0e415e1b pytest-asyncio-0.21.0.tar.gz # Locally computed sha256 checksums sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk index c94c9ea8765c..6bf7e3357732 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.mk +++ b/package/python-pytest-asyncio/python-pytest-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_ASYNCIO_VERSION = 0.20.3 +PYTHON_PYTEST_ASYNCIO_VERSION = 0.21.0 PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/6e/06/38b0ca5d53582bb49697626975b5540435ea064762d852b5c66646c729e9 +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/85/c7/9db0c6215f12f26b590c24acc96d048e03989315f198454540dff95109cd PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE From 2c1877960173ff14dbf6ba56f4707ffa9dfca77e Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 22 Jun 2023 07:27:03 +0200 Subject: [PATCH 0781/2890] package/python-typing-extensions: bump to version 4.6.3 License file was synced with CPython project (see [1]). [1] https://github.com/python/typing_extensions/commit/bb75d261196aa6f520d1b80b373891c860ebb71b Signed-off-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- .../python-typing-extensions/python-typing-extensions.hash | 6 +++--- .../python-typing-extensions/python-typing-extensions.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-typing-extensions/python-typing-extensions.hash b/package/python-typing-extensions/python-typing-extensions.hash index 249bb63a42b2..f9d1de5e287b 100644 --- a/package/python-typing-extensions/python-typing-extensions.hash +++ b/package/python-typing-extensions/python-typing-extensions.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/typing_extensions/json -md5 5cfcb56ea6fc4972c3600c0030f4d136 typing_extensions-4.4.0.tar.gz -sha256 1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa typing_extensions-4.4.0.tar.gz +md5 111a7d37292a241811502bd1b64032be typing_extensions-4.6.3.tar.gz +sha256 d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5 typing_extensions-4.6.3.tar.gz # Locally computed sha256 checksums -sha256 c7afb65e755707b9fb90487389a176d3ed3d0031d5131afde45c23715ff5e891 LICENSE +sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python-typing-extensions/python-typing-extensions.mk b/package/python-typing-extensions/python-typing-extensions.mk index fd7d0bd93af3..2c0784615451 100644 --- a/package/python-typing-extensions/python-typing-extensions.mk +++ b/package/python-typing-extensions/python-typing-extensions.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPING_EXTENSIONS_VERSION = 4.4.0 +PYTHON_TYPING_EXTENSIONS_VERSION = 4.6.3 PYTHON_TYPING_EXTENSIONS_SOURCE = typing_extensions-$(PYTHON_TYPING_EXTENSIONS_VERSION).tar.gz -PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/e3/a7/8f4e456ef0adac43f452efc2d0e4b242ab831297f1bac60ac815d37eb9cf +PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/42/56/cfaa7a5281734dadc842f3a22e50447c675a1c5a5b9f6ad8a07b467bffe7 PYTHON_TYPING_EXTENSIONS_SETUP_TYPE = flit PYTHON_TYPING_EXTENSIONS_LICENSE = Python-2.0 PYTHON_TYPING_EXTENSIONS_LICENSE_FILES = LICENSE From b7347b438eb4782e34add5ffdf3b6786ff874820 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 22 Jun 2023 07:27:31 +0200 Subject: [PATCH 0782/2890] package/python-packaging: bump to version 23.1 Signed-off-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- package/python-packaging/python-packaging.hash | 4 ++-- package/python-packaging/python-packaging.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash index e10c11904b8a..0e339ea57363 100644 --- a/package/python-packaging/python-packaging.hash +++ b/package/python-packaging/python-packaging.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/packaging/json -md5 806414ea4c6f17b029a7911b622062e8 packaging-22.0.tar.gz -sha256 2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3 packaging-22.0.tar.gz +md5 f7d5c39c6f92cc2dfa1293ba8f6c097c packaging-23.1.tar.gz +sha256 a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f packaging-23.1.tar.gz # Locally computed sha256 checksums sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index c9190ccfee2b..aac4d76ee2c0 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 22.0 +PYTHON_PACKAGING_VERSION = 23.1 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/6b/f7/c240d7654ddd2d2f3f328d8468d4f1f876865f6b9038b146bec0a6737c65 +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/b9/6c/7c6658d258d7971c5eb0d9b69fa9265879ec9a9158031206d47800ae2213 PYTHON_PACKAGING_SETUP_TYPE = flit PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From 01aa39247c239f0dfdee13b0861e0a98bb1f2547 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 24 Jun 2023 16:00:30 -0600 Subject: [PATCH 0783/2890] package/pkg-python.mk: switch back to local setuptools distutils We overrode the default in 4386bbdf0895dbb35e02c25f42603bae9af64451 to work around target shebang bug, as this issue no longer appears to be present lets revert back to the local version as this is what will be use in the future when distutils is removed from the python stdlib. Tested with: $ support/testing/run-tests -d dl -o output_folder -k tests.package.test_ipython.TestIPythonPy3 15:43:26 TestIPythonPy3 Starting 15:43:27 TestIPythonPy3 Building 15:49:35 TestIPythonPy3 Building done Downloading to /home/buildroot/buildroot/dl/tmp_iyk_fn6 Renaming from /home/buildroot/buildroot/dl/tmp_iyk_fn6 to /home/buildroot/buildroot/dl/kernel-versatile-5.10.7 Downloading to /home/buildroot/buildroot/dl/tmpokk23l2z Renaming from /home/buildroot/buildroot/dl/tmpokk23l2z to /home/buildroot/buildroot/dl/versatile-pb-5.10.7.dtb 15:50:04 TestIPythonPy3 Cleaning up . ---------------------------------------------------------------------- Ran 1 test in 398.709s OK $ head -n 1 output_folder/TestIPythonPy3/target/usr/bin/ipython #!/usr/bin/python Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/pkg-python.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index c15a168f6075..fcb8fa0a99cd 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -55,8 +55,7 @@ HOST_PKG_PYTHON_ENV = \ # Target distutils-based packages PKG_PYTHON_DISTUTILS_ENV = \ $(PKG_PYTHON_ENV) \ - LDSHARED="$(TARGET_CROSS)gcc -shared" \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ + LDSHARED="$(TARGET_CROSS)gcc -shared" PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ --executable=/usr/bin/python @@ -75,16 +74,14 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ # Host distutils-based packages HOST_PKG_PYTHON_DISTUTILS_ENV = \ - $(HOST_PKG_PYTHON_ENV) \ - SETUPTOOLS_USE_DISTUTILS=stdlib + $(HOST_PKG_PYTHON_ENV) HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ - $(PKG_PYTHON_ENV) \ - SETUPTOOLS_USE_DISTUTILS=stdlib + $(PKG_PYTHON_ENV) PKG_PYTHON_SETUPTOOLS_CMD = \ $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') @@ -105,8 +102,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ - $(HOST_PKG_PYTHON_ENV) \ - SETUPTOOLS_USE_DISTUTILS=stdlib + $(HOST_PKG_PYTHON_ENV) HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) \ From e0ae89957ecdb262eb4928a8a86c218436f61406 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 24 Jun 2023 16:27:04 -0600 Subject: [PATCH 0784/2890] package/python-wheel: new host package This will be required for upcoming setuptools pep517 support. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-wheel/python-wheel.hash | 5 +++++ package/python-wheel/python-wheel.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-wheel/python-wheel.hash create mode 100644 package/python-wheel/python-wheel.mk diff --git a/package/python-wheel/python-wheel.hash b/package/python-wheel/python-wheel.hash new file mode 100644 index 000000000000..377a85c8fd5f --- /dev/null +++ b/package/python-wheel/python-wheel.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/wheel/json +md5 ec5004c46d1905da98bb5bc1a10ddd21 wheel-0.40.0.tar.gz +sha256 cd1196f3faee2b31968d626e1731c94f99cbdb67cf5a46e4f5656cbee7738873 wheel-0.40.0.tar.gz +# Locally computed sha256 checksums +sha256 30c23618679108f3e8ea1d2a658c7ca417bdfc891c98ef1a89fa4ff0c9828654 LICENSE.txt diff --git a/package/python-wheel/python-wheel.mk b/package/python-wheel/python-wheel.mk new file mode 100644 index 000000000000..159598fd1e23 --- /dev/null +++ b/package/python-wheel/python-wheel.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-wheel +# +################################################################################ + +PYTHON_WHEEL_VERSION = 0.40.0 +PYTHON_WHEEL_SOURCE = wheel-$(PYTHON_WHEEL_VERSION).tar.gz +PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/fc/ef/0335f7217dd1e8096a9e8383e1d472aa14717878ffe07c4772e68b6e8735 +PYTHON_WHEEL_SETUP_TYPE = flit +PYTHON_WHEEL_LICENSE = MIT +PYTHON_WHEEL_LICENSE_FILES = LICENSE.txt + +$(eval $(host-python-package)) From 15886f2761e358a884d6a70bc30889bc69742c5f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 24 Jun 2023 16:27:05 -0600 Subject: [PATCH 0785/2890] package/python-setuptools: migrate to pep517 build backend Now that all dependencies of host-python-setuptools no longer use setuptools as a build backend we can now migrate setuptools itself to the pep517 build backend. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/pkg-python.mk | 2 +- package/python-setuptools/python-setuptools.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index fcb8fa0a99cd..85374ae8bb8f 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -233,7 +233,7 @@ endif # ($(4),target) # interpreter (both host and target). # ifeq ($$($(2)_SETUP_TYPE),setuptools) -$(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +$(2)_DEPENDENCIES += host-python-setuptools else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) $(2)_DEPENDENCIES += host-python-pypa-build host-python-installer ifeq ($$($(2)_SETUP_TYPE),flit) diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 267494716245..d957930455c1 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -11,7 +11,8 @@ PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools -PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools +PYTHON_SETUPTOOLS_SETUP_TYPE = pep517 +HOST_PYTHON_SETUPTOOLS_DEPENDENCIES = host-python-wheel $(eval $(python-package)) $(eval $(host-python-package)) From db45cc593e66598b4d345dd348b0bfe2b388b557 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:05 +0200 Subject: [PATCH 0786/2890] package/x11r7/xdriver_xf86-video-dummy: bump version to 0.4.1 Release notes: https://lists.x.org/archives/xorg-announce/2023-May/003394.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- .../xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash | 6 +++--- .../xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash index eed28d3fde31..6d7d0b4bc207 100644 --- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash +++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003155.html -sha256 e78ceae5c8c0588c7cb658f2afc3a9fac9ef665b52a75b01f8e9c5449a4e1e5a xf86-video-dummy-0.4.0.tar.xz -sha512 1150a84c4f17215b9c579d8ce9399d547a01970bf7b5396653f14beb13a62deefe3008bf3ad6a2c5c0f46da4cbc0b840c18a7dff339e3b882d108183fa1d30d9 xf86-video-dummy-0.4.0.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-May/003394.html +sha256 351920a7fd0f759a3ac972a5999b3ffed46f07fb52a99f319bfb5b6a59d3dfaf xf86-video-dummy-0.4.1.tar.xz +sha512 ff7fd8b668e5e9f40a5d27f82599b7a455a8162fc1a247195335c17980f00ce10ae6b2c062239cbaa67d8684c86174f85b398dd7f7065d36f69294bd6f2469de xf86-video-dummy-0.4.1.tar.xz # Locally calculated sha256 e29aa81e74563d14e5633963107c030e74e8352ea7dafee1a9d7e19b7d0e887b COPYING diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk index e863b1e5062f..f7f05c7c4182 100644 --- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk +++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.4.0 +XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.4.1 XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.xz XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_DUMMY_LICENSE = MIT From 6f722cf6dbbf23850da7b10e1d94e156ff5419d7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:07 +0200 Subject: [PATCH 0787/2890] package/x11r7/xdriver_xf86-video-i128: bump version to 1.4.1 Release notes: https://lists.x.org/archives/xorg-announce/2023-May/003395.html Switched tarball to xz and _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- .../xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash | 8 +++----- .../xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash index 96bd42ac3654..c17d3086a15d 100644 --- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash +++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-December/002932.html -md5 a980f1b8532ccfe81932580bc4e0f2a0 xf86-video-i128-1.4.0.tar.bz2 -sha1 56d5b897b2695222c13e59d2ade74620a99e1011 xf86-video-i128-1.4.0.tar.bz2 -sha256 8f2c0a6bf5a169dad3fc07c6dd4537b492d0e44489e4a1297311e617c3bed0ea xf86-video-i128-1.4.0.tar.bz2 -sha512 d58baee3f20b3ad2ece6853da0ff20a6d54b984c6e3289bad2715cc003b277a0b44d20ded25cfc116400468df552390bdb5d80fbd3fb60861488ee5d027664b2 xf86-video-i128-1.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-May/003395.html +sha256 7064b513ffe33efa040577c4d355ce2c76ed218989ab38feb8972750d5acbc46 xf86-video-i128-1.4.1.tar.xz +sha512 ec6b4dd9092292b5aabff7cf477090fe62c89944d251689817ac8114a65672f85880b719a442f4c742d63dc2d6c61ec315e53da5b5c625074d1aa0b9ace8e865 xf86-video-i128-1.4.1.tar.xz # Locally computed sha256 7677424d79633dbf255a81bd4e05dd621931b89997af33c31522269ec2ed391e COPYING diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk index e44deaf62118..266678105c28 100644 --- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk +++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_I128_VERSION = 1.4.0 -XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_I128_VERSION = 1.4.1 +XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.xz +XDRIVER_XF86_VIDEO_I128_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_I128_LICENSE = MIT XDRIVER_XF86_VIDEO_I128_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xorgproto From f67fae131eecb789825480bf1d9a85c96e454d2c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:08 +0200 Subject: [PATCH 0788/2890] package/x11r7/xapp_setxkbmap: bump version to 1.3.4 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash | 6 +++--- package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash index a57d7cc7374a..a3ad6ce38c89 100644 --- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash +++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003146.html -sha256 b560c678da6930a0da267304fa3a41cc5df39a96a5e23d06f14984c87b6f587b setxkbmap-1.3.3.tar.xz -sha512 208f07a7f7bce47b573099d4cd8c941a3a4d74b456720bc3ca1cbba298381a2ab98c7500d6e6cd6d5dd61840b7c42cf6521da754ec395f266f8158102a55ad58 setxkbmap-1.3.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-May/003397.html +sha256 be8d8554d40e981d1b93b5ff82497c9ad2259f59f675b38f1b5e84624c07fade setxkbmap-1.3.4.tar.xz +sha512 f4d026e7707656173f54d79b95ff3370ae06eaf252b89b79bc7175edeaf3ef79073d4d7d8a35fdee95608bf85d7d23514d74f00e55b613810ef6c3ccc0cf498b setxkbmap-1.3.4.tar.xz # Locally computed sha256 afb8ce58340b6a6b85b73e256425263ce46f5a427279785e275991cb660cce82 COPYING diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk index 4d48a3fbc193..9049b3694417 100644 --- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk +++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_SETXKBMAP_VERSION = 1.3.3 +XAPP_SETXKBMAP_VERSION = 1.3.4 XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.xz XAPP_SETXKBMAP_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SETXKBMAP_LICENSE = MIT From 50da44aa0cede1466264011a94fdd80f5c345043 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:10 +0200 Subject: [PATCH 0789/2890] package/x11r7/xlib_xtrans: bump version to 1.5.0 Release notes: https://lists.x.org/archives/xorg-announce/2023-June/003399.html Updated license hash due to upstream commit which removed "All rights reserved" from Oracle copyright notices: https://gitlab.freedesktop.org/xorg/lib/libxtrans/-/commit/9d77996f9f972da63c06099fd8c0f0529159b98f Added XLIB_XTRANS_INSTALL_TARGET = NO, quoting release notes: "xtrans is a library of code that is shared among various X packages to handle network protocol transport in a modular fashion, allowing a single place to add new transport types - but it is *not* a shared library, more like a "header-only" library." Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/x11r7/xlib_xtrans/xlib_xtrans.hash | 10 ++++------ package/x11r7/xlib_xtrans/xlib_xtrans.mk | 7 ++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.hash b/package/x11r7/xlib_xtrans/xlib_xtrans.hash index 1bab37244eb4..9595a73d0e8c 100644 --- a/package/x11r7/xlib_xtrans/xlib_xtrans.hash +++ b/package/x11r7/xlib_xtrans/xlib_xtrans.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002980.html -md5 ce2fb8100c6647ee81451ebe388b17ad xtrans-1.4.0.tar.bz2 -sha1 7c490026efb450798e02b040c05eba5212291c08 xtrans-1.4.0.tar.bz2 -sha256 377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773 xtrans-1.4.0.tar.bz2 -sha512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214 xtrans-1.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-June/003399.html +sha256 1ba4b703696bfddbf40bacf25bce4e3efb2a0088878f017a50e9884b0c8fb1bd xtrans-1.5.0.tar.xz +sha512 e8091f11d4ad2b14e01de3eac56bdf2267ea26687ce66e3056374d0d02e049480c0b27c482f8828a0efd086f1e4c485108ca4dce3f83d66c1896effa3b38b228 xtrans-1.5.0.tar.xz # Locally computed -sha256 a9c96c832e00774266b492d4d41556f12a64f039ba3ef645c4b8c6010fcb8f2a COPYING +sha256 22616bf00b6db85ee3164775a95206894af987b85ff1a7703de55644bc722a39 COPYING diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk index 88c9b57a52db..001705bb2ebd 100644 --- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk +++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk @@ -4,12 +4,13 @@ # ################################################################################ -XLIB_XTRANS_VERSION = 1.4.0 -XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2 -XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_XTRANS_VERSION = 1.5.0 +XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.xz +XLIB_XTRANS_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_XTRANS_LICENSE = MIT XLIB_XTRANS_LICENSE_FILES = COPYING XLIB_XTRANS_INSTALL_STAGING = YES +XLIB_XTRANS_INSTALL_TARGET = NO $(eval $(autotools-package)) $(eval $(host-autotools-package)) From f4319f892b7a7559a4e2eef733eb1673ed8a7108 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:11 +0200 Subject: [PATCH 0790/2890] package/x11r7/xapp_xwd: bump version to 1.0.9 Release notes: https://lists.x.org/archives/xorg-announce/2023-June/003400.html Switched tarball to xz. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/x11r7/xapp_xwd/xapp_xwd.hash | 6 +++--- package/x11r7/xapp_xwd/xapp_xwd.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xwd/xapp_xwd.hash b/package/x11r7/xapp_xwd/xapp_xwd.hash index 75952864991e..cc81b05ce59f 100644 --- a/package/x11r7/xapp_xwd/xapp_xwd.hash +++ b/package/x11r7/xapp_xwd/xapp_xwd.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-August/003102.html -sha256 fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b xwd-1.0.8.tar.bz2 -sha512 d2aaf42c60d20c4b09f4947d3702058dbfad4633b2c5c8ea62e8897fc9ced1ab3417ce99255a223286d21a731f543019470737e3074f1bc68033b4eb47bc773e xwd-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-June/003400.html +sha256 dc121b84947eb4a3d1131bff1e9844cfa2124d95b47b35f9932340fa931fbd3f xwd-1.0.9.tar.xz +sha512 ae59661b05160f5658920fd79031b6b8548cb7bbfc734194edb0acef5c95f76b210ca4443e9506fc1a0cb9df47ee7c22948502971afe578b44c75aa2a1138d56 xwd-1.0.9.tar.xz # Locally computed sha256 7cfda56afd92a1ecd2f23bd0064e01b5141053390d854785504adfe2c0fbd946 COPYING diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk index 1c5bd50166cd..8960aaffdb85 100644 --- a/package/x11r7/xapp_xwd/xapp_xwd.mk +++ b/package/x11r7/xapp_xwd/xapp_xwd.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XWD_VERSION = 1.0.8 -XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2 +XAPP_XWD_VERSION = 1.0.9 +XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.xz XAPP_XWD_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XWD_LICENSE = MIT XAPP_XWD_LICENSE_FILES = COPYING From 247f17f9af35037c766b0f34deebcf01646d2b22 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:12 +0200 Subject: [PATCH 0791/2890] package/x11r7/xapp_xrdb: bump version to 1.2.2 Release notes: https://lists.x.org/archives/xorg-announce/2023-June/003401html Switched tarball to xz. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/x11r7/xapp_xrdb/xapp_xrdb.hash | 6 +++--- package/x11r7/xapp_xrdb/xapp_xrdb.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.hash b/package/x11r7/xapp_xrdb/xapp_xrdb.hash index 606fd2606031..d8b56bf2c8bb 100644 --- a/package/x11r7/xapp_xrdb/xapp_xrdb.hash +++ b/package/x11r7/xapp_xrdb/xapp_xrdb.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-August/003107.html -sha256 4f5d031c214ffb88a42ae7528492abde1178f5146351ceb3c05f3b8d5abee8b4 xrdb-1.2.1.tar.bz2 -sha512 d88135cdfea8536523dfb986249ee42761d5363c936352f12f55b4d0c849f21236f7d74d39869c5ec5b549019d6ed89d9096cde4b3c2b4816c2778a8e370b5c9 xrdb-1.2.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-June/003401.html +sha256 31f5fcab231b38f255b00b066cf7ea3b496df712c9eb2d0d50c670b63e5033f4 xrdb-1.2.2.tar.xz +sha512 c8a6fc94e270e9cb5602e055150553de103d545298285157ecd8924f163a10ebeb9acfff56d1fafbf48d339809c76340213792478cdf3270012d3cd05486001c xrdb-1.2.2.tar.xz # Locally computed sha256 ca1b3e2f9f37c35876b69a9c1c5a7860fae59b7ba87a1d2dc541b722e29b1ecc COPYING diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk index 4f9860d25ae3..769c5a06f493 100644 --- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk +++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XRDB_VERSION = 1.2.1 -XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2 +XAPP_XRDB_VERSION = 1.2.2 +XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.xz XAPP_XRDB_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XRDB_LICENSE = MIT XAPP_XRDB_LICENSE_FILES = COPYING From ecffe389a27c35cd2044f9dfea1b4d3ef20aeacf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:13 +0200 Subject: [PATCH 0792/2890] package/x11r7/xlib_libdmx: bump version to 1.1.5 Release notes: https://lists.x.org/archives/xorg-announce/2023-June/003403.html Switched tarball to xz and _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/x11r7/xlib_libdmx/xlib_libdmx.hash | 8 +++----- package/x11r7/xlib_libdmx/xlib_libdmx.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.hash b/package/x11r7/xlib_libdmx/xlib_libdmx.hash index e9d8616ba454..8a4b13099ef7 100644 --- a/package/x11r7/xlib_libdmx/xlib_libdmx.hash +++ b/package/x11r7/xlib_libdmx/xlib_libdmx.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-May/002894.html -md5 d2f1f0ec68ac3932dd7f1d9aa0a7a11c libdmx-1.1.4.tar.bz2 -sha1 499e2540ca0e94ca858037865243c3c60908fd94 libdmx-1.1.4.tar.bz2 -sha256 253f90005d134fa7a209fbcbc5a3024335367c930adf0f3203e754cf32747243 libdmx-1.1.4.tar.bz2 -sha512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9 libdmx-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-June/003403.html +sha256 35a4e26a8b0b2b4fe36441dca463645c3fa52d282ac3520501a38ea942cbf74f libdmx-1.1.5.tar.xz +sha512 55df45a06bddbf19e0253362853e2f979d736ba1f1fdec5d392c0f6c0dc72684e7b8df0f0a99ac96ce9d9d59bc6c25146086b18c054b4dbe6be9aa3166f23464 libdmx-1.1.5.tar.xz # Locally computed sha256 819e8dcd3dd2a44850c350331aa492230f86bccb0983dd739dec5ba36d7d2b8e COPYING diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk index 429595b5d724..9aaf81eb6f6d 100644 --- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk +++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBDMX_VERSION = 1.1.4 -XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2 -XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBDMX_VERSION = 1.1.5 +XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.xz +XLIB_LIBDMX_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBDMX_LICENSE = MIT XLIB_LIBDMX_LICENSE_FILES = COPYING XLIB_LIBDMX_CPE_ID_VENDOR = x From 5859cbd2ecef422883621790df3dee97d4486b10 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:14 +0200 Subject: [PATCH 0793/2890] package/x11r7/xorgproto: bump version to 2023.1 Release notes: https://lists.x.org/archives/xorg-announce/2023-June/003404.html Updated license hash due to upstream commit which removed "All rights reserved" from Oracle copyright notices: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/commit/423098656f145afeb72cbf21aaa0b3a3f9bc36bb Added license file COPYING-xwaylandproto: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/commit/ad6412624ef6dc4d7548fe16c254c4166ffa7198 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/x11r7/xorgproto/xorgproto.hash | 17 +++++++++-------- package/x11r7/xorgproto/xorgproto.mk | 5 +++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash index cc52013e118b..10655f9dd1b0 100644 --- a/package/x11r7/xorgproto/xorgproto.hash +++ b/package/x11r7/xorgproto/xorgproto.hash @@ -1,17 +1,17 @@ -# From https://lists.x.org/archives/xorg-announce/2022-August/003197.html -sha256 5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e xorgproto-2022.2.tar.xz -sha512 8e6108110600d076a94cc6d0e465b2e9adfbbe8d7e6b75fae9c5262d99dc6074ab1ed561a74d6d451f00f5b7af9f507a6317be9c0770efeed9e60b64beb7a1c9 xorgproto-2022.2.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-June/003404.html +sha256 6545e41aceba43c13497ac8084dad5db6deef580a5ea7d0bd7872cfd1be72a13 xorgproto-2023.1.tar.xz +sha512 342128ca2e9a6806a7ff33f426434bee29626a13a592b9544654a010cb7be208b0862e3cd063773a0003ca0ec7d48361cfcc384fe207efe9ecb6ec3f2b8e7d56 xorgproto-2023.1.tar.xz # Locally computed sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto sha256 dabc025f93129a0eb2d17f37c719dbe5ecbcb5bc8f7bc7f4ce89fe04576cc0c2 COPYING-bigreqsproto -sha256 ab587ca94282c1e60797ffe4a77aea195418387db20ec7e0c24cedf2c844f8c1 COPYING-compositeproto +sha256 3e980a770506b448897638632974bbcbdf2da3b99191dd0a03d3770097a46738 COPYING-compositeproto sha256 f67a18cb46c4c203c5122b4a901cfcc3178b2a62f83f31ca5fef5bdca3966094 COPYING-damageproto sha256 819e8dcd3dd2a44850c350331aa492230f86bccb0983dd739dec5ba36d7d2b8e COPYING-dmxproto sha256 0c306691492c4d7a8cda1ec3847668b797887dddcd7e986b4c166ae27619af7d COPYING-dri2proto sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-dri3proto -sha256 0aa43d03da3cedbd9882c0ded621b0d855353eb9e551f9eed940d75c8a0b03c1 COPYING-evieproto -sha256 65cb0b867b00fb27f066a37353713b265645b3301146562570d7638ed2ddd548 COPYING-fixesproto +sha256 9936421f7516f7a17ae560b6989636b493e55c01128b543c7e72441568c3cba4 COPYING-evieproto +sha256 fb361c7c4322e4919ae193c5a20055d5190c23aa50480fd0a41f4d439cae2bc6 COPYING-fixesproto sha256 1ab381e978bff63d68be2e4f235d51935f3f16f3ba3bebf83afa99a70c0484a2 COPYING-fontcacheproto sha256 f4af05774b02ae149357cc26f7bf5ef1116c2e09373c2492081a3a1892c58417 COPYING-fontsproto sha256 823deb4673d3f26aa8c90e704888299648f00be3262f9363eaeecedcd65b936d COPYING-glproto @@ -20,7 +20,7 @@ sha256 d397a67d4b28e897bc5fce79b2b917df9905b54f961fc3ad1f49c7fe3803f92c COPYIN sha256 7a5dd5d4c989c167da50f15879959f42bbda960e06d0a0aea7197f61fe1dc846 COPYING-lg3dproto sha256 8442b5f22f2fb13017a4302a906e7dedc899267b41f613558970941120170128 COPYING-pmproto sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-presentproto -sha256 6b890b118261694865988378dbba876bcd9caa1a421c5c0d626116948bc0ae35 COPYING-printproto +sha256 46f599055002bbf3e6ce244bde8d9ebe5ec24ae7906836db186773a9791d0b75 COPYING-printproto sha256 41c13dcd09147ed2440286f2fb8151df8ebee06deee4ed78ddf094601c216d3d COPYING-randrproto sha256 ee10aee0f1697ffdbe870a39f037361d4f7136f2976bb7919a41b3f66407caee COPYING-recordproto sha256 9e48921a94da36d7a69fe71809223ee0bb46370db9842dccdeeb55b5a9946872 COPYING-renderproto @@ -29,7 +29,7 @@ sha256 fcbd3c628bf4d28ee3e6032054bf44bbe58f3b1a944dad856a8d3eb6b37ea412 COPYIN sha256 d6d3513f5a7099748dc387f54498d799380b45f8a444f13aa98aa45a860ae55b COPYING-trapproto sha256 f8f49bbad61967ebc890fb79fff5bfb7cfc1c341aa8f8dee13eb3fb534040b47 COPYING-videoproto sha256 eb183a00c61bb47992f096b6993ed7ec17518bea9c285fe87efff7f622cc6c12 COPYING-windowswmproto -sha256 3bd8e0c41497bfe6ab8d11c3c90c5e79edd0b2437f2bf81161575f54bae53f21 COPYING-x11proto +sha256 da835951edc6e3b8d168d6afe7447c65d0b9a99937293cf3f288bba8244a9f86 COPYING-x11proto sha256 5531d18cfcc944dab39991f63f182cbbce3fe493ba0c7cf08a25c0d01ee84482 COPYING-xcmiscproto sha256 fb42146c6c06a200a9b121220eb692ff9101ba0fbd0b224b9e16a016c59ae86a COPYING-xextproto sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86bigfontproto @@ -39,3 +39,4 @@ sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYIN sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86rushproto sha256 942bb46a3503a708948491699171b00b9e0dfb47818d9268b160bccc5f51a4b9 COPYING-xf86vidmodeproto sha256 b2d8cda803e900915ce10f0ba735ff2c033b39c7cc5a8a436667ca583d4066fa COPYING-xineramaproto +sha256 309bd89bc2b30c6e3d3eb78f5377fa576475499e0ba936a9c3cba50ba5d6375c COPYING-xwaylandproto diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk index c707bdafc0e7..899f505f1c26 100644 --- a/package/x11r7/xorgproto/xorgproto.mk +++ b/package/x11r7/xorgproto/xorgproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XORGPROTO_VERSION = 2022.2 +XORGPROTO_VERSION = 2023.1 XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.xz XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT @@ -44,7 +44,8 @@ XORGPROTO_LICENSE_FILES = \ COPYING-xf86miscproto \ COPYING-xf86rushproto \ COPYING-xf86vidmodeproto \ - COPYING-xineramaproto + COPYING-xineramaproto \ + COPYING-xwaylandproto XORGPROTO_INSTALL_STAGING = YES XORGPROTO_INSTALL_TARGET = NO # xproxymngproto is needed by xfindproxy From eb19d01510d285b06c7092dec4cf5383012ce0e1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:15 +0200 Subject: [PATCH 0794/2890] package/x11r7/xfont_font-*: mass version bump Release notes were posted in February 2023: https://lists.x.org/archives/xorg-announce/2023-February/date.html Switched tarball to xz and _SITE to https. Updated license hash of xfont_font-sun-misc due to upstream commit which removed "All rights reserved" from Oracle copyright notices: https://gitlab.freedesktop.org/xorg/font/sun-misc/-/commits/master/COPYING Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- .../xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash | 2 +- .../xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk | 6 +++--- .../xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash | 2 +- .../x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk | 6 +++--- .../xfont_font-adobe-utopia-100dpi.hash | 2 +- .../xfont_font-adobe-utopia-100dpi.mk | 6 +++--- .../xfont_font-adobe-utopia-type1.hash | 2 +- .../xfont_font-adobe-utopia-type1.mk | 6 +++--- package/x11r7/xfont_font-alias/xfont_font-alias.hash | 4 +--- package/x11r7/xfont_font-alias/xfont_font-alias.mk | 6 +++--- .../xfont_font-arabic-misc/xfont_font-arabic-misc.hash | 2 +- .../x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk | 6 +++--- .../x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash | 2 +- package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk | 6 +++--- package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash | 2 +- package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk | 6 +++--- .../xfont_font-bh-lucidatypewriter-100dpi.hash | 2 +- .../xfont_font-bh-lucidatypewriter-100dpi.mk | 6 +++--- .../xfont_font-bh-lucidatypewriter-75dpi.hash | 2 +- .../xfont_font-bh-lucidatypewriter-75dpi.mk | 6 +++--- package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash | 3 +-- package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk | 6 +++--- package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash | 2 +- package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk | 6 +++--- .../xfont_font-bitstream-100dpi.hash | 2 +- .../xfont_font-bitstream-100dpi.mk | 6 +++--- .../xfont_font-bitstream-75dpi.hash | 2 +- .../xfont_font-bitstream-75dpi.mk | 6 +++--- .../xfont_font-bitstream-type1.hash | 2 +- .../xfont_font-bitstream-type1.mk | 6 +++--- .../xfont_font-cronyx-cyrillic.hash | 2 +- .../xfont_font-cronyx-cyrillic.mk | 6 +++--- .../xfont_font-cursor-misc/xfont_font-cursor-misc.hash | 2 +- .../x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk | 6 +++--- .../xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash | 3 ++- .../x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk | 6 +++--- package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash | 2 +- package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk | 6 +++--- .../x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash | 2 +- package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk | 6 +++--- .../x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash | 2 +- package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk | 6 +++--- package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash | 3 ++- package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk | 6 +++--- .../x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash | 2 +- .../x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk | 6 +++--- .../xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash | 2 +- .../xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk | 6 +++--- .../xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash | 4 +--- .../xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk | 6 +++--- .../xfont_font-misc-meltho/xfont_font-misc-meltho.hash | 2 +- .../x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk | 6 +++--- .../x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash | 2 +- package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk | 6 +++--- .../x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash | 2 +- package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk | 6 +++--- .../xfont_font-schumacher-misc.hash | 2 +- .../xfont_font-schumacher-misc.mk | 6 +++--- .../xfont_font-screen-cyrillic.hash | 3 +-- .../xfont_font-screen-cyrillic.mk | 6 +++--- .../x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash | 3 +-- package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk | 6 +++--- package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash | 5 ++--- package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk | 6 +++--- .../xfont_font-winitzki-cyrillic.hash | 3 +-- .../xfont_font-winitzki-cyrillic.mk | 6 +++--- .../xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash | 3 +-- .../xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk | 6 +++--- 68 files changed, 139 insertions(+), 147 deletions(-) diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash index 514c90915a2f..6c96f7dfea21 100644 --- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash +++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054 font-adobe-100dpi-1.0.3.tar.bz2 +sha256 b67aff445e056328d53f9732d39884f55dd8d303fc25af3dbba33a8ba35a9ccf font-adobe-100dpi-1.0.4.tar.xz sha256 bf6d862672b4fcc86f3f38bc138ad44e52d52207dd8689b8d3701630fc331194 COPYING diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk index 241876980834..498f39d14b72 100644 --- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_ADOBE_100DPI_VERSION = 1.0.3 -XFONT_FONT_ADOBE_100DPI_SOURCE = font-adobe-100dpi-$(XFONT_FONT_ADOBE_100DPI_VERSION).tar.bz2 -XFONT_FONT_ADOBE_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_ADOBE_100DPI_VERSION = 1.0.4 +XFONT_FONT_ADOBE_100DPI_SOURCE = font-adobe-100dpi-$(XFONT_FONT_ADOBE_100DPI_VERSION).tar.xz +XFONT_FONT_ADOBE_100DPI_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_ADOBE_100DPI_LICENSE = MIT XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash index 41ac96fc4fda..057cc0f1a4cd 100644 --- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash +++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 c6024a1e4a1e65f413f994dd08b734efd393ce0a502eb465deb77b9a36db4d09 font-adobe-75dpi-1.0.3.tar.bz2 +sha256 1281a62dbeded169e495cae1a5b487e1f336f2b4d971d92911c59c103999b911 font-adobe-75dpi-1.0.4.tar.xz sha256 bf6d862672b4fcc86f3f38bc138ad44e52d52207dd8689b8d3701630fc331194 COPYING diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk index 90e94d27cb97..a8480caf7141 100644 --- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_ADOBE_75DPI_VERSION = 1.0.3 -XFONT_FONT_ADOBE_75DPI_SOURCE = font-adobe-75dpi-$(XFONT_FONT_ADOBE_75DPI_VERSION).tar.bz2 -XFONT_FONT_ADOBE_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_ADOBE_75DPI_VERSION = 1.0.4 +XFONT_FONT_ADOBE_75DPI_SOURCE = font-adobe-75dpi-$(XFONT_FONT_ADOBE_75DPI_VERSION).tar.xz +XFONT_FONT_ADOBE_75DPI_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_ADOBE_75DPI_LICENSE = MIT XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash index 81498788be8b..87e7894f5cf7 100644 --- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash +++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5 font-adobe-utopia-100dpi-1.0.4.tar.bz2 +sha256 fb84ec297a906973548ca59b7c6daeaad21244bec5d3fb1e7c93df5ef43b024b font-adobe-utopia-100dpi-1.0.5.tar.xz sha256 234c2a8109afa8034c787dbf69696a9bdd374914aadf937d2a103831d95c1867 COPYING diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk index 83157f5c6738..8962db61cf9a 100644 --- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION = 1.0.4 -XFONT_FONT_ADOBE_UTOPIA_100DPI_SOURCE = font-adobe-utopia-100dpi-$(XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION).tar.bz2 -XFONT_FONT_ADOBE_UTOPIA_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION = 1.0.5 +XFONT_FONT_ADOBE_UTOPIA_100DPI_SOURCE = font-adobe-utopia-100dpi-$(XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION).tar.xz +XFONT_FONT_ADOBE_UTOPIA_100DPI_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE = Adobe License (no modification allowed) XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash index 514dd2829f04..0770018fde83 100644 --- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash +++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash @@ -1,3 +1,3 @@ # locally computed -sha256 979435105f897a70f8993fa02c8362160b0513366c2ab896965416f96dbb8077 font-adobe-utopia-type1-1.0.4.tar.bz2 +sha256 4cb280bc47693b07c5e00fd0e5ad5721aabebc0548c3f06774e5cc3cbcf75697 font-adobe-utopia-type1-1.0.5.tar.xz sha256 234c2a8109afa8034c787dbf69696a9bdd374914aadf937d2a103831d95c1867 COPYING diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk index 9ec8f800bdaf..b53b499b2870 100644 --- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk +++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION = 1.0.4 -XFONT_FONT_ADOBE_UTOPIA_TYPE1_SOURCE = font-adobe-utopia-type1-$(XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION).tar.bz2 -XFONT_FONT_ADOBE_UTOPIA_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION = 1.0.5 +XFONT_FONT_ADOBE_UTOPIA_TYPE1_SOURCE = font-adobe-utopia-type1-$(XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION).tar.xz +XFONT_FONT_ADOBE_UTOPIA_TYPE1_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE = Adobe License (no modification allowed) XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.hash b/package/x11r7/xfont_font-alias/xfont_font-alias.hash index 5390d1c12667..8b1ead9efb50 100644 --- a/package/x11r7/xfont_font-alias/xfont_font-alias.hash +++ b/package/x11r7/xfont_font-alias/xfont_font-alias.hash @@ -1,5 +1,3 @@ -# From https://lists.x.org/archives/xorg-announce/2020-August/003054.html -sha256 f3111ae8bf2e980f5f56af400e8eefe5fc9f4207f4a412ea79637fd66c945276 font-alias-1.0.4.tar.bz2 -sha512 c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d font-alias-1.0.4.tar.bz2 # locally computed +sha256 9f89e217bb73e0e3636a0a493fbf8b7c995156e0c53d9a0476d201b67c2d6b6e font-alias-1.0.5.tar.xz sha256 bdba5452fc080c0f1a56d66978ac4150d1d1a00a9cc0248bba4f0b76c80ad47e COPYING diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk index 7f8e4b2ea072..fcd270662181 100644 --- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk +++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_ALIAS_VERSION = 1.0.4 -XFONT_FONT_ALIAS_SOURCE = font-alias-$(XFONT_FONT_ALIAS_VERSION).tar.bz2 -XFONT_FONT_ALIAS_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_ALIAS_VERSION = 1.0.5 +XFONT_FONT_ALIAS_SOURCE = font-alias-$(XFONT_FONT_ALIAS_VERSION).tar.xz +XFONT_FONT_ALIAS_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_ALIAS_LICENSE = MIT XFONT_FONT_ALIAS_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash index 3c565450f43a..ae2503efcf16 100644 --- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash +++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash @@ -1,3 +1,3 @@ # locally computed -sha256 505d9b12a7093389e67a925dfda6346bde26d114c67f0cdca7aeda6e5d3344f4 font-arabic-misc-1.0.3.tar.bz2 +sha256 46ffe61b52c78a1d2dca70ff20a9f2d84d69744639cab9a085c7a7ee17663467 font-arabic-misc-1.0.4.tar.xz sha256 192b677a887c20f9671cc357cd5ea7bae586003d61c1f8f6e164e8f5530abf57 COPYING diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk index c867a60233e5..f8e95d8fcb2b 100644 --- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_ARABIC_MISC_VERSION = 1.0.3 -XFONT_FONT_ARABIC_MISC_SOURCE = font-arabic-misc-$(XFONT_FONT_ARABIC_MISC_VERSION).tar.bz2 -XFONT_FONT_ARABIC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_ARABIC_MISC_VERSION = 1.0.4 +XFONT_FONT_ARABIC_MISC_SOURCE = font-arabic-misc-$(XFONT_FONT_ARABIC_MISC_VERSION).tar.xz +XFONT_FONT_ARABIC_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_ARABIC_MISC_LICENSE = MIT XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash index 154d6eb2fd99..6aa66d0b3403 100644 --- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash +++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 23c07162708e4b79eb33095c8bfa62c783717a9431254bbf44863734ea239481 font-bh-100dpi-1.0.3.tar.bz2 +sha256 fd8f5efe8491faabdd2744808d3d4eafdae5c83e617017c7fddd2716d049ab1e font-bh-100dpi-1.0.4.tar.xz sha256 888fd79d2c7e6332559d661c62f7a50f92fc5842e6ff0e0bd4c59b0083dabce9 COPYING diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk index cc1573869273..89c5a0d802c5 100644 --- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_BH_100DPI_VERSION = 1.0.3 -XFONT_FONT_BH_100DPI_SOURCE = font-bh-100dpi-$(XFONT_FONT_BH_100DPI_VERSION).tar.bz2 -XFONT_FONT_BH_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_BH_100DPI_VERSION = 1.0.4 +XFONT_FONT_BH_100DPI_SOURCE = font-bh-100dpi-$(XFONT_FONT_BH_100DPI_VERSION).tar.xz +XFONT_FONT_BH_100DPI_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_BH_100DPI_LICENSE = Bigelow & Holmes License (no modification) XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash index 0648e26dd949..0336c1b23771 100644 --- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash +++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 3486aa51ac92c646a448fe899c5c3dae0024b1fef724d5100d52640d1cac721c font-bh-75dpi-1.0.3.tar.bz2 +sha256 6026d8c073563dd3cbb4878d0076eed970debabd21423b3b61dd90441b9e7cda font-bh-75dpi-1.0.4.tar.xz sha256 888fd79d2c7e6332559d661c62f7a50f92fc5842e6ff0e0bd4c59b0083dabce9 COPYING diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk index 788a76a2b96b..1bc03affab3a 100644 --- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_BH_75DPI_VERSION = 1.0.3 -XFONT_FONT_BH_75DPI_SOURCE = font-bh-75dpi-$(XFONT_FONT_BH_75DPI_VERSION).tar.bz2 -XFONT_FONT_BH_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_BH_75DPI_VERSION = 1.0.4 +XFONT_FONT_BH_75DPI_SOURCE = font-bh-75dpi-$(XFONT_FONT_BH_75DPI_VERSION).tar.xz +XFONT_FONT_BH_75DPI_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_BH_75DPI_LICENSE = Bigelow & Holmes License (no modification) XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash index 439d5d260259..2e21d28546ba 100644 --- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash +++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 62a83363c2536095fda49d260d21e0847675676e4e3415054064cbdffa641fbb font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 +sha256 76ec09eda4094a29d47b91cf59c3eba229c8f7d1ca6bae2abbb3f925e33de8f2 font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz sha256 9428a98add4fada4c98e031ae0f29d27f8b15a2c8c6e8830591a4c18ea26a6cd COPYING diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk index 2f055ddab994..bbbdd3d13c07 100644 --- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION = 1.0.3 -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE = font-bh-lucidatypewriter-100dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION).tar.bz2 -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION = 1.0.4 +XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE = font-bh-lucidatypewriter-100dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION).tar.xz +XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE = Bigelow & Holmes License (no modification) XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash index ed8d8514db07..17b1b3f428eb 100644 --- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash +++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 4ac16afbe205480cc5572e2977ea63488c543d05be0ea8e5a94c845a6eebcb31 font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 +sha256 864e2c39ac61f04f693fc2c8aaaed24b298c2cd40283cec12eee459c5635e8f5 font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz sha256 9428a98add4fada4c98e031ae0f29d27f8b15a2c8c6e8830591a4c18ea26a6cd COPYING diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk index 4166b2d74154..86789dae5aac 100644 --- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION = 1.0.3 -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE = font-bh-lucidatypewriter-75dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION).tar.bz2 -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION = 1.0.4 +XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE = font-bh-lucidatypewriter-75dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION).tar.xz +XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE = Bigelow & Holmes License (no modification) XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash index c9b01efc7adf..a0c5eea223bd 100644 --- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash +++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash @@ -1,4 +1,3 @@ -# From http://lists.x.org/archives/xorg-announce/2010-November/001537.html -sha1 f42ebd527096011040a312e0f9cdf78d64177419 font-bh-ttf-1.0.3.tar.bz2 # Locally computed +sha256 85a5f90d00c48c2b06fd125ea8adbc8b8ee97429e3075081c8710926efec3a56 font-bh-ttf-1.0.4.tar.xz sha256 27d47d50006773f1c0bd97661252ae27bb8cfd6951f253bd9d3ef81ed1243934 COPYING diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk index e3ed2a6f0851..3cc0dedaa65f 100644 --- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk +++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_BH_TTF_VERSION = 1.0.3 -XFONT_FONT_BH_TTF_SOURCE = font-bh-ttf-$(XFONT_FONT_BH_TTF_VERSION).tar.bz2 -XFONT_FONT_BH_TTF_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_BH_TTF_VERSION = 1.0.4 +XFONT_FONT_BH_TTF_SOURCE = font-bh-ttf-$(XFONT_FONT_BH_TTF_VERSION).tar.xz +XFONT_FONT_BH_TTF_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_BH_TTF_LICENSE = Bigelow & Holmes License (no modification) XFONT_FONT_BH_TTF_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash index cb0387d9e986..81a6a76dfb41 100644 --- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash +++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash @@ -1,3 +1,3 @@ # locally computed -sha256 761455a297486f3927a85d919b5c948d1d324181d4bea6c95d542504b68a63c1 font-bh-type1-1.0.3.tar.bz2 +sha256 19dec3ec06abde6bedd10094579e928be0f0fc3bdb4fbe93f4c69cce406d72a6 font-bh-type1-1.0.4.tar.xz sha256 27d47d50006773f1c0bd97661252ae27bb8cfd6951f253bd9d3ef81ed1243934 COPYING diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk index 244c91ffb917..c4fd2e69b9ca 100644 --- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk +++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_BH_TYPE1_VERSION = 1.0.3 -XFONT_FONT_BH_TYPE1_SOURCE = font-bh-type1-$(XFONT_FONT_BH_TYPE1_VERSION).tar.bz2 -XFONT_FONT_BH_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_BH_TYPE1_VERSION = 1.0.4 +XFONT_FONT_BH_TYPE1_SOURCE = font-bh-type1-$(XFONT_FONT_BH_TYPE1_VERSION).tar.xz +XFONT_FONT_BH_TYPE1_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_BH_TYPE1_LICENSE = Bigelow & Holmes License (no modification) XFONT_FONT_BH_TYPE1_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash index 1cef17d4cd77..9a97a16cd1ce 100644 --- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash +++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 ebe0d7444e3d7c8da7642055ac2206f0190ee060700d99cd876f8fc9964cb6ce font-bitstream-100dpi-1.0.3.tar.bz2 +sha256 2d1cc682efe4f7ebdf5fbd88961d8ca32b2729968728633dea20a1627690c1a7 font-bitstream-100dpi-1.0.4.tar.xz sha256 6faf32f092c2b92f3f99e0d63db9d802b11b4dd5aa0ce991f107a398d7f1ae80 COPYING diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk index 90d9e5bbb472..f756f2957171 100644 --- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_BITSTREAM_100DPI_VERSION = 1.0.3 -XFONT_FONT_BITSTREAM_100DPI_SOURCE = font-bitstream-100dpi-$(XFONT_FONT_BITSTREAM_100DPI_VERSION).tar.bz2 -XFONT_FONT_BITSTREAM_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_BITSTREAM_100DPI_VERSION = 1.0.4 +XFONT_FONT_BITSTREAM_100DPI_SOURCE = font-bitstream-100dpi-$(XFONT_FONT_BITSTREAM_100DPI_VERSION).tar.xz +XFONT_FONT_BITSTREAM_100DPI_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_BITSTREAM_100DPI_LICENSE = MIT XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash index 9973f1f456c5..03bcf66ca4db 100644 --- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash +++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 ba3f5e4610c07bd5859881660753ec6d75d179f26fc967aa776dbb3d5d5cf48e font-bitstream-75dpi-1.0.3.tar.bz2 +sha256 aaeb34d87424a9c2b0cf0e8590704c90cb5b42c6a3b6a0ef9e4676ef773bf826 font-bitstream-75dpi-1.0.4.tar.xz sha256 6faf32f092c2b92f3f99e0d63db9d802b11b4dd5aa0ce991f107a398d7f1ae80 COPYING diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk index deb99aa59689..9c74f0c4dceb 100644 --- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_BITSTREAM_75DPI_VERSION = 1.0.3 -XFONT_FONT_BITSTREAM_75DPI_SOURCE = font-bitstream-75dpi-$(XFONT_FONT_BITSTREAM_75DPI_VERSION).tar.bz2 -XFONT_FONT_BITSTREAM_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_BITSTREAM_75DPI_VERSION = 1.0.4 +XFONT_FONT_BITSTREAM_75DPI_SOURCE = font-bitstream-75dpi-$(XFONT_FONT_BITSTREAM_75DPI_VERSION).tar.xz +XFONT_FONT_BITSTREAM_75DPI_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_BITSTREAM_75DPI_LICENSE = MIT XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash index 81bb8fc7913b..9e9e158f80b5 100644 --- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash +++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash @@ -1,3 +1,3 @@ # locally computed -sha256 c6ea0569adad2c577f140328dc3302e729cb1b1ea90cd0025caf380625f8a688 font-bitstream-type1-1.0.3.tar.bz2 +sha256 de2f238b4cd72db4228a0ba67829d76a2b7c039e22993d66a722ee385248c628 font-bitstream-type1-1.0.4.tar.xz sha256 ecad5afdbd1308634896744a4c962361e9eca73e7d9969bb3aad94533c66d046 COPYING diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk index 640ce86324c2..880e49a102c6 100644 --- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk +++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_BITSTREAM_TYPE1_VERSION = 1.0.3 -XFONT_FONT_BITSTREAM_TYPE1_SOURCE = font-bitstream-type1-$(XFONT_FONT_BITSTREAM_TYPE1_VERSION).tar.bz2 -XFONT_FONT_BITSTREAM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_BITSTREAM_TYPE1_VERSION = 1.0.4 +XFONT_FONT_BITSTREAM_TYPE1_SOURCE = font-bitstream-type1-$(XFONT_FONT_BITSTREAM_TYPE1_VERSION).tar.xz +XFONT_FONT_BITSTREAM_TYPE1_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_BITSTREAM_TYPE1_LICENSE = MIT XFONT_FONT_BITSTREAM_TYPE1_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash index 893ba5718d81..480444e518ab 100644 --- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash +++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash @@ -1,3 +1,3 @@ # locally computed -sha256 6e8631936157677c77ba032b5c7b1fb3cb2ee872dbcea0444f12cd602cd9212a font-cronyx-cyrillic-1.0.3.tar.bz2 +sha256 dc0781ce0dcbffdbf6aae1a00173a13403f92b0de925bca5a9e117e4e2d6b789 font-cronyx-cyrillic-1.0.4.tar.xz sha256 857fa9f8d12bd7ce7fb235393d775dd5e0b5130fac7a88fdea9156d75b609402 COPYING diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk index caca639c2588..af7590842c87 100644 --- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_CRONYX_CYRILLIC_VERSION = 1.0.3 -XFONT_FONT_CRONYX_CYRILLIC_SOURCE = font-cronyx-cyrillic-$(XFONT_FONT_CRONYX_CYRILLIC_VERSION).tar.bz2 -XFONT_FONT_CRONYX_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_CRONYX_CYRILLIC_VERSION = 1.0.4 +XFONT_FONT_CRONYX_CYRILLIC_SOURCE = font-cronyx-cyrillic-$(XFONT_FONT_CRONYX_CYRILLIC_VERSION).tar.xz +XFONT_FONT_CRONYX_CYRILLIC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_CRONYX_CYRILLIC_LICENSE = MIT XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash index 04565f8b0f98..3fe94b526fc7 100644 --- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash +++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash @@ -1,3 +1,3 @@ # locally computed -sha256 17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635 font-cursor-misc-1.0.3.tar.bz2 +sha256 25d9c9595013cb8ca08420509993a6434c917e53ca1fec3f63acd45a19d4f982 font-cursor-misc-1.0.4.tar.xz sha256 c22415fb2144d7298e995dbeee2eb120822d653c61ae43c64fa0fda2cc3ca3a0 COPYING diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk index e752803086fa..38366a80897f 100644 --- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_CURSOR_MISC_VERSION = 1.0.3 -XFONT_FONT_CURSOR_MISC_SOURCE = font-cursor-misc-$(XFONT_FONT_CURSOR_MISC_VERSION).tar.bz2 -XFONT_FONT_CURSOR_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_CURSOR_MISC_VERSION = 1.0.4 +XFONT_FONT_CURSOR_MISC_SOURCE = font-cursor-misc-$(XFONT_FONT_CURSOR_MISC_VERSION).tar.xz +XFONT_FONT_CURSOR_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_CURSOR_MISC_LICENSE = unencumbered XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash index 1b4ebe9d9fcb..cebdbbba88b7 100644 --- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash +++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash @@ -1,2 +1,3 @@ # locally computed -sha256 bc65de70bee12698caa95b523d3b652c056347e17b68cc8b5d6bbdff235c4be8 font-daewoo-misc-1.0.3.tar.bz2 +sha256 f63c8b3dc8f30098cb868b7db2c2c0c8b5b3fd2cefd044035697a43d4c7a4f31 font-daewoo-misc-1.0.4.tar.xz +sha256 294f786aa8f0ad8f92979d153e18f5cf7cc95d872cace25338f9c95e7b348ed9 COPYING diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk index f5bd941383ce..57e151383b99 100644 --- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_DAEWOO_MISC_VERSION = 1.0.3 -XFONT_FONT_DAEWOO_MISC_SOURCE = font-daewoo-misc-$(XFONT_FONT_DAEWOO_MISC_VERSION).tar.bz2 -XFONT_FONT_DAEWOO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_DAEWOO_MISC_VERSION = 1.0.4 +XFONT_FONT_DAEWOO_MISC_SOURCE = font-daewoo-misc-$(XFONT_FONT_DAEWOO_MISC_VERSION).tar.xz +XFONT_FONT_DAEWOO_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash index 34873fe3b71d..2dea72b831eb 100644 --- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash +++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash @@ -1,3 +1,3 @@ # locally computed -sha256 e19ddf8b5f8de914d81675358fdfe37762e9ce524887cc983adef34f2850ff7b font-dec-misc-1.0.3.tar.bz2 +sha256 82d968201d8ff8bec0e51dccd781bb4d4ebf17e11004944279bdc0201e161af7 font-dec-misc-1.0.4.tar.xz sha256 bf4d44be4b5eb66c53bf5f7eb2d9d4817fb937788b37ed6ceda1876fdb964817 COPYING diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk index 1642b413524d..6f404ab2a0ed 100644 --- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_DEC_MISC_VERSION = 1.0.3 -XFONT_FONT_DEC_MISC_SOURCE = font-dec-misc-$(XFONT_FONT_DEC_MISC_VERSION).tar.bz2 -XFONT_FONT_DEC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_DEC_MISC_VERSION = 1.0.4 +XFONT_FONT_DEC_MISC_SOURCE = font-dec-misc-$(XFONT_FONT_DEC_MISC_VERSION).tar.xz +XFONT_FONT_DEC_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_DEC_MISC_LICENSE = MIT XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash index c5e8f4e4aea5..5a967f70d569 100644 --- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash +++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash @@ -1,3 +1,3 @@ # locally computed -sha256 fddb28d3db5a07f4b4ca15388488a9680a10e1367a18f358f903b2a608a5d2df font-ibm-type1-1.0.3.tar.bz2 +sha256 c4395e95ba46d40c4ad1737e91cac20c0ab75411329b60db5d99fed92b60ce7f font-ibm-type1-1.0.4.tar.xz sha256 fc0fd4df7ac7ac7f9b1ff3a221f28c52edea4506dc4c84f1869a3f4281360ca1 COPYING diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk index 4d34998af4dc..ea295cadfa0f 100644 --- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk +++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_IBM_TYPE1_VERSION = 1.0.3 -XFONT_FONT_IBM_TYPE1_SOURCE = font-ibm-type1-$(XFONT_FONT_IBM_TYPE1_VERSION).tar.bz2 -XFONT_FONT_IBM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_IBM_TYPE1_VERSION = 1.0.4 +XFONT_FONT_IBM_TYPE1_SOURCE = font-ibm-type1-$(XFONT_FONT_IBM_TYPE1_VERSION).tar.xz +XFONT_FONT_IBM_TYPE1_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_IBM_TYPE1_LICENSE = IBM/MIT X Consortium Courier Typefont agreement (no modification) XFONT_FONT_IBM_TYPE1_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash index bc4a9e5b17b6..bc2164b23faa 100644 --- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash +++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash @@ -1,3 +1,3 @@ # locally computed -sha256 5824ab4b485951107dd245b8f7717d2822f1a6dbf6cea98f1ac7f49905c0a867 font-isas-misc-1.0.3.tar.bz2 +sha256 47e595bbe6da444b9f6fcaa26539abc7ba1989e23afa6cdc49e22e484cc438fc font-isas-misc-1.0.4.tar.xz sha256 32d5d082b8186051bbe75ea9cbedc646830217ca931b1b7a1e534a828c94e839 COPYING diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk index 1393d67eae87..d14492527815 100644 --- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_ISAS_MISC_VERSION = 1.0.3 -XFONT_FONT_ISAS_MISC_SOURCE = font-isas-misc-$(XFONT_FONT_ISAS_MISC_VERSION).tar.bz2 -XFONT_FONT_ISAS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_ISAS_MISC_VERSION = 1.0.4 +XFONT_FONT_ISAS_MISC_SOURCE = font-isas-misc-$(XFONT_FONT_ISAS_MISC_VERSION).tar.xz +XFONT_FONT_ISAS_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_ISAS_MISC_LICENSE = MIT XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash index c39db360612f..95cdaa9f1c74 100644 --- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash +++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash @@ -1,2 +1,3 @@ # locally computed -sha256 2b18ce10b367ebafe95a17de799b6db9a24e2337188d124adaf68af05b1fac65 font-jis-misc-1.0.3.tar.bz2 +sha256 78d1eff6c471f7aa6802a26d62cccf51d8e5185586406d9b6e1ee691b0bffad0 font-jis-misc-1.0.4.tar.xz +sha256 7a94eaf8f051c95232d64b24b082eb02f827e1361c03b82e9bc7252263ea66c1 COPYING diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk index 78a5bbbf8ed6..f0ba7fe9427e 100644 --- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_JIS_MISC_VERSION = 1.0.3 -XFONT_FONT_JIS_MISC_SOURCE = font-jis-misc-$(XFONT_FONT_JIS_MISC_VERSION).tar.bz2 -XFONT_FONT_JIS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_JIS_MISC_VERSION = 1.0.4 +XFONT_FONT_JIS_MISC_SOURCE = font-jis-misc-$(XFONT_FONT_JIS_MISC_VERSION).tar.xz +XFONT_FONT_JIS_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash index ce0899b65ae4..ace39dcd64b4 100644 --- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash +++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash @@ -1,3 +1,3 @@ # locally computed -sha256 9a3381c10f32d9511f0ad4179df395914c50779103c16cddf7017f5220ed8db6 font-micro-misc-1.0.3.tar.bz2 +sha256 2ee0b9d6bd7ae849aff1bd82efab44a1b6b368fbb5e11d12ff7f015a3df6f943 font-micro-misc-1.0.4.tar.xz sha256 1711d038bca0efb51b5114e902412019d1c21531882866b1a6908c6386268cfb COPYING diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk index b5da83f398cb..e76626bb96ed 100644 --- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_MICRO_MISC_VERSION = 1.0.3 -XFONT_FONT_MICRO_MISC_SOURCE = font-micro-misc-$(XFONT_FONT_MICRO_MISC_VERSION).tar.bz2 -XFONT_FONT_MICRO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_MICRO_MISC_VERSION = 1.0.4 +XFONT_FONT_MICRO_MISC_SOURCE = font-micro-misc-$(XFONT_FONT_MICRO_MISC_VERSION).tar.xz +XFONT_FONT_MICRO_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_MICRO_MISC_LICENSE = Public Domain XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash index 5eb407f4c716..5d2f1dedc16f 100644 --- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash +++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash @@ -1,3 +1,3 @@ # locally computed -sha256 e40fe3e3323c62b738550795457ad555c70c008aa91b5912dfd46f8e745f5e60 font-misc-cyrillic-1.0.3.tar.bz2 +sha256 76021a7f53064001914a57fd08efae57f76b68f0a24dca8ab1b245474ee8e993 font-misc-cyrillic-1.0.4.tar.xz sha256 8765722448e0ca6ce113d0406554c40224f74abfc005f4b2ef927567349f1529 COPYING diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk index 8fa30ea31405..93a7973fb7e4 100644 --- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_MISC_CYRILLIC_VERSION = 1.0.3 -XFONT_FONT_MISC_CYRILLIC_SOURCE = font-misc-cyrillic-$(XFONT_FONT_MISC_CYRILLIC_VERSION).tar.bz2 -XFONT_FONT_MISC_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_MISC_CYRILLIC_VERSION = 1.0.4 +XFONT_FONT_MISC_CYRILLIC_SOURCE = font-misc-cyrillic-$(XFONT_FONT_MISC_CYRILLIC_VERSION).tar.xz +XFONT_FONT_MISC_CYRILLIC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_MISC_CYRILLIC_LICENSE = MIT / Public Domain XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash index 45cf43001868..73f38186f295 100644 --- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash +++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash @@ -1,5 +1,3 @@ -# From https://lists.x.org/archives/xorg-announce/2020-August/003055.html -sha256 698c0f6ddf9ca482250bdafa08293893148393bb9cb23e0a9ca313c6dbfc4ae0 font-misc-ethiopic-1.0.4.tar.bz2 -sha512 4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5 font-misc-ethiopic-1.0.4.tar.bz2 # locally computed +sha256 4749a7e6e1a1eef6c91fcc9a04e8b1c0ed027d40c1599e5a6c93270d8469b612 font-misc-ethiopic-1.0.5.tar.xz sha256 94835f274f1ddad34f8fd3a06b2c493222a68e4094f4097000d101f22ee0d0d5 COPYING diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk index 9ded4b6cede8..9a4e25bf827e 100644 --- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_MISC_ETHIOPIC_VERSION = 1.0.4 -XFONT_FONT_MISC_ETHIOPIC_SOURCE = font-misc-ethiopic-$(XFONT_FONT_MISC_ETHIOPIC_VERSION).tar.bz2 -XFONT_FONT_MISC_ETHIOPIC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_MISC_ETHIOPIC_VERSION = 1.0.5 +XFONT_FONT_MISC_ETHIOPIC_SOURCE = font-misc-ethiopic-$(XFONT_FONT_MISC_ETHIOPIC_VERSION).tar.xz +XFONT_FONT_MISC_ETHIOPIC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_MISC_ETHIOPIC_LICENSE = MIT XFONT_FONT_MISC_ETHIOPIC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash index 92046c851197..63d033b444bc 100644 --- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash +++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash @@ -1,3 +1,3 @@ # locally computed -sha256 3721323f13855cf7ca609115a1f7b182491e9b2b9c6e01eb1a2c7f8edd480791 font-misc-meltho-1.0.3.tar.bz2 +sha256 63be5ec17078898f263c24096a68b43ae5b06b88852e42549afa03d124d65219 font-misc-meltho-1.0.4.tar.xz sha256 6a02b45e4877b9df8c1bdaa21e1e8fba86d85e3be4c90f2791183a501e0cbd25 COPYING diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk index ac4a71b700c7..727b82fccf28 100644 --- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk +++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_MISC_MELTHO_VERSION = 1.0.3 -XFONT_FONT_MISC_MELTHO_SOURCE = font-misc-meltho-$(XFONT_FONT_MISC_MELTHO_VERSION).tar.bz2 -XFONT_FONT_MISC_MELTHO_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_MISC_MELTHO_VERSION = 1.0.4 +XFONT_FONT_MISC_MELTHO_SOURCE = font-misc-meltho-$(XFONT_FONT_MISC_MELTHO_VERSION).tar.xz +XFONT_FONT_MISC_MELTHO_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_MISC_MELTHO_LICENSE = Meltho License XFONT_FONT_MISC_MELTHO_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash index 781742420d38..2fbdcaf3a133 100644 --- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash +++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash @@ -1,3 +1,3 @@ # locally computed -sha256 b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794 font-misc-misc-1.1.2.tar.bz2 +sha256 79abe361f58bb21ade9f565898e486300ce1cc621d5285bec26e14b6a8618fed font-misc-misc-1.1.3.tar.xz sha256 1711d038bca0efb51b5114e902412019d1c21531882866b1a6908c6386268cfb COPYING diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk index e03da6f1b535..ee90e7a80c92 100644 --- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_MISC_MISC_VERSION = 1.1.2 -XFONT_FONT_MISC_MISC_SOURCE = font-misc-misc-$(XFONT_FONT_MISC_MISC_VERSION).tar.bz2 -XFONT_FONT_MISC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_MISC_MISC_VERSION = 1.1.3 +XFONT_FONT_MISC_MISC_SOURCE = font-misc-misc-$(XFONT_FONT_MISC_MISC_VERSION).tar.xz +XFONT_FONT_MISC_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_MISC_MISC_LICENSE = Public Domain XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash index f6e8e9aa7941..978c634ec550 100644 --- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash +++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash @@ -1,3 +1,3 @@ # locally computed -sha256 bd5f7adb34367c197773a9801df5bce7b019664941900b2a31fbfe1ff2830f8f font-mutt-misc-1.0.3.tar.bz2 +sha256 b12359f4e12c23bcfcb448b918297e975fa91bef5293d88d3c25343cc768bb24 font-mutt-misc-1.0.4.tar.xz sha256 81d42a6eeaf3ac2fcc1e1408fb6e2039d1162ca85d4abaf75e3daddcb250e4ff COPYING diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk index 6fcaa5dadc28..41179f4c4f2b 100644 --- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_MUTT_MISC_VERSION = 1.0.3 -XFONT_FONT_MUTT_MISC_SOURCE = font-mutt-misc-$(XFONT_FONT_MUTT_MISC_VERSION).tar.bz2 -XFONT_FONT_MUTT_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_MUTT_MISC_VERSION = 1.0.4 +XFONT_FONT_MUTT_MISC_SOURCE = font-mutt-misc-$(XFONT_FONT_MUTT_MISC_VERSION).tar.xz +XFONT_FONT_MUTT_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_MUTT_MISC_LICENSE = MIT XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash index 107493b267a6..44ce495ec6b0 100644 --- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash +++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash @@ -1,3 +1,3 @@ # locally computed -sha256 e444028656e0767e2eddc6d9aca462b16a2be75a47244dbc199b2c44eca87e5a font-schumacher-misc-1.1.2.tar.bz2 +sha256 8b849f0cdb1e55a34cc3dd8b0fb37443fabbc224d5ba44085569581244a68070 font-schumacher-misc-1.1.3.tar.xz sha256 4e2b9933887950acad3a780dce91c71770c8887f132bcd0c2ba6146cdc372407 COPYING diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk index e07569d4b4b1..4e61b453396a 100644 --- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_SCHUMACHER_MISC_VERSION = 1.1.2 -XFONT_FONT_SCHUMACHER_MISC_SOURCE = font-schumacher-misc-$(XFONT_FONT_SCHUMACHER_MISC_VERSION).tar.bz2 -XFONT_FONT_SCHUMACHER_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_SCHUMACHER_MISC_VERSION = 1.1.3 +XFONT_FONT_SCHUMACHER_MISC_SOURCE = font-schumacher-misc-$(XFONT_FONT_SCHUMACHER_MISC_VERSION).tar.xz +XFONT_FONT_SCHUMACHER_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_SCHUMACHER_MISC_LICENSE = MIT XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash index e8d3fa160544..4d92cdaf9f02 100644 --- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash +++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash @@ -1,4 +1,3 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 824231e8dffe15299454e47259f29d98001c9cf8ad3d6b5171399e4d71705e79 font-screen-cyrillic-1.0.4.tar.bz2 # Locally computed +sha256 8f758bb8cd580c7e655487d1d0db69d319acae54d932b295d96d9d9b83fde5c0 font-screen-cyrillic-1.0.5.tar.xz sha256 5234cbcbdcc9865ce2b576b5f67e77e40ccdc1aa01e6528bea5a17784934b894 COPYING diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk index a254d4a756a5..144cec520356 100644 --- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_SCREEN_CYRILLIC_VERSION = 1.0.4 -XFONT_FONT_SCREEN_CYRILLIC_SOURCE = font-screen-cyrillic-$(XFONT_FONT_SCREEN_CYRILLIC_VERSION).tar.bz2 -XFONT_FONT_SCREEN_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_SCREEN_CYRILLIC_VERSION = 1.0.5 +XFONT_FONT_SCREEN_CYRILLIC_SOURCE = font-screen-cyrillic-$(XFONT_FONT_SCREEN_CYRILLIC_VERSION).tar.xz +XFONT_FONT_SCREEN_CYRILLIC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_SCREEN_CYRILLIC_LICENSE = MIT XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash index 80261ff312be..726e74805028 100644 --- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash +++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash @@ -1,4 +1,3 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 2043a326ba347c9da5ca1e9bc363e2521c3ea40b43b1f9662d333efd4867cff5 font-sony-misc-1.0.3.tar.bz2 # Locally computed +sha256 e6b09f823fccb06e0bd0b2062283b6514153323bd8a7486e9c2e3f55ab84946b font-sony-misc-1.0.4.tar.xz sha256 8233ff7d7bc8b5b46cbba3f6cd0069d2ef875bd1b1e0090ca4145282aa096739 COPYING diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk index 6e580fd922fe..f77a5f004f0a 100644 --- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_SONY_MISC_VERSION = 1.0.3 -XFONT_FONT_SONY_MISC_SOURCE = font-sony-misc-$(XFONT_FONT_SONY_MISC_VERSION).tar.bz2 -XFONT_FONT_SONY_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_SONY_MISC_VERSION = 1.0.4 +XFONT_FONT_SONY_MISC_SOURCE = font-sony-misc-$(XFONT_FONT_SONY_MISC_VERSION).tar.xz +XFONT_FONT_SONY_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_SONY_MISC_LICENSE = MIT XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash index 8b195c9f9bdc..ac2f343906e3 100644 --- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash +++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash @@ -1,4 +1,3 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 481f4fcbbf7005658b080b3cf342c8c76de752e77f47958b2b383de73266d2e0 font-sun-misc-1.0.3.tar.bz2 # Locally computed -sha256 dd6da1d39832ab2878c3304405c1c7883c6da292ffde262fca1785239534c40f COPYING +sha256 dd84dd116d927affa4fa0fa29727b3ecfc0f064238817c0a1e552a0ac384db9f font-sun-misc-1.0.4.tar.xz +sha256 d76b96147b5c155642652ca15e2e4cb4cc249ee2eaa02292e274b723224b88de COPYING diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk index 737cfb5c9b22..3d3596a9b637 100644 --- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_SUN_MISC_VERSION = 1.0.3 -XFONT_FONT_SUN_MISC_SOURCE = font-sun-misc-$(XFONT_FONT_SUN_MISC_VERSION).tar.bz2 -XFONT_FONT_SUN_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_SUN_MISC_VERSION = 1.0.4 +XFONT_FONT_SUN_MISC_SOURCE = font-sun-misc-$(XFONT_FONT_SUN_MISC_VERSION).tar.xz +XFONT_FONT_SUN_MISC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_SUN_MISC_LICENSE = MIT XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash index 283f6f9f2c28..a0200073de7d 100644 --- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash +++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash @@ -1,4 +1,3 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 abd13b63d02fcaec488686c23683e5cf640b43bd32f8ca22eeae6f84df0a36a0 font-winitzki-cyrillic-1.0.3.tar.bz2 # Locally computed +sha256 3b6d82122dc14776e3afcd877833a7834e1f900c53fc1c7bb2d67c781cfa97a8 font-winitzki-cyrillic-1.0.4.tar.xz sha256 ca60a2aa1133e39e8c72a01af06cf0c927f5ddfe70d469d1535231100618095d COPYING diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk index e43cd1150f73..f13483994b3e 100644 --- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_WINITZKI_CYRILLIC_VERSION = 1.0.3 -XFONT_FONT_WINITZKI_CYRILLIC_SOURCE = font-winitzki-cyrillic-$(XFONT_FONT_WINITZKI_CYRILLIC_VERSION).tar.bz2 -XFONT_FONT_WINITZKI_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_WINITZKI_CYRILLIC_VERSION = 1.0.4 +XFONT_FONT_WINITZKI_CYRILLIC_SOURCE = font-winitzki-cyrillic-$(XFONT_FONT_WINITZKI_CYRILLIC_VERSION).tar.xz +XFONT_FONT_WINITZKI_CYRILLIC_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_WINITZKI_CYRILLIC_LICENSE = Public Domain XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash index 640f56636a88..68035e4195e3 100644 --- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash +++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash @@ -1,4 +1,3 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 caebf42aec7be7f3bd40e0f232d6f34881b853dc84acfcdf7458358701fbe34a font-xfree86-type1-1.0.4.tar.bz2 # Locally computed +sha256 a93c2c788a5ea1c002af7c8662cf9d9821fb1df51b8d2b2c5e0026dfdfea4837 font-xfree86-type1-1.0.5.tar.xz sha256 51e6bc6513b3fa94512d8dd570240498c878605f25292c3883d92fdfca18d0c6 COPYING diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk index a26fbc8948ef..0b332d20bf36 100644 --- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk +++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_XFREE86_TYPE1_VERSION = 1.0.4 -XFONT_FONT_XFREE86_TYPE1_SOURCE = font-xfree86-type1-$(XFONT_FONT_XFREE86_TYPE1_VERSION).tar.bz2 -XFONT_FONT_XFREE86_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_XFREE86_TYPE1_VERSION = 1.0.5 +XFONT_FONT_XFREE86_TYPE1_SOURCE = font-xfree86-type1-$(XFONT_FONT_XFREE86_TYPE1_VERSION).tar.xz +XFONT_FONT_XFREE86_TYPE1_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_FONT_XFREE86_TYPE1_LICENSE = MIT XFONT_FONT_XFREE86_TYPE1_LICENSE_FILES = COPYING From e63078a99a54573db83627fb2df5603bd6f8d735 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:16 +0200 Subject: [PATCH 0795/2890] package/x11r7/xkeyboard-config: bump version to 2.38 Release notes: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/x11r7/xkeyboard-config/xkeyboard-config.hash | 2 +- package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/package/x11r7/xkeyboard-config/xkeyboard-config.hash index 08e36da1d0cc..3a19075ba150 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c xkeyboard-config-2.37.tar.xz +sha256 0690a91bab86b18868f3eee6d41e9ec4ce6894f655443d490a2184bfac56c872 xkeyboard-config-2.38.tar.xz sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index b82c15a23a1a..7c9c814d95cc 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -4,7 +4,7 @@ # ################################################################################ -XKEYBOARD_CONFIG_VERSION = 2.37 +XKEYBOARD_CONFIG_VERSION = 2.38 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.xz XKEYBOARD_CONFIG_SITE = https://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARD_CONFIG_LICENSE = MIT From 2aa3f61b5b3ee115dec3ca6639ff9e8bfa00b306 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:17 +0200 Subject: [PATCH 0796/2890] DEVELOPERS: remove Bernd Kuhls from package/x11r7/ Remove packages which are no longer runtime-tested here. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 794c2ebdfe6e..188c579010a5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -471,7 +471,6 @@ F: package/vdr-plugin-vnsiserver/ F: package/vlc/ F: package/vnstat/ F: package/waylandpp/ -F: package/x11r7/ F: package/x264/ F: package/x265/ F: package/xmrig/ From 774b8a78432ae84d167ff87567c7cf8699a4f288 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 21 Jun 2023 15:45:18 +0200 Subject: [PATCH 0797/2890] python-gpiozero: migrate to setup.cfg setup.cfg seems to be mandatory since (at least) setuptools 67.8.0 otherwise gpiozero dependencies are not properly detected File "/builds/buildroot.org/buildroot/test-output/TestPythonPy3Gpiozero/host/lib/python3.11/site-packages/pkg_resources/__init__.py", line 868, in _resolve_dist raise DistributionNotFound(req, requirers) pkg_resources.DistributionNotFound: The 'colorzero' distribution was not found and is required by the application See: http://lists.busybox.net/pipermail/buildroot/2023-June/669207.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4505977906 Signed-off-by: Romain Naour Cc: James Hilliard Signed-off-by: Arnout Vandecappelle --- .../0001-Migrate-to-setup.cfg.patch | 855 ++++++++++++++++++ 1 file changed, 855 insertions(+) create mode 100644 package/python-gpiozero/0001-Migrate-to-setup.cfg.patch diff --git a/package/python-gpiozero/0001-Migrate-to-setup.cfg.patch b/package/python-gpiozero/0001-Migrate-to-setup.cfg.patch new file mode 100644 index 000000000000..090bcbc4a386 --- /dev/null +++ b/package/python-gpiozero/0001-Migrate-to-setup.cfg.patch @@ -0,0 +1,855 @@ +From d56ca0ee4fde7fa4ad82a532f9ea387f9f33d389 Mon Sep 17 00:00:00 2001 +From: Dave Jones +Date: Tue, 16 Mar 2021 17:52:49 +0000 +Subject: [PATCH] Migrate to setup.cfg + +(cherry picked from commit b167bef82c3bf2739707f062b35fcabbb9cc11ad) + +setup.cfg seems to be mandatory since (at least) setuptools 67.8.0 +otherwise gpiozero dependencies are not properly detected + +File "/builds/buildroot.org/buildroot/test-output/TestPythonPy3Gpiozero/host/lib/python3.11/site-packages/pkg_resources/__init__.py", +line 868, in _resolve_dist + raise DistributionNotFound(req, requirers) +pkg_resources.DistributionNotFound: The 'colorzero' distribution was not found +and is required by the application + +Upstream: https://github.com/gpiozero/gpiozero/commit/b167bef82c3bf2739707f062b35fcabbb9cc11ad + +See: +http://lists.busybox.net/pipermail/buildroot/2023-June/669207.html + +[Romain: rebase on 1.6.2] +Signed-off-by: Romain Naour +--- + MANIFEST.in | 4 -- + Makefile | 88 +++++--------------------------- + copyrights | 56 +++++++++++--------- + copyrights.cfg | 11 ---- + coverage.cfg | 18 ------- + docs/conf.py | 99 +++++++++++++++-------------------- + setup.cfg | 98 +++++++++++++++++++++++++++++++++++ + setup.py | 136 +++++-------------------------------------------- + 8 files changed, 196 insertions(+), 314 deletions(-) + delete mode 100644 MANIFEST.in + delete mode 100644 copyrights.cfg + delete mode 100644 coverage.cfg + create mode 100644 setup.cfg + +diff --git a/MANIFEST.in b/MANIFEST.in +deleted file mode 100644 +index bb562ea..0000000 +--- a/MANIFEST.in ++++ /dev/null +@@ -1,4 +0,0 @@ +-include README.rst +-recursive-include gpiozero/fonts *.txt +-recursive-include tests *.py +-include LICENSE.rst +diff --git a/Makefile b/Makefile +index c9ddd90..264a73c 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,44 +4,18 @@ + PYTHON=python + PIP=pip + PYTEST=py.test +-COVERAGE=coverage + TWINE=twine + PYFLAGS= + DEST_DIR=/ + +-# Horrid hack to ensure setuptools is installed in our python environment. This +-# is necessary with Python 3.3's venvs which don't install it by default. +-ifeq ($(shell python -c "import setuptools" 2>&1),) +-SETUPTOOLS:= +-else +-SETUPTOOLS:=$(shell wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | $(PYTHON)) +-endif +- + # Calculate the base names of the distribution, the location of all source, + # documentation, packaging, icon, and executable script files + NAME:=$(shell $(PYTHON) $(PYFLAGS) setup.py --name) + VER:=$(shell $(PYTHON) $(PYFLAGS) setup.py --version) +-ifeq ($(shell lsb_release -si),Ubuntu) +-DEB_SUFFIX:=ubuntu1 +-else +-DEB_SUFFIX:= +-endif +-DEB_ARCH:=$(shell dpkg --print-architecture) + PYVER:=$(shell $(PYTHON) $(PYFLAGS) -c "import sys; print('py%d.%d' % sys.version_info[:2])") + PY_SOURCES:=$(shell \ + $(PYTHON) $(PYFLAGS) setup.py egg_info >/dev/null 2>&1 && \ + grep -v "\.egg-info" $(NAME).egg-info/SOURCES.txt) +-DEB_SOURCES:=debian/changelog \ +- debian/control \ +- debian/copyright \ +- debian/rules \ +- debian/docs \ +- $(wildcard debian/*.init) \ +- $(wildcard debian/*.default) \ +- $(wildcard debian/*.manpages) \ +- $(wildcard debian/*.docs) \ +- $(wildcard debian/*.doc-base) \ +- $(wildcard debian/*.desktop) + DOC_SOURCES:=docs/conf.py \ + $(wildcard docs/*.png) \ + $(wildcard docs/*.svg) \ +@@ -56,17 +30,6 @@ SUBDIRS:= + DIST_WHEEL=dist/$(NAME)-$(VER)-py2.py3-none-any.whl + DIST_TAR=dist/$(NAME)-$(VER).tar.gz + DIST_ZIP=dist/$(NAME)-$(VER).zip +-DIST_DEB=dist/python-$(NAME)_$(VER)$(DEB_SUFFIX)_all.deb \ +- dist/python3-$(NAME)_$(VER)$(DEB_SUFFIX)_all.deb \ +- dist/python-$(NAME)-doc_$(VER)$(DEB_SUFFIX)_all.deb \ +- dist/$(NAME)_$(VER)$(DEB_SUFFIX)_$(DEB_ARCH).build \ +- dist/$(NAME)_$(VER)$(DEB_SUFFIX)_$(DEB_ARCH).buildinfo \ +- dist/$(NAME)_$(VER)$(DEB_SUFFIX)_$(DEB_ARCH).changes +-DIST_DSC=dist/$(NAME)_$(VER)$(DEB_SUFFIX).tar.xz \ +- dist/$(NAME)_$(VER)$(DEB_SUFFIX).dsc \ +- dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.build \ +- dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.buildinfo \ +- dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.changes + + + # Default target +@@ -76,10 +39,9 @@ all: + @echo "make test - Run tests" + @echo "make doc - Generate HTML and PDF documentation" + @echo "make source - Create source package" +- @echo "make egg - Generate a PyPI egg package" ++ @echo "make wheel - Generate a PyPI wheel package" + @echo "make zip - Generate a source zip package" + @echo "make tar - Generate a source tar package" +- @echo "make deb - Generate Debian packages" + @echo "make dist - Generate all packages" + @echo "make clean - Get rid of all generated files" + @echo "make release - Create and tag a new release" +@@ -102,9 +64,7 @@ zip: $(DIST_ZIP) + + tar: $(DIST_TAR) + +-deb: $(DIST_DEB) $(DIST_DSC) +- +-dist: $(DIST_WHEEL) $(DIST_DEB) $(DIST_DSC) $(DIST_TAR) $(DIST_ZIP) ++dist: $(DIST_WHEEL) $(DIST_TAR) $(DIST_ZIP) + + develop: + @# These have to be done separately to avoid a cockup... +@@ -113,18 +73,17 @@ develop: + $(PIP) install -e .[doc,test] + + test: +- $(COVERAGE) run --rcfile coverage.cfg -m $(PYTEST) tests -v -r sx +- $(COVERAGE) report --rcfile coverage.cfg ++ $(PYTEST) tests + + clean: +- dh_clean +- rm -fr dist/ $(NAME).egg-info/ tags ++ rm -fr dist/ build/ .pytest_cache/ .mypy_cache/ $(NAME).egg-info/ tags .coverage + for dir in $(SUBDIRS); do \ + $(MAKE) -C $$dir clean; \ + done ++ find $(CURDIR) -name "*.pyc" -delete + + tags: $(PY_SOURCES) +- ctags -R --exclude="build/*" --exclude="debian/*" --exclude="docs/*" --languages="Python" ++ ctags -R --exclude="build/*" --exclude="docs/*" --languages="Python" + + $(SUBDIRS): + $(MAKE) -C $@ +@@ -138,37 +97,14 @@ $(DIST_ZIP): $(PY_SOURCES) $(SUBDIRS) + $(DIST_WHEEL): $(PY_SOURCES) $(SUBDIRS) + $(PYTHON) $(PYFLAGS) setup.py bdist_wheel --universal + +-$(DIST_DEB): $(PY_SOURCES) $(SUBDIRS) $(DEB_SOURCES) $(DIST_TAR) +- cp $(DIST_TAR) ../$(NAME)_$(VER).orig.tar.gz +- debuild -b +- mkdir -p dist/ +- for f in $(DIST_DEB); do cp ../$${f##*/} dist/; done +- +-$(DIST_DSC): $(PY_SOURCES) $(SUBDIRS) $(DEB_SOURCES) $(DIST_TAR) +- cp $(DIST_TAR) ../$(NAME)_$(VER).orig.tar.gz +- debuild -S +- mkdir -p dist/ +- for f in $(DIST_DSC); do cp ../$${f##*/} dist/; done +- +-copyrights: $(PY_SOURCES) $(DOC_SOURCES) +- ./copyrights +- +-changelog: $(PY_SOURCES) $(DOC_SOURCES) $(DEB_SOURCES) ++release: + $(MAKE) clean +- # ensure there are no current uncommitted changes + test -z "$(shell git status --porcelain)" +- # update the debian changelog with new release information +- dch --newversion $(VER)$(DEB_SUFFIX) +- # commit the changes and add a new tag +- git commit debian/changelog -m "Updated changelog for release $(VER)" +- +-release: $(DIST_DEB) $(DIST_DSC) $(DIST_TAR) $(DIST_WHEEL) + git tag -s v$(VER) -m "Release v$(VER)" +- git push --tags +- # build a source archive and upload to PyPI ++ git push origin v$(VER) ++ ++upload: $(DIST_TAR) $(DIST_WHEEL) ++ $(TWINE) check $(DIST_TAR) $(DIST_WHEEL) + $(TWINE) upload $(DIST_TAR) $(DIST_WHEEL) +- # build the deb source archive and upload to Raspbian +- dput raspberrypi dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.changes +- dput raspberrypi dist/$(NAME)_$(VER)$(DEB_SUFFIX)_$(DEB_ARCH).changes + +-.PHONY: all install develop test doc source egg wheel zip tar deb dist clean tags release upload $(SUBDIRS) ++.PHONY: all install develop test doc source wheel zip tar dist clean tags release upload $(SUBDIRS) +diff --git a/copyrights b/copyrights +index b709fc8..2f14e78 100755 +--- a/copyrights ++++ b/copyrights +@@ -6,10 +6,13 @@ derives the authorship and copyright years information from the git history + of the project; hence, this script must be run within a git repository. + """ + ++from __future__ import annotations ++ + import os + import sys + assert sys.version_info >= (3, 6), 'Script requires Python 3.6+' + import tempfile ++import typing as t + from argparse import ArgumentParser, Namespace + from configparser import ConfigParser + from operator import attrgetter +@@ -18,14 +21,13 @@ from datetime import datetime + from subprocess import Popen, PIPE, DEVNULL + from pathlib import Path + from fnmatch import fnmatch +-from typing import NamedTuple, Iterator, List, Tuple, Set, Union, Optional + + + SPDX_PREFIX = 'SPDX-License-Identifier:' + COPYRIGHT_PREFIX = 'Copyright (c)' + + +-def main(args: List[str] = None): ++def main(args: t.List[str] = None): + if args is None: + args = sys.argv[1:] + config = get_config(args) +@@ -41,7 +43,7 @@ def main(args: List[str] = None): + target.write(chunk) + + +-def get_config(args: List[str]) -> Namespace: ++def get_config(args: t.List[str]) -> Namespace: + config = ConfigParser( + defaults={ + 'include': '**/*', +@@ -52,10 +54,10 @@ def get_config(args: List[str]) -> Namespace: + 'spdx_prefix': SPDX_PREFIX, + 'copy_prefix': COPYRIGHT_PREFIX, + }, +- delimiters=('=',), default_section='settings', ++ delimiters=('=',), default_section='copyrights:settings', + empty_lines_in_values=False, interpolation=None, + converters={'list': lambda s: s.strip().splitlines() }) +- config.read('copyrights.cfg') ++ config.read('setup.cfg') + sect = config[config.default_section] + + parser = ArgumentParser(description=__doc__) +@@ -113,10 +115,10 @@ def get_config(args: List[str]) -> Namespace: + return ns + + +-class Copyright(NamedTuple): ++class Copyright(t.NamedTuple): + author: str + email: str +- years: Set[int] ++ years: t.Set[int] + + def __str__(self): + if len(self.years) > 1: +@@ -126,8 +128,8 @@ class Copyright(NamedTuple): + return f'{years} {self.author} <{self.email}>' + + +-def get_copyrights(include: Set[str], exclude: Set[str])\ +- -> Iterator[Tuple[Path, List[Copyright]]]: ++def get_copyrights(include: t.Set[str], exclude: t.Set[str])\ ++ -> t.Iterator[t.Tuple[Path, t.Container[Copyright]]]: + sorted_blame = sorted( + get_contributions(include, exclude), + key=lambda c: (c.path, c.author, c.email) +@@ -147,15 +149,15 @@ def get_copyrights(include: Set[str], exclude: Set[str])\ + yield path, copyrights + + +-class Contribution(NamedTuple): ++class Contribution(t.NamedTuple): + author: str + email: str + year: int + path: Path + + +-def get_contributions(include: Set[str], exclude: Set[str])\ +- -> Iterator[Contribution]: ++def get_contributions(include: t.Set[str], exclude: t.Set[str])\ ++ -> t.Iterator[Contribution]: + for path in get_source_paths(include, exclude): + blame = Popen( + ['git', 'blame', '--line-porcelain', 'HEAD', '--', str(path)], +@@ -186,7 +188,8 @@ def get_contributions(include: Set[str], exclude: Set[str])\ + assert blame.returncode == 0 + + +-def get_source_paths(include: Set[str], exclude: Set[str]) -> Iterator[Path]: ++def get_source_paths(include: t.Set[str], exclude: t.Set[str])\ ++ -> t.Iterator[Path]: + ls_tree = Popen( + ['git', 'ls-tree', '-r', '--name-only', 'HEAD'], + stdout=PIPE, stderr=DEVNULL, universal_newlines=True) +@@ -203,9 +206,9 @@ def get_source_paths(include: Set[str], exclude: Set[str]) -> Iterator[Path]: + assert ls_tree.returncode == 0 + + +-class License(NamedTuple): +- ident: Optional[str] +- text: List[str] ++class License(t.NamedTuple): ++ ident: t.Optional[str] ++ text: t.List[str] + + + def get_license(path: Path, *, spdx_prefix: str = SPDX_PREFIX) -> License: +@@ -253,20 +256,26 @@ class CopyWriter: + '.sql': '--', + } + +- def __init__(self, license='LICENSE.txt', preamble=(), +- spdx_prefix=SPDX_PREFIX, copy_prefix=COPYRIGHT_PREFIX): ++ def __init__(self, license: Path=Path('LICENSE.txt'), ++ preamble: t.List[str]=None, ++ spdx_prefix: str=SPDX_PREFIX, ++ copy_prefix: str=COPYRIGHT_PREFIX): ++ if preamble is None: ++ preamble = [] + self.license = get_license(license, spdx_prefix=spdx_prefix) + self.preamble = preamble + self.spdx_prefix = spdx_prefix + self.copy_prefix = copy_prefix + + @classmethod +- def from_config(cls, config): ++ def from_config(cls, config: Namespace) -> CopyWriter: + return cls( + config.license, config.preamble, + config.spdx_prefix, config.copy_prefix) + +- def transform(self, source, copyrights, *, comment_prefix=None): ++ def transform(self, source: t.TextIO, ++ copyrights: t.List[Copyright], *, ++ comment_prefix: str=None) -> t.Iterator[str]: + if comment_prefix is None: + comment_prefix = self.COMMENTS[Path(source.name).suffix] + license_start = self.license.text[0] +@@ -279,7 +288,7 @@ class CopyWriter: + yield line + empty = False + elif linenum < 3 and ( +- 'set fileencoding=' in line or '-*- coding:' in line): ++ 'fileencoding=' in line or '-*- coding:' in line): + yield line + empty = False + elif line.rstrip() == comment_prefix: +@@ -313,7 +322,8 @@ class CopyWriter: + elif state == 'body': + yield line + +- def _generate_header(self, copyrights, comment_prefix, empty): ++ def _generate_header(self, copyrights: t.Iterable[Copyright], ++ comment_prefix: str, empty: bool) -> t.Iterator[str]: + if not empty: + yield comment_prefix + '\n' + for line in self.preamble: +@@ -356,7 +366,7 @@ class AtomicReplaceFile: + If ``None`` (the default), the temporary file will be opened in binary + mode. Otherwise, this specifies the encoding to use with text mode. + """ +- def __init__(self, path: Union[str, Path], encoding: str = None): ++ def __init__(self, path: t.Union[str, Path], encoding: str = None): + if isinstance(path, str): + path = Path(path) + self._path = path +diff --git a/copyrights.cfg b/copyrights.cfg +deleted file mode 100644 +index de68dbe..0000000 +--- a/copyrights.cfg ++++ /dev/null +@@ -1,11 +0,0 @@ +-[settings] +-include= +- **/*.py +- **/*.rst +-exclude= +- docs/examples/*.py +- docs/license.rst +-license=LICENSE.rst +-preamble= +- GPIO Zero: a library for controlling the Raspberry Pi's GPIO pins +-strip-preamble=no +diff --git a/coverage.cfg b/coverage.cfg +deleted file mode 100644 +index e3f3349..0000000 +--- a/coverage.cfg ++++ /dev/null +@@ -1,18 +0,0 @@ +-[run] +-branch = True +-include = gpiozero/* +-;omit = */bar.py,*/baz.py +- +-[report] +-ignore_errors = True +-show_missing = True +-exclude_lines = +- pragma: no cover +- assert False +- raise AssertionError +- raise NotImplementedError +- pass +- if __name__ == .__main__.: +- +-[html] +-directory = coverage +diff --git a/docs/conf.py b/docs/conf.py +index 998ae91..626ae29 100644 +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -11,62 +11,34 @@ + + import sys + import os ++from pathlib import Path + from datetime import datetime +-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) +-on_rtd = os.environ.get('READTHEDOCS', None) == 'True' +-import setup as _setup +- +-# Mock out certain modules while building documentation +-class Mock(object): +- __all__ = [] +- +- def __init__(self, *args, **kw): +- pass +- +- def __call__(self, *args, **kw): +- return Mock() +- +- def __mul__(self, other): +- return Mock() +- +- def __and__(self, other): +- return Mock() ++from setuptools.config import read_configuration + +- def __bool__(self): +- return False +- +- def __nonzero__(self): +- return False +- +- @classmethod +- def __getattr__(cls, name): +- if name in ('__file__', '__path__'): +- return '/dev/null' +- else: +- return Mock() +- +-sys.modules['RPi'] = Mock() +-sys.modules['RPi.GPIO'] = sys.modules['RPi'].GPIO +-sys.modules['lgpio'] = Mock() +-sys.modules['RPIO'] = Mock() +-sys.modules['RPIO.PWM'] = sys.modules['RPIO'].PWM +-sys.modules['RPIO.Exceptions'] = sys.modules['RPIO'].Exceptions +-sys.modules['pigpio'] = Mock() +-sys.modules['w1thermsensor'] = Mock() +-sys.modules['spidev'] = Mock() +-sys.modules['colorzero'] = Mock() ++on_rtd = os.environ.get('READTHEDOCS', None) == 'True' ++config = read_configuration(str(Path(__file__).parent / '..' / 'setup.cfg')) ++info = config['metadata'] + + # -- General configuration ------------------------------------------------ + + extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'sphinx.ext.intersphinx'] ++if on_rtd: ++ needs_sphinx = '1.4.0' ++ extensions.append('sphinx.ext.imgmath') ++ imgmath_image_format = 'svg' ++ tags.add('rtd') ++else: ++ extensions.append('sphinx.ext.mathjax') ++ mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS_HTML' ++ + templates_path = ['_templates'] + source_suffix = '.rst' + #source_encoding = 'utf-8-sig' + master_doc = 'index' +-project = 'GPIO Zero' +-copyright = '2015-%s %s' % (datetime.now().year, _setup.__author__) +-version = _setup.__version__ +-release = _setup.__version__ ++project = info['name'] ++copyright = '2015-{now:%Y} {info[author]}'.format(now=datetime.now(), info=info) ++version = info['version'] ++#release = None + #language = None + #today_fmt = '%B %d, %Y' + exclude_patterns = ['_build'] +@@ -82,6 +54,15 @@ pygments_style = 'sphinx' + # -- Autodoc configuration ------------------------------------------------ + + autodoc_member_order = 'groupwise' ++autodoc_mock_imports = [ ++ 'RPi', ++ 'lgpio', ++ 'RPIO', ++ 'pigpio', ++ 'w1thermsensor', ++ 'spidev', ++ 'colorzero', ++] + + # -- Intersphinx configuration -------------------------------------------- + +@@ -94,7 +75,7 @@ intersphinx_mapping = { + # -- Options for HTML output ---------------------------------------------- + + html_theme = 'sphinx_rtd_theme' +-html_title = '%s %s Documentation' % (project, version) ++html_title = '{info[name]} {info[version]} Documentation'.format(info=info) + #html_theme_path = [] + #html_short_title = None + #html_logo = None +@@ -112,7 +93,7 @@ html_static_path = ['_static'] + #html_show_copyright = True + #html_use_opensearch = '' + #html_file_suffix = None +-htmlhelp_basename = '%sdoc' % _setup.__project__ ++htmlhelp_basename = '{info[name]}doc'.format(info=info) + + # Hack to make wide tables work properly in RTD + # See https://github.com/snide/sphinx_rtd_theme/issues/117 for details +@@ -131,12 +112,12 @@ latex_elements = { + + latex_documents = [ + ( +- 'index', # source start file +- '%s.tex' % _setup.__project__, # target filename +- '%s Documentation' % project, # title +- _setup.__author__, # author +- 'manual', # documentclass +- True, # documents ref'd from toctree only ++ 'index', # source start file ++ project + '.tex', # target filename ++ html_title, # title ++ info['author'], # author ++ 'manual', # documentclass ++ True, # documents ref'd from toctree only + ), + ] + +@@ -149,11 +130,11 @@ latex_show_urls = 'footnote' + + # -- Options for epub output ---------------------------------------------- + +-epub_basename = _setup.__project__ ++epub_basename = project + #epub_theme = 'epub' + #epub_title = html_title +-epub_author = _setup.__author__ +-epub_identifier = 'https://gpiozero.readthedocs.io/' ++epub_author = info['author'] ++epub_identifier = 'https://{info[name]}.readthedocs.io/'.format(info=info) + #epub_tocdepth = 3 + epub_show_urls = 'no' + #epub_use_index = True +@@ -161,8 +142,8 @@ epub_show_urls = 'no' + # -- Options for manual page output --------------------------------------- + + man_pages = [ +- ('cli_pinout', 'pinout', 'GPIO Zero pinout tool', [_setup.__author__], 1), +- ('remote_gpio', 'remote-gpio', 'GPIO Zero remote GPIO guide', [_setup.__author__], 7), ++ ('cli_pinout', 'pinout', 'GPIO Zero pinout tool', [info['author']], 1), ++ ('remote_gpio', 'remote-gpio', 'GPIO Zero remote GPIO guide', [info['author']], 7), + ] + + man_show_urls = True +diff --git a/setup.cfg b/setup.cfg +new file mode 100644 +index 0000000..db0cfa4 +--- /dev/null ++++ b/setup.cfg +@@ -0,0 +1,98 @@ ++[metadata] ++name = gpiozero ++version = 1.6.2 ++description = A simple interface to GPIO devices with Raspberry Pi ++long_description = file:README.rst ++author = Ben Nuttall ++author_email = ben@bennuttall.com ++url = https://gpiozero.readthedocs.io/ ++project_urls = ++ Documentation = https://gpiozero.readthedocs.io/ ++ Source Code = https://github.com/gpiozero/gpiozero ++ Issue Tracker = https://github.com/gpiozero/gpiozero/issues ++keywords = raspberrypi gpio ++license = BSD-3-Clause ++classifiers = ++ Development Status :: 5 - Production/Stable ++ Intended Audience :: Education ++ Intended Audience :: Developers ++ Topic :: Education ++ Topic :: System :: Hardware ++ License :: OSI Approved :: BSD License ++ Programming Language :: Python :: 2 ++ Programming Language :: Python :: 2.7 ++ Programming Language :: Python :: 3 ++ Programming Language :: Python :: 3.5 ++ Programming Language :: Python :: 3.6 ++ Programming Language :: Python :: 3.7 ++ Programming Language :: Python :: 3.8 ++ Programming Language :: Python :: 3.9 ++ Programming Language :: Python :: Implementation :: PyPy ++ ++[options] ++packages = find: ++install_requires = ++ colorzero ++ ++[options.package_data] ++gpiozero = ++ fonts/*.txt ++ ++[options.extras_require] ++test = ++ pytest ++ pytest-cov ++doc = ++ sphinx ++ sphinx-rtd-theme ++ ++[options.entry_points] ++console_scripts = ++ pinout = gpiozerocli.pinout:main ++gpiozero_pin_factories = ++ pigpio = gpiozero.pins.pigpio:PiGPIOFactory ++ lgpio = gpiozero.pins.lgpio:LGPIOFactory ++ rpigpio = gpiozero.pins.rpigpio:RPiGPIOFactory ++ rpio = gpiozero.pins.rpio:RPIOFactory ++ native = gpiozero.pins.native:NativeFactory ++ mock = gpiozero.pins.mock:MockFactory ++ PiGPIOPin = gpiozero.pins.pigpio:PiGPIOFactory ++ RPiGPIOPin = gpiozero.pins.rpigpio:RPiGPIOFactory ++ RPIOPin = gpiozero.pins.rpio:RPIOFactory ++ NativePin = gpiozero.pins.native:NativeFactory ++gpiozero_mock_pin_classes = ++ mockpin = gpiozero.pins.mock:MockPin ++ mockpwmpin = gpiozero.pins.mock:MockPWMPin ++ mockchargingpin = gpiozero.pins.mock:MockChargingPin ++ mocktriggerpin = gpiozero.pins.mock:MockTriggerPin ++ ++[tools:pytest] ++addopts = -rsx --cov --tb=short ++testpaths = tests ++ ++[coverage:run] ++source = gpiozero ++branch = true ++ ++[coverage:report] ++ignore_errors = true ++show_missing = true ++exclude_lines = ++ pragma: no cover ++ assert False ++ raise AssertionError ++ raise NotImplementedError ++ pass ++ if __name__ == .__main__.: ++ ++[copyrights:settings] ++include = ++ **/*.py ++ **/*.rst ++exclude = ++ docs/examples/*.py ++ docs/license.rst ++license = LICENSE.rst ++preamble = ++ GPIO Zero: a library for controlling the Raspberry Pi's GPIO pins ++strip-preamble = false +diff --git a/setup.py b/setup.py +index 621398a..fc644b6 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,139 +1,29 @@ +-"A simple interface to GPIO devices with Raspberry Pi." ++from __future__ import ( ++ unicode_literals, ++ absolute_import, ++) ++str = type('') + + import io + import os +-import sys + import errno +-from setuptools import setup, find_packages ++from setuptools import setup, config + +-if sys.version_info[0] == 2: +- if not sys.version_info >= (2, 7): +- raise ValueError('This package requires Python 2.7 or above') +-elif sys.version_info[0] == 3: +- if not sys.version_info >= (3, 2): +- raise ValueError('This package requires Python 3.2 or above') +-else: +- raise ValueError('Unrecognized major version of Python') +- +-HERE = os.path.abspath(os.path.dirname(__file__)) +- +-# Workaround +-try: +- import multiprocessing +-except ImportError: +- pass +- +-__project__ = 'gpiozero' +-__version__ = '1.6.2' +-__author__ = 'Ben Nuttall' +-__author_email__ = 'ben@bennuttall.com' +-__url__ = 'https://github.com/gpiozero/gpiozero' +-__platforms__ = 'ALL' +- +-__classifiers__ = [ +- "Development Status :: 5 - Production/Stable", +- "Intended Audience :: Education", +- "Intended Audience :: Developers", +- "Topic :: Education", +- "Topic :: System :: Hardware", +- "License :: OSI Approved :: BSD License", +- "Programming Language :: Python :: 2", +- "Programming Language :: Python :: 2.7", +- "Programming Language :: Python :: 3", +- "Programming Language :: Python :: 3.5", +- "Programming Language :: Python :: 3.6", +- "Programming Language :: Python :: 3.7", +- "Programming Language :: Python :: 3.8", +- "Programming Language :: Python :: 3.9", +- "Programming Language :: Python :: Implementation :: PyPy", +-] +- +-__keywords__ = [ +- 'raspberrypi', +- 'gpio', +-] +- +-__requires__ = [ +- 'colorzero', +-] +- +-__extra_requires__ = { +- 'doc': ['sphinx', 'sphinx_rtd_theme'], +- 'test': ['pytest', 'coverage', 'mock'], +-} +- +-if sys.version_info[:2] == (3, 2): +- # Particular versions are required for Python 3.2 compatibility +- __extra_requires__['doc'].extend([ +- 'Jinja2<2.7', +- 'MarkupSafe<0.16', +- ]) +- __extra_requires__['test'][0] = 'pytest<3.0dev' +- __extra_requires__['test'][1] = 'coverage<4.0dev' +-elif sys.version_info[:2] == (3, 3): +- __extra_requires__['test'][0] = 'pytest<3.3dev' +-elif sys.version_info[:2] == (3, 4): +- __extra_requires__['test'][0] = 'pytest<5.0dev' ++cfg = config.read_configuration( ++ os.path.join(os.path.dirname(__file__), 'setup.cfg')) + + try: + # If we're executing on a Raspberry Pi, install all GPIO libraries for + # testing (except RPIO which doesn't work on the multi-core models yet) + with io.open('/proc/device-tree/model', 'r') as f: + if f.read().startswith('Raspberry Pi'): +- __extra_requires__['test'].append('RPi.GPIO') +- __extra_requires__['test'].append('pigpio') ++ cfg['options']['extras_require']['test'].append('RPI.GPIO') ++ cfg['options']['extras_require']['test'].append('pigpio') + except IOError as e: + if e.errno != errno.ENOENT: + raise + +-__entry_points__ = { +- 'gpiozero_pin_factories': [ +- 'pigpio = gpiozero.pins.pigpio:PiGPIOFactory', +- 'lgpio = gpiozero.pins.lgpio:LGPIOFactory', +- 'rpigpio = gpiozero.pins.rpigpio:RPiGPIOFactory', +- 'rpio = gpiozero.pins.rpio:RPIOFactory', +- 'native = gpiozero.pins.native:NativeFactory', +- 'mock = gpiozero.pins.mock:MockFactory', +- # Backwards compatible names +- 'PiGPIOPin = gpiozero.pins.pigpio:PiGPIOFactory', +- 'RPiGPIOPin = gpiozero.pins.rpigpio:RPiGPIOFactory', +- 'RPIOPin = gpiozero.pins.rpio:RPIOFactory', +- 'NativePin = gpiozero.pins.native:NativeFactory', +- ], +- 'gpiozero_mock_pin_classes': [ +- 'mockpin = gpiozero.pins.mock:MockPin', +- 'mockpwmpin = gpiozero.pins.mock:MockPWMPin', +- 'mockchargingpin = gpiozero.pins.mock:MockChargingPin', +- 'mocktriggerpin = gpiozero.pins.mock:MockTriggerPin', +- ], +- 'console_scripts': [ +- 'pinout = gpiozerocli.pinout:main', +- ] +-} +- +- +-def main(): +- import io +- with io.open(os.path.join(HERE, 'README.rst'), 'r') as readme: +- setup( +- name = __project__, +- version = __version__, +- description = __doc__, +- long_description = readme.read(), +- classifiers = __classifiers__, +- author = __author__, +- author_email = __author_email__, +- url = __url__, +- license = 'BSD-3-Clause', +- keywords = __keywords__, +- packages = find_packages(), +- include_package_data = True, +- platforms = __platforms__, +- install_requires = __requires__, +- extras_require = __extra_requires__, +- entry_points = __entry_points__, +- ) +- ++opts = cfg['metadata'] ++opts.update(cfg['options']) + +-if __name__ == '__main__': +- main() ++setup(**opts) +-- +2.41.0 + From 7b1d7f818bde9c2c967646e3a5713a6c2ede322f Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 22 Jun 2023 07:05:30 +0200 Subject: [PATCH 0798/2890] package/python-xmodem: bump to version 0.4.7 Right now there is a LICENSE file included in the package, so use it for license validation. Signed-off-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- package/python-xmodem/python-xmodem.hash | 8 ++++---- package/python-xmodem/python-xmodem.mk | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/python-xmodem/python-xmodem.hash b/package/python-xmodem/python-xmodem.hash index 33ddfeb59584..65a9b6afdaa7 100644 --- a/package/python-xmodem/python-xmodem.hash +++ b/package/python-xmodem/python-xmodem.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/xmodem/json -md5 f876cb35caf276b61990377710a3b4c4 xmodem-0.4.6.tar.gz -sha256 089737298f5738eabc43f2519efdc80b402693768f16383f7013b9e6f8f279d7 xmodem-0.4.6.tar.gz -# locally calculated -sha256 5ddb38acab95bb77e1e92e22830e358082d879d2dd59ba05577c47791edaa78e PKG-INFO +md5 0a21c269cb4d3995d13a2615c24fed0a xmodem-0.4.7.tar.gz +sha256 2f1068aa8676f0d1d112498b5786c4f8ea4f89d8f25d07d3a0f293cd21db1c35 xmodem-0.4.7.tar.gz +# Locally computed sha256 checksums +sha256 e317b0ce19724327a41e09def456579b80a7b82f9bceb2ba6933eba406f78d88 LICENSE diff --git a/package/python-xmodem/python-xmodem.mk b/package/python-xmodem/python-xmodem.mk index 739c6154d7bd..d7040f724517 100644 --- a/package/python-xmodem/python-xmodem.mk +++ b/package/python-xmodem/python-xmodem.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_XMODEM_VERSION = 0.4.6 +PYTHON_XMODEM_VERSION = 0.4.7 PYTHON_XMODEM_SOURCE = xmodem-$(PYTHON_XMODEM_VERSION).tar.gz -PYTHON_XMODEM_SITE = https://files.pythonhosted.org/packages/29/5d/a20d7957f207fc4c4c143881ca7b9617ab7700c153012372ef0a934c7710 +PYTHON_XMODEM_SITE = https://files.pythonhosted.org/packages/3d/17/fd6668a09afdc46c22990172b6f65e07dfb5bcf38960d063a7a887ca926d PYTHON_XMODEM_SETUP_TYPE = setuptools PYTHON_XMODEM_LICENSE = MIT -PYTHON_XMODEM_LICENSE_FILES = PKG-INFO +PYTHON_XMODEM_LICENSE_FILES = LICENSE $(eval $(python-package)) From 43ec76496316275c53ffbe67cb72903ad334eb98 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 22 Jun 2023 07:10:47 +0200 Subject: [PATCH 0799/2890] package/python-bleak: bump to version 0.20.2 Signed-off-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- package/python-bleak/python-bleak.hash | 4 ++-- package/python-bleak/python-bleak.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bleak/python-bleak.hash b/package/python-bleak/python-bleak.hash index 2cd038cb68b5..aae230dac246 100644 --- a/package/python-bleak/python-bleak.hash +++ b/package/python-bleak/python-bleak.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bleak/json -md5 6f9881cc85648683927ab0b9c58a1a52 bleak-0.20.0.tar.gz -sha256 7f6fe69454ad5d4c0ab05ae4a9aa1aabd6926d7128eab2fac4ef8a58a72999ee bleak-0.20.0.tar.gz +md5 97e2987748f1def21e1910a258027c17 bleak-0.20.2.tar.gz +sha256 6c92a47abe34e6dea8ffc5cea9457cbff6e1be966854839dbc25cddb36b79ee4 bleak-0.20.2.tar.gz # Locally computed sha256 checksums sha256 c4029a2b63b3824ab68be841f414addbdde20cb79cdbe272fa80c0b2abe65374 LICENSE diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index 7d3dc2831f26..9532774ae809 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLEAK_VERSION = 0.20.0 +PYTHON_BLEAK_VERSION = 0.20.2 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz -PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/aa/86/5084561ed4f31aec0322bef015db949a9f2bf0b4f6bd72b16479cf03f459 +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/87/95/a6f614fae12a6fe1cf517f8600004dd6abd4af0e0e1177c03164d0637e81 PYTHON_BLEAK_SETUP_TYPE = setuptools PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE From cf3b6ea551f1116a87d173c447162480052a171a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Jun 2023 07:17:03 +0200 Subject: [PATCH 0800/2890] package/raptor: fix build with newer versions of libxml2 Fixes: http://autobuild.buildroot.net/results/6a5/6a5139fe86b8370477dc6cb044bf29180bd145df/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- ...s-to-entities-checked-private-symbol.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/raptor/0002-Remove-the-access-to-entities-checked-private-symbol.patch diff --git a/package/raptor/0002-Remove-the-access-to-entities-checked-private-symbol.patch b/package/raptor/0002-Remove-the-access-to-entities-checked-private-symbol.patch new file mode 100644 index 000000000000..cd9542a9a902 --- /dev/null +++ b/package/raptor/0002-Remove-the-access-to-entities-checked-private-symbol.patch @@ -0,0 +1,35 @@ +From 4dbc4c1da2a033c497d84a1291c46f416a9cac51 Mon Sep 17 00:00:00 2001 +From: David Anes +Date: Thu, 4 May 2023 11:54:02 +0200 +Subject: [PATCH] Remove the access to entities 'checked' private symbol for + libxml2 2.11.0 + +Since version 2.11.0, some private symbols that were never intended +as public API/ABI have been removed from libxml2, therefore the field +'checked' is no longer present and raptor fails to build in this +scenario. + +Upstream: https://github.com/dajobe/raptor/commit/4dbc4c1da2a033c497d84a1291c46f416a9cac51 + +Signed-off-by: Bernd Kuhls +--- + src/raptor_libxml.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c +index 538c2c8e..8bcee139 100644 +--- a/src/raptor_libxml.c ++++ b/src/raptor_libxml.c +@@ -246,10 +246,11 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name) + + ret->owner = 1; + +-#if LIBXML_VERSION >= 20627 ++#if LIBXML_VERSION >= 20627 && LIBXML_VERSION < 21100 + /* Checked field was released in 2.6.27 on 2006-10-25 + * http://git.gnome.org/browse/libxml2/commit/?id=a37a6ad91a61d168ecc4b29263def3363fff4da6 + * ++ * and was later removed in version 2.11.0 + */ + + /* Mark this entity as having been checked - never do this again */ From d39ca323887c7cf4222e00fa42c2c3cd7bb8e95e Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 22 Jun 2023 07:36:17 +0200 Subject: [PATCH 0801/2890] package/python-dbus-fast: drop python-async-timeout dependency async-timeout dependency was dropped upstream for Python 3.11 (see [1]). [1] https://github.com/Bluetooth-Devices/dbus-fast/commit/1b5c9e1cb94d19925776d91196cf1b657264c494 Signed-off-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- package/python-dbus-fast/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-dbus-fast/Config.in b/package/python-dbus-fast/Config.in index c9562fecfa01..b7168106d7a0 100644 --- a/package/python-dbus-fast/Config.in +++ b/package/python-dbus-fast/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_DBUS_FAST bool "python-dbus-fast" select BR2_PACKAGE_HOST_PYTHON_CYTHON select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime - select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime help A faster version of dbus-next, a DBus library for Python with asyncio support. From b51a651817bce41c5effbc7c4b836111dd30679f Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 22 Jun 2023 07:36:18 +0200 Subject: [PATCH 0802/2890] package/python-dbus-fast: bump to version 1.86.0 Signed-off-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- package/python-dbus-fast/python-dbus-fast.hash | 4 ++-- package/python-dbus-fast/python-dbus-fast.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dbus-fast/python-dbus-fast.hash b/package/python-dbus-fast/python-dbus-fast.hash index e9a3992f8ef5..dce258c0f9fa 100644 --- a/package/python-dbus-fast/python-dbus-fast.hash +++ b/package/python-dbus-fast/python-dbus-fast.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dbus-fast/json -md5 21e3675168e3dbe807c6c8a29267241f dbus_fast-1.84.0.tar.gz -sha256 d64f1b68c1c81268e846471caeb9264a9306a6c6ad356c30d5cdf7d1ecc251a1 dbus_fast-1.84.0.tar.gz +md5 1fc61ba29ed79162c651be4bae4a9dee dbus_fast-1.86.0.tar.gz +sha256 ca376a360f1bc2c3d59e9edfb5e4de5be389cca37e8c92f4539176ddf755341e dbus_fast-1.86.0.tar.gz # Locally computed sha256 checksums sha256 c37e9c75110e01d1f0c5360dc7d7776a30ac5f70d2440db214423e4b7a77a6af LICENSE diff --git a/package/python-dbus-fast/python-dbus-fast.mk b/package/python-dbus-fast/python-dbus-fast.mk index 9dd88f613f24..1456d5600def 100644 --- a/package/python-dbus-fast/python-dbus-fast.mk +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DBUS_FAST_VERSION = 1.84.0 +PYTHON_DBUS_FAST_VERSION = 1.86.0 PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz -PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/81/67/a83522d6692a72911c3586e2fcd2363ce22d1522a7e17e1012f255a6083b +PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/08/9d/ad27f451198724d6e5b4f0435a13f2b2f839716bbcdede2ccf6d99743ec5 PYTHON_DBUS_FAST_SETUP_TYPE = setuptools PYTHON_DBUS_FAST_LICENSE = MIT PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE From 7a27b230ab023b3dfd9ac1e7f0d0b8bbde1928c1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Jun 2023 16:44:16 +0200 Subject: [PATCH 0803/2890] package/audit: fix musl build Fixes: http://autobuild.buildroot.net/results/a52/a52ff08c3373ffb253b89e9197671583354d1360/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- ...ute_malloc__-with-__attribute__-__ma.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch diff --git a/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch new file mode 100644 index 000000000000..1a276ca2df5e --- /dev/null +++ b/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch @@ -0,0 +1,39 @@ +From 79c8d6a2755c9dfa00a5e86378e89a94eef0504d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 9 Aug 2022 23:57:03 -0700 +Subject: [PATCH] Replace __attribute_malloc__ with + __attribute__((__malloc__)) + +__attribute_malloc__ is not available on musl + +Fixes +| ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator +| __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); +| ^ + +Signed-off-by: Khem Raj + +Upstream: https://github.com/linux-audit/audit-userspace/pull/311 + +Signed-off-by: Bernd Kuhls +--- + + auparse/auparse.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/auparse/auparse.h b/auparse/auparse.h +index 95cf256d..c7dbe5ff 100644 +--- a/auparse/auparse.h ++++ b/auparse/auparse.h +@@ -51,7 +51,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au, + void auparse_destroy(auparse_state_t *au); + void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what); + auparse_state_t *auparse_init(ausource_t source, const void *b) +- __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); ++ __attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1); + int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len) + __attr_access ((__read_only__, 2, 3)); + int auparse_feed(auparse_state_t *au, const char *data, size_t data_len) +-- +2.37.1 + From afbc2f47fb0bd820e5a98e14c2271f016b9fdce4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Jun 2023 16:44:17 +0200 Subject: [PATCH 0804/2890] package/audit: bump version to 3.1.1 Changelog: https://github.com/linux-audit/audit-userspace/blob/v3.1.1/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/audit/audit.hash | 2 +- package/audit/audit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 87c00ec241d7..310b0a0f6af7 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 b5cf3cdabb2786c08b1de3599a3b1a547e55f7a9f9c1eb2078f5b44cf44e8378 audit-3.1.tar.gz +sha256 46e46b37623cce09e6ee134e78d668afc34f4e1c870c853ef12e4193078cfe87 audit-3.1.1.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 252f5865b5af..e77e06bd6ba6 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 3.1 +AUDIT_VERSION = 3.1.1 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB From 52ae2a4e1d10da4ea46bc730db69a40d79eb835a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 25 Jun 2023 19:47:06 +0200 Subject: [PATCH 0805/2890] package/dbus: security bump to version 1.2.28 Fixes the following security issues: - CVE-2023-34969: Fix an assertion failure in dbus-daemon when a privileged Monitoring connection (dbus-monitor, busctl monitor, gdbus monitor or similar) is active, and a message from the bus driver cannot be delivered to a client connection due to rules or outgoing message quota. This is a denial of service if triggered maliciously by a local attacker. - Fix an incorrect assertion that could be used to crash dbus-daemon or other users of DBusServer prior to authentication, if libdbus was compiled with assertions enabled. For details, see the NEWS file: https://gitlab.freedesktop.org/dbus/dbus/blob/dbus-1.12/NEWS Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 17c70004bad9..0e48d4dafde7 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.24.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.28.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 bc42d196c1756ac520d61bf3ccd6f42013617def45dd1e591a6091abf51dca38 dbus-1.12.24.tar.gz +sha256 9da1e3f2b73f75eec0a9e4509d64be43909d1f2853fe809528a0a53984d76420 dbus-1.12.28.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index b3a79c431d81..99d2c4301c6f 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -6,7 +6,7 @@ # When updating dbus, check if there are changes in session.conf and # system.conf, and update the versions in the dbus-broker package accordingly. -DBUS_VERSION = 1.12.24 +DBUS_VERSION = 1.12.28 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From 9d58b525fcfd0d92fcdd3c66d7858213c4b139c6 Mon Sep 17 00:00:00 2001 From: Oleg Lyovin Date: Sun, 25 Jun 2023 19:51:21 +0300 Subject: [PATCH 0806/2890] package/libcgroup: allow to build with musl and uClibc libcgroup depends on fts API which is missing in musl and uClibc and provided by musl-fts package. This patch makes libcgroup dependent on musl-fts for non-glibc configurations. Signed-off-by: Oleg Lyovin Signed-off-by: Arnout Vandecappelle --- package/libcgroup/Config.in | 7 +++---- package/libcgroup/libcgroup.mk | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in index 03efa71e6bdf..546b5f35609c 100644 --- a/package/libcgroup/Config.in +++ b/package/libcgroup/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_LIBCGROUP bool "libcgroup" depends on BR2_INSTALL_LIBSTDCPP - # libcgroup uses which is not included by default in uClibc - depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC help libcgroup is a library that abstracts the control group file system in Linux. @@ -18,5 +17,5 @@ config BR2_PACKAGE_LIBCGROUP_TOOLS endif -comment "libcgroup needs a glibc toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC +comment "libcgroup needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP \ No newline at end of file diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk index fb0b646c5160..e3de48c5617f 100644 --- a/package/libcgroup/libcgroup.mk +++ b/package/libcgroup/libcgroup.mk @@ -36,4 +36,8 @@ else LIBCGROUP_CONF_OPTS += --disable-pam endif +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +LIBCGROUP_DEPENDENCIES += musl-fts +endif + $(eval $(autotools-package)) From 67f840d555d54bc9fdaf3fdb70c188b037e3b5cc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Jun 2023 18:53:40 +0200 Subject: [PATCH 0807/2890] package/x11r7/xorgproto: bump version to 2023.2 Release notes: https://lists.x.org/archives/xorg-announce/2023-June/003408.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/x11r7/xorgproto/xorgproto.hash | 6 +++--- package/x11r7/xorgproto/xorgproto.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash index 10655f9dd1b0..37ad9c7c04a8 100644 --- a/package/x11r7/xorgproto/xorgproto.hash +++ b/package/x11r7/xorgproto/xorgproto.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-June/003404.html -sha256 6545e41aceba43c13497ac8084dad5db6deef580a5ea7d0bd7872cfd1be72a13 xorgproto-2023.1.tar.xz -sha512 342128ca2e9a6806a7ff33f426434bee29626a13a592b9544654a010cb7be208b0862e3cd063773a0003ca0ec7d48361cfcc384fe207efe9ecb6ec3f2b8e7d56 xorgproto-2023.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-June/003408.html +sha256 b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c xorgproto-2023.2.tar.xz +sha512 af0a8c8094fc6a490a886a8c048175762b6334798f2e48b6f6e19a7bb39ddbef05fa1237c4e9d9f1d870d24f5ca7a7c463044c41ceebd108f8ab0816677a582d xorgproto-2023.2.tar.xz # Locally computed sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk index 899f505f1c26..f6e5a5a43455 100644 --- a/package/x11r7/xorgproto/xorgproto.mk +++ b/package/x11r7/xorgproto/xorgproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XORGPROTO_VERSION = 2023.1 +XORGPROTO_VERSION = 2023.2 XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.xz XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT From 72bb3e89aa3152d47584682f7a699ddb94d4abc5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Jun 2023 19:57:05 +0200 Subject: [PATCH 0808/2890] package/quickjs: disable on microblaze quickjs unconditionally uses FE_{DOWN,UP}WARD and so fails to build on microblaze since its addition in commit 5d50793659acb95050c110d5fc05399df20ce30b Fixes: http://autobuild.buildroot.net/results/3b1/3b1b1f91998bfdec65f3e6fb8931df9c8871b953/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/quickjs/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in index dc466241bac0..292dba86d003 100644 --- a/package/quickjs/Config.in +++ b/package/quickjs/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_QUICKJS bool "quickjs" + depends on !BR2_microblaze # fenv.h lacks FE_{DOWN,UP}WARD depends on !BR2_nios2 # fenv.h lacks FE_{DOWN,UP}WARD on nios2 depends on !BR2_STATIC_LIBS # No way to check for fenv support. @@ -15,6 +16,7 @@ config BR2_PACKAGE_QUICKJS https://bellard.org/quickjs/ comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library" + depends on !BR2_microblaze depends on !BR2_nios2 depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \ From 1880a061e8a34b759a62da9ef0eed8ab566c88dd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Jun 2023 19:57:06 +0200 Subject: [PATCH 0809/2890] package/quickjs: disable on sh* quickjs unconditionally uses FE_{DOWN,UP}WARD and so fails to build on sh* since its addition in commit 5d50793659acb95050c110d5fc05399df20ce30b Fixes: sh4: http://autobuild.buildroot.net/results/46d/46d7da58a857939ee3a33f60ab64ad278157c3bd/ sh4a: http://autobuild.buildroot.net/results/b1d/b1db05e79e5505c6606524e54e159224b633eac2/ sh4aeb: http://autobuild.buildroot.net/results/c30/c307a1b67142405f81c9276056b28bea366f2ccf/ sh4eb: http://autobuild.buildroot.net/results/945/945b508385ba5aa25f982f8a8493628fa828e472/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/quickjs/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in index 292dba86d003..fd174bc65738 100644 --- a/package/quickjs/Config.in +++ b/package/quickjs/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_QUICKJS bool "quickjs" depends on !BR2_microblaze # fenv.h lacks FE_{DOWN,UP}WARD depends on !BR2_nios2 # fenv.h lacks FE_{DOWN,UP}WARD on nios2 + depends on !BR2_sh # fenv.h lacks FE_{DOWN,UP}WARD depends on !BR2_STATIC_LIBS # No way to check for fenv support. depends on !BR2_TOOLCHAIN_USES_UCLIBC @@ -18,6 +19,7 @@ config BR2_PACKAGE_QUICKJS comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library" depends on !BR2_microblaze depends on !BR2_nios2 + depends on !BR2_sh depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_HOST_GCC_AT_LEAST_4_9 From 2fa8914bf1dad02e7110ba94a51796511151e7a4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Jun 2023 07:17:02 +0200 Subject: [PATCH 0810/2890] package/raptor: security bump version to 2.0.16 This version included the patches removed by this commit, no new CVEs were fixed. Release notes: https://librdf.org/raptor/RELEASE.html#rel2_0_16 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 2 - ...pace-declarations-correctly-for-XML-.patch | 47 ------------------- ...are-namespace-declarations-correctly.patch | 33 ------------- package/raptor/raptor.hash | 4 +- package/raptor/raptor.mk | 8 +--- 5 files changed, 3 insertions(+), 91 deletions(-) delete mode 100644 package/raptor/0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch delete mode 100644 package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch diff --git a/.checkpackageignore b/.checkpackageignore index d0378929ee3b..2e5c833156f6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1338,8 +1338,6 @@ package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch Upstrea package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch Upstream package/ranger/0001-colorscheme-check-for-compiled-python-files.patch Upstream package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch Upstream -package/raptor/0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch Upstream -package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch Upstream package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch Upstream package/rdesktop/0001-8bit-colors.patch Sob Upstream package/read-edid/0001-Fix-install-file-list.patch Upstream diff --git a/package/raptor/0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch b/package/raptor/0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch deleted file mode 100644 index 406e265cf33d..000000000000 --- a/package/raptor/0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001 -From: Dave Beckett -Date: Sun, 16 Apr 2017 23:15:12 +0100 -Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer - -(raptor_xml_writer_start_element_common): Calculate max including for -each attribute a potential name and value. - -Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617 -and #0000618 http://bugs.librdf.org/mantis/view.php?id=618 - -[Peter: fixes CVE-2017-18926, upstream: - https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f] -Signed-off-by: Peter Korsgaard ---- - src/raptor_xml_writer.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c -index 693b9468..0d3a36a5 100644 ---- a/src/raptor_xml_writer.c -+++ b/src/raptor_xml_writer.c -@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, - size_t nspace_declarations_count = 0; - unsigned int i; - -- /* max is 1 per element and 1 for each attribute + size of declared */ - if(nstack) { -- int nspace_max_count = element->attribute_count+1; -+ int nspace_max_count = element->attribute_count * 2; /* attr and value */ -+ if(element->name->nspace) -+ nspace_max_count++; - if(element->declared_nspaces) - nspace_max_count += raptor_sequence_size(element->declared_nspaces); - if(element->xml_language) -@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, - } - } - -- /* Add the attribute + value */ -+ /* Add the attribute's value */ - nspace_declarations[nspace_declarations_count].declaration= - raptor_qname_format_as_xml(element->attributes[i], - &nspace_declarations[nspace_declarations_count].length); --- -2.20.1 - diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch deleted file mode 100644 index a48a583cb1e6..000000000000 --- a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 -From: Dave Beckett -Date: Sat, 18 Sep 2021 17:40:00 -0700 -Subject: [PATCH] XML Writer : compare namespace declarations correctly - -Apply patch from -0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 -that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 -which overwrote heap during XML writing in parse type literal -content. This was detected with clang asan. - -Thanks to Michael Stahl / mst2 for the fix. - -[Retrieved from: -https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] -Signed-off-by: Fabrice Fontaine ---- - src/raptor_xml_writer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c -index 56993dc3..4426d38c 100644 ---- a/src/raptor_xml_writer.c -+++ b/src/raptor_xml_writer.c -@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, - - /* check it wasn't an earlier declaration too */ - for(j = 0; j < nspace_declarations_count; j++) -- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { -+ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { - declare_me = 0; - break; - } diff --git a/package/raptor/raptor.hash b/package/raptor/raptor.hash index 2a54bf270dee..05e9c53902d6 100644 --- a/package/raptor/raptor.hash +++ b/package/raptor/raptor.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed raptor2-2.0.15.tar.gz -sha256 6b926a47abfb87451c436fbd4a868defec963d0232c70b806ac02d4a2a6e1968 LICENSE.txt +sha256 089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680 raptor2-2.0.16.tar.gz +sha256 0f0c719a05c9f7a0be2051ab83c1470837f595ed23e34989f46fd8eb45cfc251 LICENSE.txt diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 69ac121300e4..ec7643ce3dd9 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAPTOR_VERSION = 2.0.15 +RAPTOR_VERSION = 2.0.16 RAPTOR_SOURCE = raptor2-$(RAPTOR_VERSION).tar.gz RAPTOR_SITE = http://download.librdf.org/source RAPTOR_DEPENDENCIES = libxml2 libxslt @@ -17,12 +17,6 @@ RAPTOR_INSTALL_STAGING = YES # Flag is added to make sure the patch is applied for the configure.ac of raptor. RAPTOR_AUTORECONF = YES -# 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch -RAPTOR_IGNORE_CVES += CVE-2017-18926 - -# 0003-XML-Writer-compare-namespace-declarations-correctly.patch -RAPTOR_IGNORE_CVES += CVE-2020-25713 - RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config From fd6b33426962727b97e2ea2a63bfb7a018adcfaf Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 25 Jun 2023 21:42:57 +0200 Subject: [PATCH 0811/2890] package/libcgroup: add newline at end of file In commit 9d58b525fcfd0d92fcdd3c66d7858213c4b139c6 the newline at the end got accidentally removed. Re-add it. Reported by check-package. Signed-off-by: Arnout Vandecappelle --- package/libcgroup/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in index 546b5f35609c..9326b967ed10 100644 --- a/package/libcgroup/Config.in +++ b/package/libcgroup/Config.in @@ -18,4 +18,5 @@ config BR2_PACKAGE_LIBCGROUP_TOOLS endif comment "libcgroup needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP \ No newline at end of file + depends on !BR2_INSTALL_LIBSTDCPP + From 3223a34ee546ca1e15d022cf0ae6253187a79af9 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Tue, 20 Jun 2023 10:38:12 -0700 Subject: [PATCH 0812/2890] package/alsa-plugins: fix dependencies for the alsa plugin package The alsa-utils will remove and create the /usr/share/alsa dir as a whole and since the alsa plugins needs to add config into this same directory it should come after those install steps. Also, the bluez alsa needs the plugins installed to find them during the configuration phases - so, interlock the plugins when configured. Signed-off-by: Charles Hardin Signed-off-by: Arnout Vandecappelle --- package/alsa-plugins/alsa-plugins.mk | 4 ++++ package/bluez-alsa/bluez-alsa.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index 5728ebfe37b2..d23a81c5eed7 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -20,6 +20,10 @@ ALSA_PLUGINS_CONF_OPTS = \ --disable-maemo-resource-manager \ --with-speex=no +ifeq ($(BR2_PACKAGE_ALSA_UTILS),y) +ALSA_PLUGINS_DEPENDENCIES += alsa-utils +endif + ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) ALSA_PLUGINS_CONF_OPTS += --enable-samplerate ALSA_PLUGINS_DEPENDENCIES += libsamplerate diff --git a/package/bluez-alsa/bluez-alsa.mk b/package/bluez-alsa/bluez-alsa.mk index 83dfce61776c..649810b0ad43 100644 --- a/package/bluez-alsa/bluez-alsa.mk +++ b/package/bluez-alsa/bluez-alsa.mk @@ -20,6 +20,10 @@ BLUEZ_ALSA_CONF_OPTS = \ --with-alsaplugindir=/usr/lib/alsa-lib \ --with-alsaconfdir=/etc/alsa/conf.d +ifeq ($(BR2_PACKAGE_ALSA_PLUGINS),y) +BLUEZ_ALSA_DEPENDENCIES += alsa-plugins +endif + ifeq ($(BR2_PACKAGE_FDK_AAC),y) BLUEZ_ALSA_DEPENDENCIES += fdk-aac BLUEZ_ALSA_CONF_OPTS += --enable-aac From 5ae444e380da0f9c2c15f2d39c9ae90d757fb325 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 25 Jun 2023 21:42:57 +0200 Subject: [PATCH 0813/2890] package/libcgroup: remove empty line at end of file In commit 9d58b525fcfd0d92fcdd3c66d7858213c4b139c6 the newline at the end got accidentally removed. Commit fd6b33426962727b97e2ea2a63bfb7a018adcfaf re-added the newline, but accidentally added an empty line as well. Remove the empty line. Reported by check-package. Signed-off-by: Arnout Vandecappelle --- package/libcgroup/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in index 9326b967ed10..b9333be2a299 100644 --- a/package/libcgroup/Config.in +++ b/package/libcgroup/Config.in @@ -19,4 +19,3 @@ endif comment "libcgroup needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP - From cb496970c0c7117f9f00d8495e234871f2bae4c1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 25 Jun 2023 22:37:35 +0200 Subject: [PATCH 0814/2890] package/tiff: security bump to version 4.5.1 Fixes the following security issues: - CVE-2023-1916: A flaw was found in tiffcrop, a program distributed by the libtiff package. A specially crafted tiff file can lead to an out-of-bounds read in the extractImageSection function in tools/tiffcrop.c, resulting in a denial of service and limited information disclosure. This issue affects libtiff versions 4.x. - CVE-2023-25434: libtiff 4.5.0 is vulnerable to Buffer Overflow via extractContigSamplesBytes() at /libtiff/tools/tiffcrop.c:3215. - CVE-2023-26965: loadImage() in tools/tiffcrop.c in LibTIFF through 4.5.0 has a heap-based use after free via a crafted TIFF image Drop the now upstream 0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch. Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...rect-simple-copy-paste-error-Fix-488.patch | 28 ------------------- package/tiff/tiff.hash | 2 +- package/tiff/tiff.mk | 5 +--- 4 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch diff --git a/.checkpackageignore b/.checkpackageignore index 2e5c833156f6..dadc8e097813 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1503,7 +1503,6 @@ package/ti-gfx/esrev.sh Shellcheck package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch Upstream package/ti-sgx-um/S80ti-sgx Variables package/ti-utils/0001-plt.h-fix-build-with-gcc-10.patch Upstream -package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch Upstream package/tinyalsa/0001-include-time.h-before-asound.h.patch Upstream package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch Upstream package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch Upstream diff --git a/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch deleted file mode 100644 index 73c0d10ffc49..000000000000 --- a/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 97d65859bc29ee334012e9c73022d8a8e55ed586 Mon Sep 17 00:00:00 2001 -From: Su Laus -Date: Sat, 21 Jan 2023 15:58:10 +0000 -Subject: [PATCH] tiffcrop: Correct simple copy paste error. Fix #488. - -[Retrieved from: -https://gitlab.com/libtiff/libtiff/-/commit/97d65859bc29ee334012e9c73022d8a8e55ed586] -Signed-off-by: Fabrice Fontaine ---- - tools/tiffcrop.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c -index 14fa18da..7db69883 100644 ---- a/tools/tiffcrop.c -+++ b/tools/tiffcrop.c -@@ -8591,7 +8591,7 @@ static int processCropSelections(struct image_data *image, - cropsize + NUM_BUFF_OVERSIZE_BYTES); - else - { -- prev_cropsize = seg_buffs[0].size; -+ prev_cropsize = seg_buffs[i].size; - if (prev_cropsize < cropsize) - { - next_buff = _TIFFrealloc( --- -GitLab - diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 73732892a54c..0fa503a02a92 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464 tiff-4.5.0.tar.gz +sha256 d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b tiff-4.5.1.tar.gz sha256 0780558a8bfba0af1160ec1ff11ade4f41c0d7deafd6ecfc796b492a788e380d LICENSE.md diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f9754a4b4906..0006f461a029 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIFF_VERSION = 4.5.0 +TIFF_VERSION = 4.5.1 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = LICENSE.md @@ -12,9 +12,6 @@ TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES -# 0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch -TIFF_IGNORE_CVES += CVE-2022-48281 - # webp has a (optional) dependency on tiff, so we can't have webp # support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ From 02f6d77fbda975d01e16da0b4a031776bc1a94d2 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 27 Jun 2023 00:00:21 +0800 Subject: [PATCH 0815/2890] configs/hifive_unleashed: Update to use OpenSBI 1.2 Since the rest of RISC-V boards have been switched to use OpenSBI 1.2, let's update hifive_unleashed to use OpenSBI 1.2 too. Resolves: https://bugs.busybox.net/show_bug.cgi?id=15658 Signed-off-by: Bin Meng Signed-off-by: Yann E. MORIN --- configs/hifive_unleashed_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 2b6ee6c08e59..0440b14ba550 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -38,7 +38,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # Bootloader BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="0.9" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y From 37d0e147cdda10c84d00031999b8a3cf830c54cd Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 27 Jun 2023 00:00:22 +0800 Subject: [PATCH 0816/2890] configs/hifive_unleashed: Update to use U-Boot v2023.04 With upstream commit ae2d9506a36c ("riscv: sifive: Rename fu540 board to unleashed") in U-Boot v2021.07 release, the defconfig for SiFive Unleashed board has been changed to sifive_unleashed_defconfig. Also newer U-Boot has deprecated the usage of SPL_FIT_GENERATOR to generate u-boot.itb hence there is no 'u-boot.itb' target in the U-Boot Makefile anymore. Instead binman is used to assemble the u-boot.itb image. We will need to switch to BR2_TARGET_UBOOT_FORMAT_CUSTOM for installing u-boot.itb. Switch over to use the latest U-Boot v2023.04 release. Signed-off-by: Bin Meng Signed-off-by: Yann E. MORIN --- configs/hifive_unleashed_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 0440b14ba550..35cb3558f948 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -42,12 +42,13 @@ BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_fu540" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_unleashed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y -BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y # Host tools From 311f04cee483fbb967ca132476094ed0e7903ee3 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 27 Jun 2023 00:00:23 +0800 Subject: [PATCH 0817/2890] configs/hifive_unleashed: Enable BR2_RISCV_ISA_CUSTOM_RVA explicitly BR2_RISCV_ISA_CUSTOM_RVA is currently not explicitly listed as it is selected by BR2_riscv_custom. This looks confusing. Let's enable it. Signed-off-by: Bin Meng Signed-off-by: Yann E. MORIN --- configs/hifive_unleashed_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 35cb3558f948..80c5e48f964c 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -2,6 +2,7 @@ BR2_riscv=y BR2_riscv_custom=y BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVA=y BR2_RISCV_ISA_CUSTOM_RVF=y BR2_RISCV_ISA_CUSTOM_RVD=y BR2_RISCV_ISA_CUSTOM_RVC=y From 3a4ce27f562b1d8f56e3ed256f035c1ee60301ec Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 27 Jun 2023 00:00:24 +0800 Subject: [PATCH 0818/2890] configs/beaglev_defconfig: Enable BR2_RISCV_ISA_CUSTOM_RVA explicitly BR2_RISCV_ISA_CUSTOM_RVA is currently not explicitly listed as it is selected by BR2_riscv_custom. This looks confusing. Let's enable it. Signed-off-by: Bin Meng Signed-off-by: Yann E. MORIN --- configs/beaglev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig index 79af8c2ece83..42c732b97340 100644 --- a/configs/beaglev_defconfig +++ b/configs/beaglev_defconfig @@ -1,6 +1,7 @@ BR2_riscv=y BR2_riscv_custom=y BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVA=y BR2_RISCV_ISA_CUSTOM_RVF=y BR2_RISCV_ISA_CUSTOM_RVD=y BR2_RISCV_ISA_CUSTOM_RVC=y From 5c85830a6b694fd91dc9d6477c3fb94351e99b6b Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 27 Jun 2023 00:00:25 +0800 Subject: [PATCH 0819/2890] arch/Config.in.riscv: Remove BR2_RISCV_ISA_CUSTOM_RVA from BR2_riscv_custom BR2_riscv_custom should only contain the basic I extension. The A extension should be optional and selected by board configs. Signed-off-by: Bin Meng Signed-off-by: Yann E. MORIN --- arch/Config.in.riscv | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv index b5e84389e0a0..853e8deb0612 100644 --- a/arch/Config.in.riscv +++ b/arch/Config.in.riscv @@ -35,7 +35,6 @@ config BR2_riscv_g config BR2_riscv_custom bool "Custom architecture" select BR2_RISCV_ISA_RVI - select BR2_RISCV_ISA_CUSTOM_RVA endchoice From 59c4515e92c17c807587f27fff5ce175c39d8cf2 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 27 Jun 2023 00:00:27 +0800 Subject: [PATCH 0820/2890] boot/opensbi: Config.in: Cosmetic style fix Use space intead of tab before 'if'. Signed-off-by: Bin Meng Signed-off-by: Yann E. MORIN --- boot/opensbi/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in index 5e6b8d158ebf..99c4989479cb 100644 --- a/boot/opensbi/Config.in +++ b/boot/opensbi/Config.in @@ -57,10 +57,10 @@ endif config BR2_TARGET_OPENSBI_VERSION string - default "1.2" if BR2_TARGET_OPENSBI_LATEST_VERSION + default "1.2" if BR2_TARGET_OPENSBI_LATEST_VERSION default BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE \ if BR2_TARGET_OPENSBI_CUSTOM_VERSION - default "custom" if BR2_TARGET_OPENSBI_CUSTOM_TARBALL + default "custom" if BR2_TARGET_OPENSBI_CUSTOM_TARBALL default BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPENSBI_CUSTOM_GIT From 39f1812e47518806248e753f8fa80c8ef732822b Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 27 Jun 2023 00:00:28 +0800 Subject: [PATCH 0821/2890] boot/opensbi: Bump to version 1.3 Signed-off-by: Bin Meng Signed-off-by: Yann E. MORIN --- boot/opensbi/Config.in | 4 ++-- boot/opensbi/opensbi.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in index 99c4989479cb..de2f0aae20db 100644 --- a/boot/opensbi/Config.in +++ b/boot/opensbi/Config.in @@ -19,7 +19,7 @@ choice Select the specific OpenSBI version you want to use config BR2_TARGET_OPENSBI_LATEST_VERSION - bool "1.2" + bool "1.3" config BR2_TARGET_OPENSBI_CUSTOM_VERSION bool "Custom version" @@ -57,7 +57,7 @@ endif config BR2_TARGET_OPENSBI_VERSION string - default "1.2" if BR2_TARGET_OPENSBI_LATEST_VERSION + default "1.3" if BR2_TARGET_OPENSBI_LATEST_VERSION default BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE \ if BR2_TARGET_OPENSBI_CUSTOM_VERSION default "custom" if BR2_TARGET_OPENSBI_CUSTOM_TARBALL diff --git a/boot/opensbi/opensbi.hash b/boot/opensbi/opensbi.hash index dbc77e856fe3..980fb141dcfe 100644 --- a/boot/opensbi/opensbi.hash +++ b/boot/opensbi/opensbi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 8fcbce598a73acc2c7f7d5607d46b9d5107d3ecbede8f68f42631dcfc25ef2b2 opensbi-1.2.tar.gz +sha256 2c0501eb3475f463b15f5b8531996f64604ea49e0e3ed040ecbd1fc27ecd8c5c opensbi-1.3.tar.gz sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD From 199301a6d59af20f6a7bb6da0d22bffb64baaea4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Jun 2023 20:11:48 +0200 Subject: [PATCH 0822/2890] package/dav1d: bump version to 1.2.1 Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index 1af699dbe361..68757060bfeb 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From https://download.videolan.org/pub/videolan/dav1d/1.2.0/dav1d-1.2.0.tar.xz.sha256 -sha256 231bed8bc1bb28a41d88da6b4c2c118de84b92e5f1d67caffa1b7f81aaea8c6e dav1d-1.2.0.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.2.1/dav1d-1.2.1.tar.xz.sha256 +sha256 4e33eb61ec54c768a16da0cf8fa0928b4c4593f5f804a3c887d4a21c318340b2 dav1d-1.2.1.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index f8d4464cd4fb..670a81d1c85b 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 1.2.0 +DAV1D_VERSION = 1.2.1 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause From de6c233a4e79b6e6e7d889740a0ded57c1fb7e39 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Jun 2023 20:16:32 +0200 Subject: [PATCH 0823/2890] package/sqlite: bump version to 3.42.0 Release notes: https://sqlite.org/releaselog/3_42_0.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index a7b56cf25db8..39758f2b43ff 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e98c100dd1da4e30fa460761dab7c0b91a50b785e167f8c57acc46514fae9499 sqlite-autoconf-3410200.tar.gz +sha256 7abcfd161c6e2742ca5c6c0895d1f853c940f203304a0b49da4e1eca5d088ca6 sqlite-autoconf-3420000.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 6c014266582c..1576d6a3e188 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.41.2 -SQLITE_TAR_VERSION = 3410200 +SQLITE_VERSION = 3.42.0 +SQLITE_TAR_VERSION = 3420000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2023 SQLITE_LICENSE = Public domain From 8863384dff263356237a3a0e793076bbc7223252 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Jun 2023 20:18:50 +0200 Subject: [PATCH 0824/2890] package/xmrig: bump version to 6.19.3 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 665a710c7096..4eccef4806e1 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84b7d1cc0bb818d471d47a5e663839ae8ba8b8a3b641e227b03903125446e12c xmrig-6.19.2.tar.gz +sha256 8c7e48690c8e0f6cbc22c2ad2093328152e34208d1c33dc24008dfcab22ea3eb xmrig-6.19.3.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index ee2d5f595929..a49580fc7fdb 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.19.2 +XMRIG_VERSION = 6.19.3 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From 0bdfbefbf5e390f2f9cc962b544fc8099f8c5d11 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Jun 2023 19:58:49 +0200 Subject: [PATCH 0825/2890] package/libva-utils: bump version to 2.18.2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libva-utils/libva-utils.hash | 2 +- package/libva-utils/libva-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 9b1d9cb21086..3cde9cd28418 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 724a54524d9156967d3508f294ce5c45d94cb8f7326537c24ee7fcf59e70de91 libva-utils-2.18.1.tar.gz +sha256 c4c0555c96ca678f9ac47fbb56f0ae56ca39fd50fe3553bae5cb13117bfcb406 libva-utils-2.18.2.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 9e6ee3c87800..38d46a08c9b1 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.18.1 +LIBVA_UTILS_VERSION = 2.18.2 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From 5ec83ecb12a52874b13a0ec171a3971ae2d2b6e1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Jun 2023 20:09:36 +0200 Subject: [PATCH 0826/2890] package/alsa-lib: bump version to 1.2.9 Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.8_v1.2.9#alsa-lib Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index 898cbcd60df0..f6735cd5409c 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1ab01b74e33425ca99c2e36c0844fd6888273193bd898240fe8f93accbcbf347 alsa-lib-1.2.8.tar.bz2 +sha256 dc9c643fdc4ccfd0572cc685858dd41e08afb583f30460b317e4188275f615b2 alsa-lib-1.2.9.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index a0a9617514c8..70f4c969d575 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.8 +ALSA_LIB_VERSION = 1.2.9 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) From 401d1a0b0d2ef3acb934cc21110791207a979695 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Jun 2023 20:09:37 +0200 Subject: [PATCH 0827/2890] package/alsa-utils: bump version to 1.2.9 Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.8_v1.2.9#alsa-utils Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index 66c04d261f57..44cd928e453e 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e140fa604c351f36bd72167c8860c69d81b964ae6ab53992d6434dde38e9333c alsa-utils-1.2.8.tar.bz2 +sha256 e7623d4525595f92e11ce25ee9a97f2040a14c6e4dcd027aa96e06cbce7817bd alsa-utils-1.2.9.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 8c43f58b76f7..20fe65afe6c1 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.8 +ALSA_UTILS_VERSION = 1.2.9 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 From fe9fc288d46483948e352794e0c8db5e27804858 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 12:47:53 +0200 Subject: [PATCH 0828/2890] package/sofia-sip: bump version to 1.13.15 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 4617725571ad..f7293bd262d1 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz +sha256 846b3d5eef57702e8d18967070b538030252116af1500f4baa78ad068c5fdd64 sofia-sip-1.13.15.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 59c365365be9..9734da5020c7 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.12 +SOFIA_SIP_VERSION = 1.13.15 SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) SOFIA_SIP_INSTALL_STAGING = YES # Fetched from github, no pre-generated configure script provided From c97f27283b36ffc39dfb6223caee6055997b3234 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 11 Jun 2023 15:34:01 +0200 Subject: [PATCH 0829/2890] package/dmidecode: bump to version 3.5 For change log, see: https://git.savannah.gnu.org/cgit/dmidecode.git/tree/NEWS?h=dmidecode-3-5 Note: this patch also adds a comment about pgp signature verification in the hash file. Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/dmidecode/dmidecode.hash | 5 +++-- package/dmidecode/dmidecode.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/dmidecode/dmidecode.hash b/package/dmidecode/dmidecode.hash index ec5484e66787..654c4cc537c6 100644 --- a/package/dmidecode/dmidecode.hash +++ b/package/dmidecode/dmidecode.hash @@ -1,3 +1,4 @@ -# Locally computed -sha256 43cba851d8467c9979ccdbeab192eb6638c7d3a697eba5ddb779da8837542212 dmidecode-3.4.tar.xz +# Locally computed after checking pgp signature from: +# https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.5.tar.xz.sig +sha256 79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073 dmidecode-3.5.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk index 352cdb106c47..353978daa941 100644 --- a/package/dmidecode/dmidecode.mk +++ b/package/dmidecode/dmidecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -DMIDECODE_VERSION = 3.4 +DMIDECODE_VERSION = 3.5 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode DMIDECODE_LICENSE = GPL-2.0+ From 3fb07a60d4388eef38099a4a6a79d2ddef389f6f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 19:14:40 +0200 Subject: [PATCH 0830/2890] package/pciutils: bump version to 3.10.0 Changelog: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/tree/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/pciutils/pciutils.hash | 2 +- package/pciutils/pciutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pciutils/pciutils.hash b/package/pciutils/pciutils.hash index 93df1558ffd6..2ac28d327b58 100644 --- a/package/pciutils/pciutils.hash +++ b/package/pciutils/pciutils.hash @@ -1,3 +1,3 @@ # From https://www.kernel.org/pub/software/utils/pciutils/sha256sums.asc -sha256 cdea7ae97239dee23249a09c68a19a287a3f109fbeb2c232ebb616cb38599012 pciutils-3.9.0.tar.xz +sha256 238a2e27166730e53a17fe07bfad229e07fa39b618117e5944b6d7eda9fbb0e9 pciutils-3.10.0.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 95b377d844fc..a6708ce94b94 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCIUTILS_VERSION = 3.9.0 +PCIUTILS_VERSION = 3.10.0 PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz PCIUTILS_INSTALL_STAGING = YES From 0349d50131fb59d53363a284a8593a3f5e7565a2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 19:20:42 +0200 Subject: [PATCH 0831/2890] package/pngquant: bump version to 2.18.0 Bump this package to the latest release of the package written in C. Version 3.x are written in Rust: https://pngquant.org/rust.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/pngquant/pngquant.hash | 2 +- package/pngquant/pngquant.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pngquant/pngquant.hash b/package/pngquant/pngquant.hash index a7ea4aa997ff..2926dfb6de20 100644 --- a/package/pngquant/pngquant.hash +++ b/package/pngquant/pngquant.hash @@ -1,4 +1,4 @@ # From https://pngquant.org/releases.html -sha256 a27cf0e64db499ccb3ddae9b36036e881f78293e46ec27a9e7a86a3802fcda66 pngquant-2.17.0-src.tar.gz +sha256 e72194b52b36f040deaec49a1ddd5dcd8d4feecc3a5fe6c5e9589a9707b233d4 pngquant-2.18.0-src.tar.gz # Locally computed sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk index 87537aa18e61..8ef321600736 100644 --- a/package/pngquant/pngquant.mk +++ b/package/pngquant/pngquant.mk @@ -4,7 +4,7 @@ # ################################################################################ -PNGQUANT_VERSION = 2.17.0 +PNGQUANT_VERSION = 2.18.0 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ From b882f5679e66214e1fb54350bc75150815867359 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 19:25:53 +0200 Subject: [PATCH 0832/2890] package/privoxy: bump to version 3.0.34 Removed md5 hash, switched _SITE to https. Release notes: https://www.privoxy.org/announce.txt Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/privoxy/privoxy.hash | 7 +++---- package/privoxy/privoxy.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/privoxy/privoxy.hash b/package/privoxy/privoxy.hash index cf1056ecc4d3..67a44f2c948a 100644 --- a/package/privoxy/privoxy.hash +++ b/package/privoxy/privoxy.hash @@ -1,6 +1,5 @@ -# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.33%20%28stable%29/ -md5 d6caf3eaad4812f0658b68d5b3ba3a06 privoxy-3.0.33-stable-src.tar.gz -sha1 688da305077d8ecbcf6423e02201f01f7a7098f4 privoxy-3.0.33-stable-src.tar.gz +# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.34%20%28stable%29/ +sha1 e65298c4ee235320ea9ddfb689187bda29a63bbb privoxy-3.0.34-stable-src.tar.gz # Locally computed -sha256 04b104e70dac61561b9dd110684b250fafc8c13dbe437a60fae18ddd9a881fae privoxy-3.0.33-stable-src.tar.gz +sha256 e6ccbca1656f4e616b4657f8514e33a70f6697e9d7294356577839322a3c5d2c privoxy-3.0.34-stable-src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/privoxy/privoxy.mk b/package/privoxy/privoxy.mk index 06642200df04..e1353ef0c785 100644 --- a/package/privoxy/privoxy.mk +++ b/package/privoxy/privoxy.mk @@ -4,8 +4,8 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.33 -PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 +PRIVOXY_VERSION = 3.0.34 +PRIVOXY_SITE = https://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped PRIVOXY_AUTORECONF = YES From 30294c1ed3b617d3069c92574799e00b55753c9e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 19:46:25 +0200 Subject: [PATCH 0833/2890] package/rrdtool: bump version to 1.8.0 Release notes: https://github.com/oetiker/rrdtool-1.x/releases/tag/v1.8.0 Switched _SITE due to upstream move: https://oss.oetiker.ch/rrdtool/pub/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/rrdtool/rrdtool.hash | 2 +- package/rrdtool/rrdtool.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rrdtool/rrdtool.hash b/package/rrdtool/rrdtool.hash index 5266e5b7a1a3..1a6d18aea9ac 100644 --- a/package/rrdtool/rrdtool.hash +++ b/package/rrdtool/rrdtool.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db rrdtool-1.7.2.tar.gz +sha256 bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4 rrdtool-1.8.0.tar.gz sha256 ab6b4646e9e01f1ec287c29c351c886c4cb7f945c11efc0a1be9f6e5e6cc5320 COPYRIGHT sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 LICENSE diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk index 051aec1c1930..24d84c79c3d9 100644 --- a/package/rrdtool/rrdtool.mk +++ b/package/rrdtool/rrdtool.mk @@ -4,8 +4,8 @@ # ################################################################################ -RRDTOOL_VERSION = 1.7.2 -RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub +RRDTOOL_VERSION = 1.8.0 +RRDTOOL_SITE = https://github.com/oetiker/rrdtool-1.x/releases/download/v$(RRDTOOL_VERSION) RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIGHT RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) From 69e54d4d151eeae344119b3b88127df32a8718df Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 11:31:56 +0200 Subject: [PATCH 0834/2890] package/wget: bump version to 1.21.4 Release notes: https://lists.gnu.org/archive/html/bug-wget/2023-05/msg00004.html Added upstream sha1 hash. Updated license hash due to copyright year bump: https://git.savannah.gnu.org/gitweb/?p=wget.git;a=commitdiff;h=42239969300cae065e38781df3d157483897ff6b Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/wget/wget.hash | 8 +++++--- package/wget/wget.mk | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 22674650a270..75c3a913dc02 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,8 @@ +# From https://lists.gnu.org/archive/html/bug-wget/2023-05/msg00004.html +sha1 42384273c1937458c9db3766a5509afa636a2f00 wget-1.21.4.tar.lz # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.4.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz +sha256 3683619a5f50edcbccb1720a79006fa37bf9b9a255a8c5b48048bc3c7a874bd9 wget-1.21.4.tar.lz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING +sha256 f7dc7522e7e1be9227f3dc8de8b39a4d1d2471968c893af15f00c1a2076a0eec COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 455faaed126b..d2d308796145 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.3 +WGET_VERSION = 1.21.4 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf From af25796d49cf36ad0cd3a4bf6fc71eed6b10d450 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 26 Jun 2023 08:52:31 +0200 Subject: [PATCH 0835/2890] package/wireshark: security bump to version 4.0.6 Fixes the following security issues: - CVE-2023-1992: The RPC over RDMA dissector could crash https://www.wireshark.org/security/wnpa-sec-2023-09.html - CVE-2023-1993: The LISP dissector could go into a large loop https://www.wireshark.org/security/wnpa-sec-2023-10.html - CVE-2023-1994: The GQUIC dissector could crash https://www.wireshark.org/security/wnpa-sec-2023-11.html - CVE-2023-2855: The Candump log file parser could crash https://www.wireshark.org/security/wnpa-sec-2023-12.html - CVE-2023-2857: The BLF file parser could crash https://www.wireshark.org/security/wnpa-sec-2023-13.html - The GDSDB dissector could go into an infinite loop https://www.wireshark.org/security/wnpa-sec-2023-14.html - CVE-2023-2858: The NetScaler file parser could crash https://www.wireshark.org/security/wnpa-sec-2023-15.html - CVE-2023-2856: The VMS TCPIPtrace file parser could crash https://www.wireshark.org/security/wnpa-sec-2023-16.html - CVE-2023-2854: The BLF file parser could crash https://www.wireshark.org/security/wnpa-sec-2023-17.html - CVE-2023-0666: The RTPS dissector could crash https://www.wireshark.org/security/wnpa-sec-2023-18.html - CVE-2023-0668: The IEEE C37.118 Synchrophasor dissector could crash https://www.wireshark.org/security/wnpa-sec-2023-19.html - The XRA dissector could go into an infinite loo https://www.wireshark.org/security/wnpa-sec-2023-20.html [Peter: refer to SIGNATURES files now that it is again fixed] Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index d89caa5de81a..6598f51f53d1 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.4.txt -sha1 ae3c28d6966c420ee3a8d058ea212a1b6adab50f wireshark-4.0.4.tar.xz -sha256 a4a09f6564f00639036ffe5064ac4dc2176adfa3e484c539c9c73f835436e74b wireshark-4.0.4.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.6.txt +sha1 a60b6f8063df2a711932ba869ae86e6476087cf0 wireshark-4.0.6.tar.xz +sha256 0079097a1b17ebc7250a73563f984c13327dac5016b7d53165810fbcca4bd884 wireshark-4.0.6.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index f5a8e1f07065..80a986cfa32e 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.4 +WIRESHARK_VERSION = 4.0.6 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 5ce72a74d2163a455c499701b16bc0f4350ad935 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 16:49:23 +0200 Subject: [PATCH 0836/2890] package/bind: security bump version to 9.16.42 Changelog: https://ftp.isc.org/isc/bind9/9.16.42/CHANGES Fixes CVE-2023-2911 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 32804b5ce038..a8c15f2a12ee 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.38/bind-9.16.38.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.42/bind-9.16.42.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f bind-9.16.38.tar.xz +sha256 a8b51c6bfdf3ab6885102f764c2418e037897b7ea46a09f8f07876fa11a6c0b3 bind-9.16.42.tar.xz sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 70987a982381..f46d1a8a5447 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.38 +BIND_VERSION = 9.16.42 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. From af87ad197caf434936fe239f2718fd17b60fcb8b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 17:03:09 +0200 Subject: [PATCH 0837/2890] package/libssh2: bump version to 1.11.0 Changelog: https://www.libssh2.org/changes.html https://lists.haxx.se/pipermail/libssh2-devel/2023-May/000114.html Removed patch which is included in current release: https://github.com/libssh2/libssh2/commit/b952674f120748174ed2c0fb93e7bd78cf355cac Updated license hash due to copyright year bump: https://github.com/libssh2/libssh2/commit/1a186f1ead5ab0beca1fcc12aa693c166ef855b8 Switched tarball to .xz Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-Opaque-structs-in-LibreSSL-3-5.patch | 27 ------------------- package/libssh2/libssh2.hash | 4 +-- package/libssh2/libssh2.mk | 3 ++- 4 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch diff --git a/.checkpackageignore b/.checkpackageignore index dadc8e097813..5a7e1e32bc11 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -844,7 +844,6 @@ package/libspatialindex/0001-allow-building-static-libs.patch Upstream package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch Upstream package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch Upstream package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch Upstream -package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch Upstream package/libsvg/0001-fix-expat-static-declaration.patch Upstream package/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch Upstream package/libsvgtiny/0001-disable-debug-printfs.patch Upstream diff --git a/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch b/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch deleted file mode 100644 index 2e1fd8871c8d..000000000000 --- a/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7f55a033e5054529e5e69f06725dd02a573329b6 Mon Sep 17 00:00:00 2001 -From: Charlie Li -Date: Wed, 2 Mar 2022 19:50:56 -0500 -Subject: [PATCH] Opaque structs in LibreSSL 3.5 - -[Retrieved (and backported) from: -https://github.com/libssh2/libssh2/pull/682/commits/7f55a033e5054529e5e69f06725dd02a573329b6] -Signed-off-by: Fabrice Fontaine ---- - src/openssl.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/openssl.h b/src/openssl.h -index 3eef02368..c13542481 100644 ---- a/src/openssl.h -+++ b/src/openssl.h -@@ -94,8 +94,8 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -- !defined(LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L) - # define HAVE_OPAQUE_STRUCTS 1 - #endif - diff --git a/package/libssh2/libssh2.hash b/package/libssh2/libssh2.hash index 7267e8598761..b5bc571f86d9 100644 --- a/package/libssh2/libssh2.hash +++ b/package/libssh2/libssh2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51 libssh2-1.10.0.tar.gz -sha256 859e60d760a3446ecaf777339f1eef98c527aea40714384d24b882a83ffdd23a COPYING +sha256 a488a22625296342ddae862de1d59633e6d446eff8417398e06674a49be3d7c2 libssh2-1.11.0.tar.xz +sha256 fda5e2522c58ba1f31c9f2044747616457466f4aebec16ade4af86e3a16a8e02 COPYING diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index cd74784d829d..8bedbdffbaf5 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -4,7 +4,8 @@ # ################################################################################ -LIBSSH2_VERSION = 1.10.0 +LIBSSH2_VERSION = 1.11.0 +LIBSSH2_SOURCE= libssh2-$(LIBSSH2_VERSION).tar.xz LIBSSH2_SITE = https://www.libssh2.org/download LIBSSH2_LICENSE = BSD LIBSSH2_LICENSE_FILES = COPYING From 1b838496f942e862f6283028cdf3123015d0664d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 17:13:19 +0200 Subject: [PATCH 0838/2890] package/libmd: bump version to 1.1.0 Release notes: https://archive.hadrons.org/software/libmd/libmd-1.1.0.announce Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libmd/libmd.hash | 5 +++-- package/libmd/libmd.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libmd/libmd.hash b/package/libmd/libmd.hash index 1a3c9d80dfac..7174b270aec3 100644 --- a/package/libmd/libmd.hash +++ b/package/libmd/libmd.hash @@ -1,5 +1,6 @@ -# From https://lists.freedesktop.org/archives/libbsd/2021-October/000311.html -sha512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3 libmd-1.0.4.tar.xz +# From https://archive.hadrons.org/software/libmd/libmd-1.1.0.announce +sha256 1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332 libmd-1.1.0.tar.xz +sha512 5d0da3337038e474fae7377bbc646d17214e72dc848a7aadc157f49333ce7b5ac1456e45d13674bd410ea08477c6115fc4282fed6c8e6a0bf63537a418c0df96 libmd-1.1.0.tar.xz # Hash for license file sha256 4365ef6255ad553fce69dd4bc0e093472c5d0e41b8ea493a545cc926ce171aa6 COPYING diff --git a/package/libmd/libmd.mk b/package/libmd/libmd.mk index 19a245898227..8bbebc1bf158 100644 --- a/package/libmd/libmd.mk +++ b/package/libmd/libmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMD_VERSION = 1.0.4 +LIBMD_VERSION = 1.1.0 LIBMD_SOURCE = libmd-$(LIBMD_VERSION).tar.xz LIBMD_SITE = https://archive.hadrons.org/software/libmd LIBMD_LICENSE = BSD-2-Clause, BSD-3-Clause, Beerware, ISC, Public Domain From 62ad2ec2191f1b7f3803b5f8dd30dd1b7298796b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 17:13:20 +0200 Subject: [PATCH 0839/2890] package/libbsd: bump version to 0.11.7 Release notes: https://archive.hadrons.org/software/libbsd/libbsd-0.11.4.announce https://archive.hadrons.org/software/libbsd/libbsd-0.11.5.announce https://archive.hadrons.org/software/libbsd/libbsd-0.11.6.announce https://archive.hadrons.org/software/libbsd/libbsd-0.11.7.announce Removed patch which is included in upstream release: https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/873639ebb5bc3688e5e78d71e5c0c49469498f46 Update hash of license file, which has changed due to: - Copyright year updates - Changes in list of files affected by the different license - Removal of one part under BSD-4-Clause, but as there are still other parts under BSD-4-Clause, this doesn't change the overall license information in Buildroot Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...01-src-local-elf.h-fix-big-endian-sh.patch | 39 ------------------- package/libbsd/libbsd.hash | 8 ++-- package/libbsd/libbsd.mk | 2 +- 4 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch diff --git a/.checkpackageignore b/.checkpackageignore index 5a7e1e32bc11..373711b6bc05 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -701,7 +701,6 @@ package/libavl/0001-fix-makefile.patch Upstream package/libb64/0001-Integer-overflows.patch Upstream package/libb64/0002-Initialize-C++-objects.patch Upstream package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch Upstream -package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch Upstream package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch Upstream package/libcec/0001-cecloader-h-fix-null-return.patch Upstream package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch Upstream diff --git a/package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch b/package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch deleted file mode 100644 index 8612d268f898..000000000000 --- a/package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 93c9f8aa72349a4fe33e2a732100c76f3904eb80 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Jun 2022 19:27:13 +0200 -Subject: [PATCH] src/local-elf.h: fix big endian sh - -Fix the following build failure with big endian sh (e.g. sh4aeb): - -In file included from nlist.c:44: -nlist.c: In function '__elf_is_okay__': -local-elf.h:223:25: error: 'ELFDATA2LMSB' undeclared (first use in this function); did you mean 'ELFDATA2LSB'? - 223 | #define ELF_TARG_DATA ELFDATA2LMSB - | ^~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/2980fb79c208454195d77383f1ece9afbd7f981b - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/libbsd/libbsd/-/merge_requests/19] ---- - src/local-elf.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/local-elf.h b/src/local-elf.h -index 1dd3b42..8c4794f 100644 ---- a/src/local-elf.h -+++ b/src/local-elf.h -@@ -230,7 +230,7 @@ - #if defined(__LITTLE_ENDIAN__) - #define ELF_TARG_DATA ELFDATA2LSB - #elif defined(__BIG_ENDIAN__) --#define ELF_TARG_DATA ELFDATA2LMSB -+#define ELF_TARG_DATA ELFDATA2MSB - #else - #error Unknown SH endianness - #endif --- -2.35.1 - diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash index 17bb32e01cc1..8b1af4475838 100644 --- a/package/libbsd/libbsd.hash +++ b/package/libbsd/libbsd.hash @@ -1,3 +1,5 @@ -# From https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html -sha512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5 libbsd-0.11.3.tar.xz -sha256 ff2fdeeb0fe8bcb9045fe91d69e8312a5b477c54db48dffe34dd1c0d730c5864 COPYING +# From https://archive.hadrons.org/software/libbsd/libbsd-0.11.7.announce +sha256 9baa186059ebbf25c06308e9f991fda31f7183c0f24931826d83aa6abd8a0261 libbsd-0.11.7.tar.xz +sha512 51fda4724f41dd8a4628afd58c21236a7588d9045e337e06eeabf83805a9aaaa53705441ca901ad11f1c65f18e881523bdc97721a7d3d6a5cced27f2450d09a2 libbsd-0.11.7.tar.xz +# Locally computed +sha256 7aab3a07716d31ca72e66c1073ef8a0fa0be0daa5df7c3b2cc0c668589142336 COPYING diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk index 86df8a97a2dc..27937c46116e 100644 --- a/package/libbsd/libbsd.mk +++ b/package/libbsd/libbsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBSD_VERSION = 0.11.3 +LIBBSD_VERSION = 0.11.7 LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz LIBBSD_SITE = https://libbsd.freedesktop.org/releases LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ From ccb6a80e90fad08150a22566d17e98fe0d465ee0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 17:17:01 +0200 Subject: [PATCH 0840/2890] package/diffutils: bump version to 3.10 Release notes: https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00009.html Added sha1 hash provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/diffutils/diffutils.hash | 4 +++- package/diffutils/diffutils.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/diffutils/diffutils.hash b/package/diffutils/diffutils.hash index ff0e9ab27851..df160a124d5d 100644 --- a/package/diffutils/diffutils.hash +++ b/package/diffutils/diffutils.hash @@ -1,4 +1,6 @@ +# From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00009.html +sha1 c16a9cf107ad1f0f791b6d00852dc5e961c1c451 diffutils-3.10.tar.xz # Locally calculated after checking pgp signature -sha256 d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1 diffutils-3.9.tar.xz +sha256 90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e diffutils-3.10.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 100443702601..2c66434a9a24 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIFFUTILS_VERSION = 3.9 +DIFFUTILS_VERSION = 3.10 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) From bca9d7e58a23fc8c4a27be7971ace1fc84526d22 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 19:54:01 +0200 Subject: [PATCH 0841/2890] package/samba4: add optional dependency to libunwind Upstream added configure options for libunwind in commit https://github.com/samba-team/samba/commit/14feb93d481011765f62614ab49b304e17e4f6fd Fixes: http://autobuild.buildroot.net/results/63c/63c469106e9daa198f77d8da7a5bb123edcce0f7/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/samba4/samba4.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 2799dbe2f718..4489c28d2bdf 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -93,6 +93,13 @@ else SAMBA4_CONF_OPTS += --without-libarchive endif +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +SAMBA4_CONF_OPTS += --with-libunwind +SAMBA4_DEPENDENCIES += libunwind +else +SAMBA4_CONF_OPTS += --without-libunwind +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) SAMBA4_CONF_ENV += NCURSES_CONFIG="$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)" SAMBA4_DEPENDENCIES += ncurses From 2d9ccbcd109e69e341864c975f593cedb2ec6ae8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 27 Jun 2023 20:25:38 +0200 Subject: [PATCH 0842/2890] package/audit: update musl fix Upstream proposed a different fix: https://github.com/linux-audit/audit-userspace/pull/311#issuecomment-1609953611 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ine-__attribute_malloc__-when-needed.patch | 35 +++++++++++++++++ ...ute_malloc__-with-__attribute__-__ma.patch | 39 ------------------- 2 files changed, 35 insertions(+), 39 deletions(-) create mode 100644 package/audit/0001-Define-__attribute_malloc__-when-needed.patch delete mode 100644 package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch diff --git a/package/audit/0001-Define-__attribute_malloc__-when-needed.patch b/package/audit/0001-Define-__attribute_malloc__-when-needed.patch new file mode 100644 index 000000000000..3dd5359bfc3e --- /dev/null +++ b/package/audit/0001-Define-__attribute_malloc__-when-needed.patch @@ -0,0 +1,35 @@ +From cf93d8579d5cec0b1ba585bd661776f03c2743ba Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Tue, 27 Jun 2023 20:19:13 +0200 +Subject: [PATCH] Define __attribute_malloc__ when needed + +attribute_malloc is not available on musl + +auparse.h: In function 'auparse_init': +auparse.h:54:2: error: expected declaration specifiers before '__attribute_malloc__' + 54 | __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); + +Upstream: https://github.com/linux-audit/audit-userspace/pull/311 + +Signed-off-by: Bernd Kuhls +--- + auparse/auparse.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/auparse/auparse.h b/auparse/auparse.h +index 95cf256d..5cb7402e 100644 +--- a/auparse/auparse.h ++++ b/auparse/auparse.h +@@ -32,6 +32,9 @@ + # define __attr_dealloc(dealloc, argno) + # define __attr_dealloc_free + #endif ++#ifndef __attribute_malloc__ ++# define __attribute_malloc__ ++#endif + + #ifdef __cplusplus + extern "C" { +-- +2.39.2 + diff --git a/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch deleted file mode 100644 index 1a276ca2df5e..000000000000 --- a/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 79c8d6a2755c9dfa00a5e86378e89a94eef0504d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 9 Aug 2022 23:57:03 -0700 -Subject: [PATCH] Replace __attribute_malloc__ with - __attribute__((__malloc__)) - -__attribute_malloc__ is not available on musl - -Fixes -| ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator -| __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); -| ^ - -Signed-off-by: Khem Raj - -Upstream: https://github.com/linux-audit/audit-userspace/pull/311 - -Signed-off-by: Bernd Kuhls ---- - - auparse/auparse.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/auparse/auparse.h b/auparse/auparse.h -index 95cf256d..c7dbe5ff 100644 ---- a/auparse/auparse.h -+++ b/auparse/auparse.h -@@ -51,7 +51,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au, - void auparse_destroy(auparse_state_t *au); - void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what); - auparse_state_t *auparse_init(ausource_t source, const void *b) -- __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); -+ __attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1); - int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len) - __attr_access ((__read_only__, 2, 3)); - int auparse_feed(auparse_state_t *au, const char *data, size_t data_len) --- -2.37.1 - From ef46caffda82e23d1767247ad92891f4b5ccb9ac Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 08:10:52 +0200 Subject: [PATCH 0843/2890] package/libpng: bump version to 1.6.40 Release notes: https://sourceforge.net/p/png-mng/mailman/message/37860896/ Updated license hash due to copyright year bump: https://github.com/pnggroup/libpng/commit/9923515ff441b4c07ce3f8c9985a547fe582c4da Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libpng/libpng.hash | 8 +++----- package/libpng/libpng.mk | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index c1f65c93af0d..d864850b067e 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,6 +1,4 @@ -# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.39/ -md5 aa1ae92e172417039bda072b702f6326 libpng-1.6.39.tar.xz -sha1 3f2386d61eccae211ec4f57899e4ac2ca60d390b libpng-1.6.39.tar.xz +# From https://sourceforge.net/p/png-mng/mailman/message/37860896/ +sha256 535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1 libpng-1.6.40.tar.xz # Locally computed: -sha256 1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937 libpng-1.6.39.tar.xz -sha256 dfe5a536b0e5a531f844fb9c101a3089aca60772a503893b8e15f9457e369960 LICENSE +sha256 5c0bb4b05b1354ae7c173532b6702ea68b611047ff9b91c4d3af77da39c195d9 LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index a18c36fe780c..b7bacd9217ee 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.39 +LIBPNG_VERSION = 1.6.40 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) From 65e36d73f280d2f7cc109db5e77dfc6a5126612b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 08:16:32 +0200 Subject: [PATCH 0844/2890] package/flac: bump version to 1.4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: https://xiph.org/flac/changelog.html Updated license hash due to copyright year bump: https://github.com/xiph/flac/commit/e00d9b881f3fb8a181699ada966e909ab6d689c0 Removed all PowerPC-related configure options, quoting changelog: "All PowerPC-specific code has been removed, as it turned out those improvements didn’t actually improve anything" Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/flac/flac.hash | 4 ++-- package/flac/flac.mk | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/flac/flac.hash b/package/flac/flac.hash index b993ebd759dc..0013a7485abd 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,6 +1,6 @@ # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA256SUMS.txt -sha256 e322d58a1f48d23d9dd38f432672865f6f79e73a6f9cc5a5f57fcaa83eb5a8e4 flac-1.4.2.tar.xz +sha256 6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70 flac-1.4.3.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 6e58d3036f05e2a0d58af854c12a505ddbe75011d71a598a2170987f3b15408d COPYING.Xiph +sha256 12600ea1a7affcbf469bd0d8b2cd725e4167114a2ee834b88f5d2857bfd7ddbf COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 595c2379b02f..ab06af826e70 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.4.2 +FLAC_VERSION = 1.4.3 FLAC_SITE = https://ftp.osuosl.org/pub/xiph/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES @@ -14,9 +14,7 @@ FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL FLAC_CPE_ID_VENDOR = flac_project FLAC_CONF_OPTS = \ - $(if $(BR2_POWERPC_CPU_HAS_ALTIVEC),--enable-altivec,--disable-altivec) \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ - $(if $(BR2_POWERPC_CPU_HAS_VSX),--enable-vsx,--disable-vsx) \ --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) From 22c6344c71d6a88fc5492dc4b911b581cdcd9480 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 08:19:39 +0200 Subject: [PATCH 0845/2890] package/freetype: bump version to 2.13.1 Release notes: https://sourceforge.net/projects/freetype/files/freetype2/2.13.1/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/freetype/freetype.hash | 6 +++--- package/freetype/freetype.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index 60eb8dbb1d7a..ea03526c99a1 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.13.0/ -sha1 6393c1451c2f1c5f83aed5ea92d280af078e27d9 freetype-2.13.0.tar.xz -sha256 5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c freetype-2.13.0.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.13.1/ +sha1 af9b6b754320a0526179f166e3f8cffce78526ca freetype-2.13.1.tar.xz +sha256 ea67e3b019b1104d1667aa274f5dc307d8cbd606b399bc32df308a77f1a564bf freetype-2.13.1.tar.xz # Locally calculated sha256 2e3bbb7d7c5c396368dd0853a790ec29ce5b8647163dde42a0493fb0d6556b2b LICENSE.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 4d7c4cd0d5f2..c6bc0673f601 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.13.0 +FREETYPE_VERSION = 2.13.1 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES From d68f6e3042d50139f773950d679a0f83f9bb94c0 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 26 Jun 2023 18:20:57 +0200 Subject: [PATCH 0846/2890] package/agentpp: fix build error due to type mismatch This was supposedly fixed by commit 5f06ecf5e151 ("package/agentpp: security bump to version 4.6.0") but has kept happening so far. No public place for contributions, thus this patch has been sent to private e-mail. Fixes: http://autobuild.buildroot.net/results/e8abd6bdc62a028955915706b03d72239786c703/ http://autobuild.buildroot.net/results/24441fb679fbf5f913c9b6431c98aec596ead587/ Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- ...mpx-fix-const-nonconst-type-mismatch.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch diff --git a/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch b/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch new file mode 100644 index 000000000000..07981eff3e84 --- /dev/null +++ b/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch @@ -0,0 +1,51 @@ +From 7e541e6dba8d4976bbb490838a09b569f38b047d Mon Sep 17 00:00:00 2001 +From: Luca Ceresoli +Date: Mon, 26 Jun 2023 17:45:00 +0200 +Subject: [PATCH] Snmpx: fix const/nonconst type mismatch + +Fixes build failure: + + snmp_pp_ext.cpp:1176:28: error: binding reference of type 'Snmp_pp::Pdu&' to 'const Snmp_pp::Pdu' discards qualifiers + 1176 | status = snmpmsg.load( pdu, community, version); + | ^~~ + +Fixes: + http://autobuild.buildroot.net/results/e8abd6bdc62a028955915706b03d72239786c703/ + http://autobuild.buildroot.net/results/24441fb679fbf5f913c9b6431c98aec596ead587/ + +Signed-off-by: Luca Ceresoli +Upstream: sent to katz.agentpp.com@magenta.de and support@agentpp.com +--- + include/agent_pp/snmp_pp_ext.h | 2 +- + src/snmp_pp_ext.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/agent_pp/snmp_pp_ext.h b/include/agent_pp/snmp_pp_ext.h +index 7c5a6783ee70..d8a46060db98 100644 +--- a/include/agent_pp/snmp_pp_ext.h ++++ b/include/agent_pp/snmp_pp_ext.h +@@ -807,7 +807,7 @@ public: + * SNMP_CLASS_SUCCESS on success and SNMP_CLASS_ERROR, + * SNMP_CLASS_TL_FAILED on failure. + */ +- int send (Pdux const &, NS_SNMP UdpAddress const &, NS_SNMP snmp_version, NS_SNMP OctetStr const &); ++ int send (Pdux &, NS_SNMP UdpAddress const &, NS_SNMP snmp_version, NS_SNMP OctetStr const &); + #endif + + /** +diff --git a/src/snmp_pp_ext.cpp b/src/snmp_pp_ext.cpp +index 54a29ec8ea28..b61cbf056246 100644 +--- a/src/snmp_pp_ext.cpp ++++ b/src/snmp_pp_ext.cpp +@@ -1203,7 +1203,7 @@ int Snmpx::send (Pdux &pdu, SnmpTarget* target) + + #else // _SNMPv3 is not defined + +-int Snmpx::send (Pdux const &pdu, ++int Snmpx::send (Pdux &pdu, + UdpAddress const &udp_address, + snmp_version version, + OctetStr const &community) +-- +2.34.1 + From 227c42b8c3e0fada026e17a2b6e8d0d7a4450a3f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 19 Jun 2023 20:14:57 +0200 Subject: [PATCH 0847/2890] package/syslog-ng: disable python support Upstream added a list of python modules declared as runtime dependencies https://github.com/syslog-ng/syslog-ng/commit/f18345d2a16aea1a95d891ebb24a4ace9c652621 most of them with fixed (and outdated) versions. Disable python support for the time being. Fixes: http://autobuild.buildroot.net/results/436/436e90bb1f77143b05cb98df78934555bbb7df35/ Signed-off-by: Bernd Kuhls Reviewed-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/syslog-ng/syslog-ng.mk | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 1c4cec6adb4f..ecc8eeddce5b 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -16,7 +16,8 @@ SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \ # We're patching configure.ac SYSLOG_NG_AUTORECONF = YES SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \ - --disable-java --disable-java-modules --disable-mongodb + --disable-java --disable-java-modules --disable-mongodb \ + --disable-python SYSLOG_NG_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101915),y) @@ -39,15 +40,6 @@ else SYSLOG_NG_CONF_OPTS += --disable-linux-caps endif -ifeq ($(BR2_PACKAGE_PYTHON3),y) -SYSLOG_NG_DEPENDENCIES += python3 -SYSLOG_NG_CONF_OPTS += \ - --enable-python \ - --with-python=$(PYTHON3_VERSION_MAJOR) -else -SYSLOG_NG_CONF_OPTS += --disable-python -endif - ifeq ($(BR2_PACKAGE_LIBESMTP),y) SYSLOG_NG_DEPENDENCIES += libesmtp SYSLOG_NG_CONF_OPTS += --enable-smtp From 9fc0d3a4e7363a69f6bfc013bbdba045cf3e02b9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 19 Jun 2023 20:14:58 +0200 Subject: [PATCH 0848/2890] package/syslog-ng: bump version to 4.2.0 Updated upstream URL of patch file. Release notes: https://axoflow.com/axosyslog-release-4-2/ https://github.com/syslog-ng/syslog-ng/releases/tag/syslog-ng-4.2.0 Signed-off-by: Bernd Kuhls Reviewed-by: Chris Packham Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/syslog-ng/0001-fix-build-on-uclibc.patch | 3 ++- package/syslog-ng/syslog-ng.conf | 2 +- package/syslog-ng/syslog-ng.hash | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 373711b6bc05..847f823ed0a8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1476,7 +1476,6 @@ package/suricata/0002-configure.ac-allow-the-user-to-override-RUST_TARGET.patch package/suricata/S99suricata Shellcheck package/swupdate/swupdate.sh Shellcheck package/sylpheed/0001-harden-link-checker-before-accepting-click.patch Upstream -package/syslog-ng/0001-fix-build-on-uclibc.patch Upstream package/sysprof/0001-define-NT_GNU_BUILD_ID.patch Upstream package/sysrepo/S51sysrepo-plugind Indent Shellcheck package/system-config-printer/0001-Add-option-to-disable-xmlto-manual-generation.patch Upstream diff --git a/package/syslog-ng/0001-fix-build-on-uclibc.patch b/package/syslog-ng/0001-fix-build-on-uclibc.patch index dbb9b66b5c9d..07c3f0721c63 100644 --- a/package/syslog-ng/0001-fix-build-on-uclibc.patch +++ b/package/syslog-ng/0001-fix-build-on-uclibc.patch @@ -9,8 +9,9 @@ pthread_spin_trylock so check for this function before using it Fixes: - http://autobuild.buildroot.org/results/0a6de11c030a4f39e402917809fc6d33fb463d1b +Upstream: https://github.com/buytenh/ivykis/pull/22 + Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/buytenh/ivykis/pull/17] --- configure.ac | 3 +++ src/spinlock.h | 4 ++++ diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index f4b74dc8c143..a3cfa8dacfac 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 4.1 +@version: 4.2 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 8ab4d5ac3b66..a91733158079 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 d7df3cfa32d1a750818d94b8ea582dea54c37226e7b55a88c3d2f3a543d8f20e syslog-ng-4.1.1.tar.gz +sha256 092bd17fd47002c988aebdf81d0ed3f3cfd0e82b388d2453bcaa5e67934f4dda syslog-ng-4.2.0.tar.gz sha256 c75dcbfc17ccf742f12042a370f825a40951085d2352dfc9d07e715dae3ca9bd COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index ecc8eeddce5b..39433185b4f0 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 4.1.1 +SYSLOG_NG_VERSION = 4.2.0 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt From 2c9b853093f44c45348947783297ed79e40101f2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 19 Jun 2023 20:17:18 +0200 Subject: [PATCH 0849/2890] package/fluidsynth: bump to version 2.3.3 For change log since v2.3.2, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.3 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 0f8f04d67680..382a54abadfa 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cd610810f30566e28fb98c36501f00446a06fa6bae3dc562c8cd3868fe1c0fc7 fluidsynth-2.3.2.tar.gz +sha256 321f7d3f72206b2522f30a1cb8ad1936fd4533ffc4d29dd335b1953c9fb371e6 fluidsynth-2.3.3.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 854ed000321f..52f8ec489fe9 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.2 +FLUIDSYNTH_VERSION = 2.3.3 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From dae54143f596e6e36f4b93b11ae0e66f5f983ed7 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 19 Jun 2023 16:17:07 +0200 Subject: [PATCH 0850/2890] package/uuu: bump to version 1.5.104 Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.104 The changes to README.md are not related to license modifications. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/uuu/uuu.hash | 4 ++-- package/uuu/uuu.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index a5b665620c64..a35970c54fda 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 e89d3665af499ab71360d948176cf64619b082f8272a994d1fbfc000e67c0f14 uuu_source-1.5.21.tar.gz +sha256 f95ef6e5f4feb8b3e8d2c1163c35415263c82ac4ba3a51bcf4e3d59d3eebd063 uuu_source-uuu_1.5.104.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE -sha256 584bfbb18b4c08b872d48b80419dd453307212a144134fb516bd6ddc0700c2e8 README.md +sha256 f68fb8c8002c797a14e63f91963ac247034fdfd44275e4f4a3226111cd0423db README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 1a5f84ce4d7d..07dd6ce5b345 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,8 +4,8 @@ # ################################################################################ -UUU_VERSION = 1.5.21 -UUU_SOURCE = uuu_source-$(UUU_VERSION).tar.gz +UUU_VERSION = 1.5.104 +UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License UUU_LICENSE_FILES = LICENSE README.md From a8467289111843e070816c9ffb2004baa74ffead Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 19 Mar 2023 11:14:19 +0100 Subject: [PATCH 0851/2890] package/qt6: bump version to 6.4.3 For details see [1]. [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.3/release-note.md Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt6/qt6.mk | 2 +- package/qt6/qt6base/qt6base.hash | 4 ++-- package/qt6/qt6serialbus/qt6serialbus.hash | 4 ++-- package/qt6/qt6serialport/qt6serialport.hash | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 431bb8c9d329..1edb252c9675 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -5,7 +5,7 @@ ################################################################################ QT6_VERSION_MAJOR = 6.4 -QT6_VERSION = $(QT6_VERSION_MAJOR).2 +QT6_VERSION = $(QT6_VERSION_MAJOR).3 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 63af37383665..cb111bd405f4 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 -sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256 +sha256 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-6.4.3.tar.xz # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash index be01f13363e6..98c89319626f 100644 --- a/package/qt6/qt6serialbus/qt6serialbus.hash +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialbus-everywhere-src-6.4.2.tar.xz.sha256 -sha256 604013657c7327899aa50748deb4bcb5e545ab37ff4964795b9e6f617d48bf1b qtserialbus-everywhere-src-6.4.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256 +sha256 b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366 qtserialbus-everywhere-src-6.4.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index 1eaa3d615056..9341978d8621 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialport-everywhere-src-6.4.2.tar.xz.sha256 -sha256 336d95919037800184b3c3de8ccb6f62954b20f3756c05adce8d5010504340fa qtserialport-everywhere-src-6.4.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256 +sha256 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de qtserialport-everywhere-src-6.4.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt From 1c7d497f414210688130054cf78c949b4a1a8d82 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 19 Mar 2023 11:14:20 +0100 Subject: [PATCH 0852/2890] package/qt6/qt6svg: new package Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6svg/Config.in | 11 ++++++++ package/qt6/qt6svg/qt6svg.hash | 10 +++++++ package/qt6/qt6svg/qt6svg.mk | 51 ++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) create mode 100644 package/qt6/qt6svg/Config.in create mode 100644 package/qt6/qt6svg/qt6svg.hash create mode 100644 package/qt6/qt6svg/qt6svg.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 655fa8392a31..3788caa6a39b 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -46,5 +46,6 @@ if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" +source "package/qt6/qt6svg/Config.in" endif diff --git a/package/qt6/qt6svg/Config.in b/package/qt6/qt6svg/Config.in new file mode 100644 index 000000000000..179101c97f6b --- /dev/null +++ b/package/qt6/qt6svg/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT6SVG + bool "qt6svg" + select BR2_PACKAGE_QT6BASE_GUI + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt SVG provides classes for rendering and displaying SVG + drawings in widgets and on other paint devices. + + https://doc.qt.io/qt-6/qtsvg-index.html diff --git a/package/qt6/qt6svg/qt6svg.hash b/package/qt6/qt6svg/qt6svg.hash new file mode 100644 index 000000000000..bb239cb012ad --- /dev/null +++ b/package/qt6/qt6svg/qt6svg.hash @@ -0,0 +1,10 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtsvg-everywhere-src-6.4.3.tar.xz.sha256 +sha256 88315f886cf81898705e487cedba6e6160724359d23c518c92c333c098879a4a qtsvg-everywhere-src-6.4.3.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk new file mode 100644 index 000000000000..be0addbd0d1e --- /dev/null +++ b/package/qt6/qt6svg/qt6svg.mk @@ -0,0 +1,51 @@ +################################################################################ +# +# qt6svg +# +################################################################################ + +QT6SVG_VERSION = $(QT6_VERSION) +QT6SVG_SITE = $(QT6_SITE) +QT6SVG_SOURCE = qtsvg-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SVG_VERSION).tar.xz +QT6SVG_INSTALL_STAGING = YES +QT6SVG_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SVG_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0 with exception (tools), \ + GFDL-1.3 (docs), \ + BSD-3-Clause + +QT6SVG_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + +QT6SVG_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SVG_DEPENDENCIES = \ + host-pkgconf \ + host-ninja \ + qt6base + +define QT6SVG_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SVG_BUILDDIR) +endef + +define QT6SVG_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SVG_BUILDDIR) +endef + +define QT6SVG_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SVG_BUILDDIR) +endef + +$(eval $(cmake-package)) From 4f9ce6dbf6c76398d5d1e4e8cc3b883e83d55394 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 1 Jul 2023 20:06:55 +0200 Subject: [PATCH 0853/2890] package/gupnp: fix build with newer versions of libxml2 Fixes: http://autobuild.buildroot.net/results/b26/b267c4137edebc504757b6275824c748cce3d894/ libxml2 deprecated the function xmlRecoverMemory with commit https://github.com/GNOME/libxml2/commit/51035c539edf67de93ced3cf037bb1f2b298e526 first included in versions 2.11.0. Buildroot bumped libxml2 to the 2.11 branch with commit dfe1ca7872a45bcdc825ff0900d7fd929097a635. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-all-Drop-xmlRecoverMemory.patch | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 package/gupnp/0001-all-Drop-xmlRecoverMemory.patch diff --git a/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch b/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch new file mode 100644 index 000000000000..46e09c267eec --- /dev/null +++ b/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch @@ -0,0 +1,113 @@ +From c3d084736cca81dd4ec05f7e4b634050eb6e8525 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Thu, 4 May 2023 19:14:29 +0200 +Subject: [PATCH] all: Drop xmlRecoverMemory + +use xmlReadMemory, also use NONET flat + +Upstream: https://gitlab.gnome.org/GNOME/gupnp/-/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d + +Signed-off-by: Bernd Kuhls +[Bernd: backported to branch gupnp-1.4] +--- + libgupnp/gupnp-control-point.c | 7 +++++-- + libgupnp/gupnp-service-info.c | 8 ++++++-- + libgupnp/gupnp-service-proxy-action.c | 7 +++++-- + libgupnp/gupnp-service-proxy.c | 7 +++++-- + libgupnp/gupnp-service.c | 7 +++++-- + 5 files changed, 26 insertions(+), 10 deletions(-) + +diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c +index deb4b42..17c485a 100644 +--- a/libgupnp/gupnp-control-point.c ++++ b/libgupnp/gupnp-control-point.c +@@ -613,8 +613,11 @@ got_description_url (SoupSession *session, + xmlDoc *xml_doc; + + /* Parse response */ +- xml_doc = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ xml_doc = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (xml_doc) { + doc = gupnp_xml_doc_new (xml_doc); + +diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c +index 9a9f4de..1c7489e 100644 +--- a/libgupnp/gupnp-service-info.c ++++ b/libgupnp/gupnp-service-info.c +@@ -592,8 +592,12 @@ got_scpd_url (G_GNUC_UNUSED SoupSession *session, + if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { + xmlDoc *scpd; + +- scpd = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ scpd = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); ++ + if (scpd) { + introspection = gupnp_service_introspection_new (scpd); + +diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c +index f089152..079219f 100644 +--- a/libgupnp/gupnp-service-proxy-action.c ++++ b/libgupnp/gupnp-service-proxy-action.c +@@ -87,8 +87,11 @@ check_action_response (G_GNUC_UNUSED GUPnPServiceProxy *proxy, + } + + /* Parse response */ +- response = xmlRecoverMemory (action->msg->response_body->data, +- action->msg->response_body->length); ++ response = xmlReadMemory (action->msg->response_body->data, ++ action->msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + + if (!response) { + if (action->msg->status_code == SOUP_STATUS_OK) { +diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c +index 5dd1bfc..eed9882 100644 +--- a/libgupnp/gupnp-service-proxy.c ++++ b/libgupnp/gupnp-service-proxy.c +@@ -1561,8 +1561,11 @@ server_handler (G_GNUC_UNUSED SoupServer *soup_server, + } + + /* Parse the actual XML message content */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + /* Failed */ + g_warning ("Failed to parse NOTIFY message body"); +diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c +index 2794ebc..e82daaa 100644 +--- a/libgupnp/gupnp-service.c ++++ b/libgupnp/gupnp-service.c +@@ -1002,8 +1002,11 @@ control_server_handler (SoupServer *server, + *end = '\0'; + + /* Parse action_node */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + soup_message_set_status (msg, SOUP_STATUS_BAD_REQUEST); + +-- +2.39.2 + From d8f81062d3c4bb9894b408ec28d9de3bbe2143f4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 1 Jul 2023 20:18:31 +0200 Subject: [PATCH 0854/2890] package/gupnp-av: fix build with newer versions of libxml2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../gupnp-av/0001-libxml2.11-support.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/gupnp-av/0001-libxml2.11-support.patch diff --git a/package/gupnp-av/0001-libxml2.11-support.patch b/package/gupnp-av/0001-libxml2.11-support.patch new file mode 100644 index 000000000000..739a8d774bda --- /dev/null +++ b/package/gupnp-av/0001-libxml2.11-support.patch @@ -0,0 +1,41 @@ +From 4dbc4c1da2a033c497d84a1291c46f416a9cac51 Mon Sep 17 00:00:00 2001 +From: David Anes +Date: Thu, 4 May 2023 11:54:02 +0200 +Subject: use xmlReadMemory instead of xmlRecoverMemory, as it's been + deprecated in libxml2 2.11.0 + +Since version 2.11.0, some private symbols have been removed. + +Downloaded from +https://code.opensuse.org/package/gupnp-av/blob/master/f/gupnp-av-libxml2.11-support.patch + +Upstream: https://gitlab.gnome.org/GNOME/gupnp-av/-/issues/10 + +Signed-off-by: Bernd Kuhls +--- +Index: gupnp-av-0.14.1/libgupnp-av/gupnp-didl-lite-parser.c +=================================================================== +--- gupnp-av-0.14.1.orig/libgupnp-av/gupnp-didl-lite-parser.c ++++ gupnp-av-0.14.1/libgupnp-av/gupnp-didl-lite-parser.c +@@ -230,7 +230,7 @@ gupnp_didl_lite_parser_parse_didl_recurs + GUPnPAVXMLDoc *xml_doc = NULL; + gboolean result; + +- doc = xmlRecoverMemory (didl, strlen (didl)); ++ doc = xmlReadMemory (didl, strlen (didl), NULL, NULL, XML_PARSE_RECOVER); + if (doc == NULL) { + g_set_error (error, + G_MARKUP_ERROR, +Index: gupnp-av-0.14.1/libgupnp-av/gupnp-feature-list-parser.c +=================================================================== +--- gupnp-av-0.14.1.orig/libgupnp-av/gupnp-feature-list-parser.c ++++ gupnp-av-0.14.1/libgupnp-av/gupnp-feature-list-parser.c +@@ -114,7 +114,7 @@ gupnp_feature_list_parser_parse_text + xmlNode *element; + GList *feature_list = NULL; + +- doc = xmlRecoverMemory (text, strlen (text)); ++ doc = xmlReadMemory (text, strlen (text), NULL, NULL, XML_PARSE_RECOVER); + if (doc == NULL) { + g_set_error (error, + G_MARKUP_ERROR, From e539853fc31a8228a2ad86eca243fd6b4ade0cff Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 1 Jul 2023 20:18:51 +0200 Subject: [PATCH 0855/2890] package/rygel: fix Config.in comment Move the comment out of the if-clause and include the python3 dependency Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/rygel/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/rygel/Config.in b/package/rygel/Config.in index 30e843053705..e160068a5561 100644 --- a/package/rygel/Config.in +++ b/package/rygel/Config.in @@ -52,12 +52,12 @@ comment "gstreamer1 needs gst1-editing-services" endchoice -comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" +endif # BR2_PACKAGE_RYGEL + +comment "rygel needs python3 and a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_HOST_GCC_AT_LEAST_8 - -endif # BR2_PACKAGE_RYGEL + !BR2_HOST_GCC_AT_LEAST_8 || !BR2_PACKAGE_PYTHON3 From 9f55efebdf53c14aa45f33c70fe60b1e0c52d43f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 30 Jun 2023 22:53:46 +0200 Subject: [PATCH 0856/2890] package/libnss: bump version to 3.91 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 63a35285d77c..5a4fde42b66c 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_89_1_RTM/src/SHA256SUMS -sha256 3adaedb9e70c3c5f40603bf60a01e336190a6dbe01929d395f16b01fe84a0156 nss-3.89.1.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_91_RTM/src/SHA256SUMS +sha256 84bd46376df17118c55f6d73d30fd93a0af21296c66e7690471547e5898fc4b3 nss-3.91.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 1253cc5d41a3..23b17ab4596d 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.89.1 +LIBNSS_VERSION = 3.91 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From 86cca91c2498eeb2cd91480de328755f3c32404c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Sun, 18 Jun 2023 17:44:24 +0300 Subject: [PATCH 0857/2890] package/libmdbx: bump version to 0.12.7 "Artek" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is bugfix release of stable libmdbx branch, on the day of international children's camp «Artek». It is reasonable to backport this patch to all applicable releases/branches of Buildroot. The most significant fixes of v0.12.7: - added workaround for build issues with modern GCC using `-m32 -arch=i686 -Ofast`. - fixed the cause of the false-positive warning of modern GCC in the C++ API. - refined DB opening in "recovery" mode and switching to a given meta-page. The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: Леонид Юрьев (Leonid Yuriev) Signed-off-by: Thomas Petazzoni --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index 7a5b19952ea8..0f5908cf3826 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 9c3abaaf9079a9518bb7155734817a2e286fffea46f7cc0825dfbd1cf9174075 libmdbx-amalgamated-0.12.5.tar.xz +sha256 e150541c2b07558b961e754e8e9171bf1aa974c8e936f62bd375606f7d550667 libmdbx-amalgamated-0.12.7.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index 0c6c9bcb9f0a..84b58632b688 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.12.5 +LIBMDBX_VERSION = 0.12.7 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From 61f5ecc56e2cbd129dcfb1f94fef8e57180a5d45 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Jun 2023 07:43:25 +0200 Subject: [PATCH 0858/2890] package/lightning: bump version to 2.2.2 Release notes: https://lists.gnu.org/archive/html/lightning/2023-04/msg00004.html Fixes: http://autobuild.buildroot.net/results/c50/c50fa2d861c634eb0800cf551fc4a7e5fa5752bf/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/lightning/lightning.hash | 2 +- package/lightning/lightning.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lightning/lightning.hash b/package/lightning/lightning.hash index 97b391674cf2..6f7c24d19c88 100644 --- a/package/lightning/lightning.hash +++ b/package/lightning/lightning.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98671681d5684770ccb06a07fa3b8f032a454bdb56eafc18e6fab04459ea3caa lightning-2.2.1.tar.gz +sha256 0aca8242dead17d62117bcfcb078e6a9ea856cc81742813c9e8394bcce73b3e2 lightning-2.2.2.tar.gz sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/lightning/lightning.mk b/package/lightning/lightning.mk index 4a8c7e5efd28..c23ae9745e11 100644 --- a/package/lightning/lightning.mk +++ b/package/lightning/lightning.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIGHTNING_VERSION = 2.2.1 +LIGHTNING_VERSION = 2.2.2 LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning LIGHTNING_LICENSE = LGPL-3.0+ LIGHTNING_LICENSE_FILES = COPYING.LESSER From 391900aae0f1783a2f2305b18356ae3323a8124c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 19 Jun 2023 16:56:37 -0300 Subject: [PATCH 0859/2890] package/crucible: bump to version 2023.04.12 Bump to version 2023.04.12. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/crucible/crucible.hash | 2 +- package/crucible/crucible.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/crucible/crucible.hash b/package/crucible/crucible.hash index d0a2a63fab26..256513da6b98 100644 --- a/package/crucible/crucible.hash +++ b/package/crucible/crucible.hash @@ -1,2 +1,2 @@ -sha256 1229c7d1587a97e9f3d456392e06c7be288bacf6ffb68c940d497bf55edab20b crucible-2022.05.25.tar.gz +sha256 bfeaa9b1c8bb95f02d33bd915892e748eb8939fd8b901e1d31d2efa7f7aefcb3 crucible-2023.04.12.tar.gz sha256 d88514630470aec9fa7abdc990a1e0a8751a752321bffa868188c49009d64d59 LICENSE diff --git a/package/crucible/crucible.mk b/package/crucible/crucible.mk index fdad709dded2..dad89b214956 100644 --- a/package/crucible/crucible.mk +++ b/package/crucible/crucible.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRUCIBLE_VERSION = 2022.05.25 +CRUCIBLE_VERSION = 2023.04.12 CRUCIBLE_SITE = $(call github,usbarmory,crucible,v$(CRUCIBLE_VERSION)) CRUCIBLE_LICENSE = GPL-3.0 CRUCIBLE_LICENSE_FILES = LICENSE From fecb49eb2f478e464f1f36ef3319c838db4cefb1 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 19 Jun 2023 16:56:22 -0300 Subject: [PATCH 0860/2890] configs/imx7d-sdb: bump the kernel version Bump the kernel version to 6.1.34. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx7d-sdb_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/imx7d-sdb_defconfig b/configs/imx7d-sdb_defconfig index 8ee5e1fc4015..cf4da342c150 100644 --- a/configs/imx7d-sdb_defconfig +++ b/configs/imx7d-sdb_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.34" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" From cf134e6b13be0127ed80e1ac61cba914f0a6a7f7 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 17 Jun 2023 17:47:43 +0200 Subject: [PATCH 0861/2890] toolchain/toolchain-external/toolchain-external-arm-arm: bump to version 12.2-rel1 Updated to gcc 12.2, gdb 12, binutils 2.39, glibc 2.36. Upstream changed version scheme previously based on the release date (2021.07) to a version scheme based on gcc version (12.2.rel1). The runtime issue (Illegal instruction on some x86 host) [1] seems to be fixed since it can't be reproduced anymore on the same host. The x86_64 host variant prebuilt toolchain is built on RHEL7 (glibc 2.17) and is likely also be useable on OS versions like RHEL8, Ubuntu 18.04 or later. The AArch64 host variant prebuilt toolchain is built on Ubuntu 18.04 (glibc 2.27) is likely also be useable on OS versions like RHEL8, Ubuntu 18.04 or later. Use the sha256 hash that is now provided by upsteam. Tested with qemu_arm_vexpress_defconfig. [1] https://bugs.linaro.org/show_bug.cgi?id=5825#c19 [2] https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../toolchain-external-arm-arm/Config.in | 8 ++++---- .../toolchain-external-arm-arm.hash | 11 ++++------- .../toolchain-external-arm-arm.mk | 6 +++--- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index 28c6541406e9..4aab41693d9e 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in @@ -3,7 +3,7 @@ comment "Arm toolchains available for Cortex-A with NEON + EABIhf" depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF || !BR2_ARM_CPU_HAS_NEON config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM - bool "Arm ARM 2021.07" + bool "Arm ARM 12.2.rel1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_ARM_CPU_HAS_NEON @@ -13,12 +13,12 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help - Arm toolchain for the ARM architecture. It uses GCC 10.3, - GDB 10.2, glibc 2.33, Binutils 2.36.1. It generates code + Arm toolchain for the ARM architecture. It uses GCC 12.2, + GDB 12, glibc 2.36, Binutils 2.39. It generates code that runs on all Cortex-A profile devices. The code generated uses the hard floating point calling convention, and uses the NEON FPU instructions. diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash index 1fc2c5de57de..2c1af4cfccca 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash @@ -1,7 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.xz.asc -md5 87ec580b290df2febc7c476f59484635 gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.xz -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-aarch64-arm-none-linux-gnueabihf.tar.xz.asc -md5 0f1c5c90f5c62e1d1066f75fb3e51e21 gcc-arm-10.3-2021.07-aarch64-arm-none-linux-gnueabihf.tar.xz -# locally calculated -sha256 aa074fa8371a4f73fecbd16bd62c8b1945f23289e26414794f130d6ccdf8e39c gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.xz -sha256 fccd7af76988da2b077f939eb2a78baa9935810918d2bf3f837bc74f52efa825 gcc-arm-10.3-2021.07-aarch64-arm-none-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz.sha256asc +sha256 d73f230bb946231b648a960b719f2cc1afc792ec2e36f9abc25552f00923a926 arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz.sha256asc +sha256 860f49bc60d559f06408f07a24bc2a09e5b8f9118cfe1daed521ab321c03c78e arm-gnu-toolchain-12.2.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk index 8731a4f0e5dc..164b60e6cae8 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2021.07 -TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 12.2.rel1 +TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-10.3-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-$(HOSTARCH)-arm-none-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-$(HOSTARCH)-arm-none-linux-gnueabihf.tar.xz $(eval $(toolchain-external-package)) From 90404e84c1c9d65b4f38cc3ebc30ef6a4da314cb Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 17 Jun 2023 17:47:44 +0200 Subject: [PATCH 0862/2890] toolchain/toolchain-external/toolchain-external-arm-aarch64: bump to version 12.2-rel1 Updated to gcc 12.2, gdb 12, binutils 2.39, glibc 2.36. Upstream changed version scheme previously based on the release date (2021.07) to a version scheme based on gcc version (12.2.rel1). The runtime issue (Illegal instruction on some x86 host) [1] seems to be fixed since it can't be reproduced anymore on the same host. The x86_64 host variant prebuilt toolchain is built on RHEL7 (glibc 2.17) and is likely also be useable on OS versions like RHEL8, Ubuntu 18.04 or later. The AArch64 host variant prebuilt toolchain is built on Ubuntu 18.04 (glibc 2.27) is likely also be useable on OS versions like RHEL8, Ubuntu 18.04 or later. Use the sha256 hash that is now provided by upsteam. Tested with qemu_aarch64_virt_defconfig. [1] https://bugs.linaro.org/show_bug.cgi?id=5825#c19 [2] https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../toolchain-external-arm-aarch64/Config.in | 4 ++-- .../toolchain-external-arm-aarch64.hash | 6 ++---- .../toolchain-external-arm-aarch64.mk | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in index 9eb5d64a9d17..0c2e64192ddd 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in @@ -1,12 +1,12 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 - bool "Arm AArch64 2021.07" + bool "Arm AArch64 12.2.rel1" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash index ca1ea48bcb60..6c4847831ebf 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash @@ -1,4 +1,2 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz.asc -md5 07bbe2b5277b75ba36a924e9136366a4 gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz -# locally calculated -sha256 1e33d53dea59c8de823bbdfe0798280bdcd138636c7060da9d77a97ded095a84 gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-aarch64-none-linux-gnu.tar.xz.sha256asc +sha256 6e8112dce0d4334d93bd3193815f16abe6a2dd5e7872697987a0b12308f876a4 arm-gnu-toolchain-12.2.rel1-x86_64-aarch64-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk index 356e0810b3f9..9cdf58305b90 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 2021.07 -TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 12.2.rel1 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = gcc-arm-10.3-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz $(eval $(toolchain-external-package)) From 0b9877a4b93c5f849c293b1c220490be5ed241ec Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 17 Jun 2023 17:47:45 +0200 Subject: [PATCH 0863/2890] toolchain/toolchain-external/toolchain-external-arm-aarch64-be: bump to version 12.2-rel1 Updated to gcc 12.2, gdb 12, binutils 2.39, glibc 2.36. Upstream changed version scheme previously based on the release date (2021.07) to a version scheme based on gcc version (12.2.rel1). The runtime issue (Illegal instruction on some x86 host) [1] seems to be fixed since it can't be reproduced anymore on the same host. The x86_64 host variant prebuilt toolchain is built on RHEL7 (glibc 2.17) and is likely also be useable on OS versions like RHEL8, Ubuntu 18.04 or later. The AArch64 host variant prebuilt toolchain is built on Ubuntu 18.04 (glibc 2.27) is likely also be useable on OS versions like RHEL8, Ubuntu 18.04 or later. Use the sha256 hash that is now provided by upsteam. [1] https://bugs.linaro.org/show_bug.cgi?id=5825#c19 [2] https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../toolchain-external-arm-aarch64-be/Config.in | 4 ++-- .../toolchain-external-arm-aarch64-be.hash | 6 ++---- .../toolchain-external-arm-aarch64-be.mk | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in index eeb88579feb3..62e5ea866774 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in @@ -1,12 +1,12 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE - bool "Arm AArch64 BE 2021.07" + bool "Arm AArch64 BE 12.2.rel1" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash index 1079917c98a9..f148d6326d16 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash @@ -1,4 +1,2 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64_be-none-linux-gnu.tar.xz.asc -md5 54cbaef7db7eb3de27732500f9da9c6f gcc-arm-10.3-2021.07-x86_64-aarch64_be-none-linux-gnu.tar.xz -# locally calculated -sha256 63c34cac07ceadd74620ea87f27af1aa6a6f55c20a5bc116af21a59ddb6b6a6a gcc-arm-10.3-2021.07-x86_64-aarch64_be-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-aarch64_be-none-linux-gnu.tar.xz.sha256asc +sha256 47632b5594ed6c3efda92a55c4c330263fc22f5d845d9e1c7d969ce24fcedeea arm-gnu-toolchain-12.2.rel1-x86_64-aarch64_be-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk index 5a6dbc60d5b1..d35b945b0495 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 2021.07 -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 12.2.rel1 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = gcc-arm-10.3-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz $(eval $(toolchain-external-package)) From 0c4c7da2f33cd701f614709e85a097a8751d81a4 Mon Sep 17 00:00:00 2001 From: Konstantin Menyaev Date: Fri, 16 Jun 2023 04:23:24 +0300 Subject: [PATCH 0864/2890] package/dnsmasq: improve init script - Use pidfile for more accurate process match - Fix coding style issues to be able to drop a problem reported by check-package on missing variables Signed-off-by: Konstantin Menyaev Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 +- package/dnsmasq/S80dnsmasq | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 847f823ed0a8..278b150cb665 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -359,7 +359,7 @@ package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch Upstream package/dmraid/0001-fix-compilation-under-musl.patch Upstream package/dmraid/S20dmraid Variables -package/dnsmasq/S80dnsmasq Shellcheck Variables +package/dnsmasq/S80dnsmasq Shellcheck package/docker-engine/S60dockerd Indent Shellcheck Variables package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch Upstream package/domoticz/S99domoticz Shellcheck diff --git a/package/dnsmasq/S80dnsmasq b/package/dnsmasq/S80dnsmasq index b052259e87f1..175daf9d2683 100644 --- a/package/dnsmasq/S80dnsmasq +++ b/package/dnsmasq/S80dnsmasq @@ -1,16 +1,20 @@ #!/bin/sh +DAEMON="dnsmasq" +PIDFILE="/var/run/$DAEMON.pid" + [ -f /etc/dnsmasq.conf ] || exit 0 case "$1" in start) printf "Starting dnsmasq: " - start-stop-daemon -S -x /usr/sbin/dnsmasq + start-stop-daemon -S -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- \ + --pid-file="$PIDFILE" [ $? = 0 ] && echo "OK" || echo "FAIL" ;; stop) printf "Stopping dnsmasq: " - start-stop-daemon -K -q -x /usr/sbin/dnsmasq + start-stop-daemon -K -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" [ $? = 0 ] && echo "OK" || echo "FAIL" ;; restart|reload) From 717762b5f59a821d527fc5c5f307bc6b70c40661 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 27 Jun 2023 16:34:00 +0200 Subject: [PATCH 0865/2890] configs/nitrogen*: add missing openssl u-boot dependency Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271709 https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271710 https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271712 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- configs/nitrogen6sx_defconfig | 1 + configs/nitrogen6x_defconfig | 1 + configs/nitrogen7_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index 967d064f1c5a..2b12b169a099 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -28,6 +28,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig index 1cded537657c..903d0abd9f66 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig index d1e81d90fdee..718d203319f7 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" From ce8bf14ff61199c61577ee79f6745616466bc6f7 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 27 Jun 2023 16:34:01 +0200 Subject: [PATCH 0866/2890] configs/nitrogen*: add missing pylibfdt u-boot dependency Needed by binman. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271714 https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271716 https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271718 https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271719 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- configs/nitrogen8m_defconfig | 1 + configs/nitrogen8mm_defconfig | 1 + configs/nitrogen8mn_defconfig | 1 + configs/nitrogen8mp_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig index 6c490f195bad..4ae3f45ff118 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/nitrogen8mm_defconfig b/configs/nitrogen8mm_defconfig index 27cdc9e19e58..0d0482458bac 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/nitrogen8mn_defconfig b/configs/nitrogen8mn_defconfig index 775bdecd90a9..ae53f5ce04e7 100644 --- a/configs/nitrogen8mn_defconfig +++ b/configs/nitrogen8mn_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/nitrogen8mp_defconfig b/configs/nitrogen8mp_defconfig index 0767ab137537..105d572a7fcd 100644 --- a/configs/nitrogen8mp_defconfig +++ b/configs/nitrogen8mp_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y From 7fde35212c49f0d6e274cbcb6f3f5c871bf13398 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Jun 2023 19:29:25 +0200 Subject: [PATCH 0867/2890] package/haproxy: fix build on aarch64 Fixes: http://autobuild.buildroot.net/results/07c/07ccb8c45c709a4b6ed32aafa33cd04e74174b11/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...mic.h-may-need-compiler.h-on-ARMv8.2.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch diff --git a/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch b/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch new file mode 100644 index 000000000000..b3b1f732abc4 --- /dev/null +++ b/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch @@ -0,0 +1,36 @@ +From 5ab3c61932af7619518169da744ba6346f060405 Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Thu, 8 Dec 2022 08:32:57 +0100 +Subject: [PATCH] BUILD: atomic: atomic.h may need compiler.h on ARMv8.2-a + +We get a build error in ncbuf.c when building for ARMv8.2-a because ncbuf +has minimal includes and among them bug.h which includes atomic.h. Atomic.h +may use "forceinline" without including compiler.h, hence the build error. +It was verified that adding it doesn't inflate the total headers. + +Since all other C files include api.h which already covers this, there's +no real need to bapkport this. The issue was already there in 2.3 though. + +Upstream: https://git.haproxy.org/?p=haproxy.git;a=commitdiff;h=5ab3c61932af7619518169da744ba6346f060405#patch1 + +Signed-off-by: Bernd Kuhls +--- + include/haproxy/atomic.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/haproxy/atomic.h b/include/haproxy/atomic.h +index f60be95..7e3c826 100644 +--- a/include/haproxy/atomic.h ++++ b/include/haproxy/atomic.h +@@ -23,6 +23,8 @@ + #ifndef _HAPROXY_ATOMIC_H + #define _HAPROXY_ATOMIC_H + ++#include ++ + /* A few notes for the macros and functions here: + * - this file is painful to edit, most operations exist in 3 variants, + * no-thread, threads with gcc<4.7, threads with gcc>=4.7. Be careful when +-- +1.7.10.4 + From f43f9c6ea67536e0052cd1974ac2a7a48524c7d4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Jun 2023 19:29:26 +0200 Subject: [PATCH 0868/2890] package/haproxy: bump version to 2.6.14 Changelog: http://www.haproxy.org/download/2.6/src/CHANGELOG Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index f5540ee44a2f..20048da7ece1 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.9.tar.gz.sha256 -sha256 f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701 haproxy-2.6.9.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.14.tar.gz.sha256 +sha256 bd3dd9fa60391ca09e1225e1ac3163e45be83c3f54f2fd76a30af289cc6e4fd4 haproxy-2.6.14.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 012c1dfdb67d..2b8920efa6bf 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.6 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).9 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).14 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From 6dad3a709c7b36fd72cf90adb1e344201f3db96c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Jun 2023 19:01:10 +0200 Subject: [PATCH 0869/2890] package/assimp: needs gcc >= 7 Fixes: http://autobuild.buildroot.net/results/d6c/d6caf3c2c0fd670e70950d3e89629df39f8ce596/ After adding various fixes for the autobuilder error and subsequent build errors this build error can only be fixed by using gcc >= 7: output/build/assimp-5.2.5/code/AssetLib/Obj/ObjFileParser.cpp:55:23: fatal error: string_view: No such file or directory Usage of string_view was added in version 5.2.5 by upstream commit https://github.com/assimp/assimp/commit/f6bcb160d08af267778fbc59b480ce5d9c52c92c which was added to buildroot by commit 7d843d9cc0064d6690cfc000e579f575e2c0cc4d Removed BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is only valid for gcc < 7 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/assimp/Config.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/assimp/Config.in b/package/assimp/Config.in index 5ffb50cd79c2..4bddb3598d8c 100644 --- a/package/assimp/Config.in +++ b/package/assimp/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_ASSIMP bool "assimp" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB help @@ -14,8 +14,6 @@ config BR2_PACKAGE_ASSIMP http://www.assimp.org -comment "assimp needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - -comment "assimp needs exception_ptr" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +comment "assimp needs a toolchain w/ C++, wchar, gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 From 0e425556912baec390b8fadaca2d31e9ed722206 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 11 Jun 2023 15:16:27 +0200 Subject: [PATCH 0870/2890] package/binutils: invert version logic BR2_BINUTILS_GPROFNG was made available for known supported versions only (binutils 2.39 at this point). As all new versions of binutils support gprofng, it makes sense to invert the logic, and instead make BR2_BINUTILS_GPROFNG not available with old binutils versions. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 5dd2af2f9caa..6e93b65c3e0b 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -39,7 +39,9 @@ config BR2_BINUTILS_VERSION config BR2_BINUTILS_GPROFNG bool "gprofng support" - depends on BR2_BINUTILS_VERSION_2_39_X + depends on !BR2_BINUTILS_VERSION_ARC + depends on !BR2_BINUTILS_VERSION_2_37_X + depends on !BR2_BINUTILS_VERSION_2_38_X help This option enables support for gprofng, a new profiler. From bd17127b4aea85893f3697753745b5498aa27c7a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 11 Jun 2023 15:16:28 +0200 Subject: [PATCH 0871/2890] package/{binutils, gdb}: switch to https urls for archives hashes FTP urls doesn't work anymore with Firefox [1] and Google Chrome [2], switch to https urls. [1] https://blog.mozilla.org/addons/2020/04/13/what-to-expect-for-the-upcoming-deprecation-of-ftp-in-firefox/ [2] https://chromestatus.com/feature/6246151319715840 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/binutils/binutils.hash | 2 +- package/gdb/gdb.hash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 1a8574de92be..5d45813b5ac9 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,4 +1,4 @@ -# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum +# From https://gcc.gnu.org/pub/binutils/releases/sha512.sum sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 04c7d02d2f6a..36e2685a25d7 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,4 +1,4 @@ -# From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum +# From https://gcc.gnu.org/pub/gdb/releases/sha512.sum sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz sha512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d gdb-12.1.tar.xz From e2d794416cebe20f0ea270332641593b329027fc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 11 Jun 2023 15:16:29 +0200 Subject: [PATCH 0872/2890] package/binutils: add support for version 2.40 See: https://sourceware.org/pipermail/binutils/2023-January/125671.html Disable zstd support to avoid adding a new dependency. Add Upstream tag on each binutils patches: 0001-sh-conf.patch: Buildroot specific since we are carrying this patch for years. 0002-poison-system-directories.patch: Add the Buildroot Upstream tag Remove 0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch since it was rejected by upstream [1] and actually only needed for binutils < 2.37. Binutils 2.37 replaced AC_PROG_CC with AC_PROG_CC_C99 in top level configure file [2]. [1] https://sourceware.org/pipermail/binutils/2021-June/116907.html [2] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=a8d6316b67d52eaa1b7b311084ddff71a66f7cc0 Runtime tested: https://gitlab.com/kubu93/buildroot/-/pipelines/895618463 Signed-off-by: Romain Naour Cc: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/binutils/2.40/0001-sh-conf.patch | 50 +++ .../2.40/0002-poison-system-directories.patch | 309 ++++++++++++++++++ package/binutils/Config.in.host | 4 + package/binutils/binutils.hash | 1 + package/binutils/binutils.mk | 6 +- 5 files changed, 368 insertions(+), 2 deletions(-) create mode 100644 package/binutils/2.40/0001-sh-conf.patch create mode 100644 package/binutils/2.40/0002-poison-system-directories.patch diff --git a/package/binutils/2.40/0001-sh-conf.patch b/package/binutils/2.40/0001-sh-conf.patch new file mode 100644 index 000000000000..ffa23a88a793 --- /dev/null +++ b/package/binutils/2.40/0001-sh-conf.patch @@ -0,0 +1,50 @@ +From 87551ade276aa0db86c4567b3ac219c4f979b538 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +Upstream: N/A [Buildroot specific] + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 417fc5a970c..fa8ba331796 100755 +--- a/configure ++++ b/configure +@@ -4067,7 +4067,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 3a1eb0357e5..d700c14ddf5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1300,7 +1300,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.40.1 + diff --git a/package/binutils/2.40/0002-poison-system-directories.patch b/package/binutils/2.40/0002-poison-system-directories.patch new file mode 100644 index 000000000000..4b927b630e03 --- /dev/null +++ b/package/binutils/2.40/0002-poison-system-directories.patch @@ -0,0 +1,309 @@ +From a6d90a842e349545ceb27f022317618dd99378ce Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Waldemar: rebase on top of 2.39] +Signed-off-by: Waldemar Brodkorb +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] +Upstream: N/A [Buildroot specific] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index ad0dc6a106c..d21edaddce7 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -58,6 +58,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index 43b44be1dc6..28f054ea3f8 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -839,6 +839,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1521,6 +1522,8 @@ Optional Features: + --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) +@@ -15504,7 +15507,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 77edac3258c..a74dac63038 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + 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 05649ff61b8..1818c227473 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -163,6 +163,14 @@ typedef struct + in the linker script. */ + bool force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index db3a9f09b45..9dacc934f80 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2949,6 +2949,18 @@ 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. + ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. ++ + @kindex --package-metadata=@var{JSON} + @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 b8fd4e5d8e0..1f1d8e23bc9 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -117,6 +117,23 @@ 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)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 0538f0a06a1..d1de3aec23d 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -166,6 +166,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + OPTION_WARN_EXECSTACK, + OPTION_NO_WARN_EXECSTACK, + OPTION_WARN_RWX_SEGMENTS, +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 9290a189b0d..e2e3074e872 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -321,6 +321,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; + + /* 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 c5960385572..da0a7829914 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -613,6 +613,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -625,6 +633,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1692,6 +1701,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1837,6 +1854,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.40.1 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 6e93b65c3e0b..fe1755683c5d 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -24,6 +24,9 @@ config BR2_BINUTILS_VERSION_2_38_X config BR2_BINUTILS_VERSION_2_39_X bool "binutils 2.39" +config BR2_BINUTILS_VERSION_2_40_X + bool "binutils 2.40" + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" depends on BR2_arc @@ -36,6 +39,7 @@ config BR2_BINUTILS_VERSION default "2.37" if BR2_BINUTILS_VERSION_2_37_X default "2.38" if BR2_BINUTILS_VERSION_2_38_X default "2.39" if BR2_BINUTILS_VERSION_2_39_X + default "2.40" if BR2_BINUTILS_VERSION_2_40_X config BR2_BINUTILS_GPROFNG bool "gprofng support" diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 5d45813b5ac9..e831d31b8a3e 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -2,6 +2,7 @@ sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz +sha512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 binutils-2.40.tar.xz # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 1ef7ee57d2ff..e34dd79f6ff6 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -54,7 +54,8 @@ BINUTILS_CONF_OPTS = \ --with-system-zlib \ --disable-gprofng \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ - $(BINUTILS_EXTRA_CONFIG_OPTIONS) + $(BINUTILS_EXTRA_CONFIG_OPTIONS) \ + --without-zstd ifeq ($(BR2_STATIC_LIBS),y) BINUTILS_CONF_OPTS += --disable-plugins @@ -90,7 +91,8 @@ HOST_BINUTILS_CONF_OPTS = \ --enable-plugins \ --enable-lto \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ - $(BINUTILS_EXTRA_CONFIG_OPTIONS) + $(BINUTILS_EXTRA_CONFIG_OPTIONS) \ + --without-zstd ifeq ($(BR2_BINUTILS_GPROFNG),y) HOST_BINUTILS_DEPENDENCIES += host-bison From fb50eab8a5e6b82dd0a2916b6805ab712d4d7350 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 11 Jun 2023 15:16:30 +0200 Subject: [PATCH 0873/2890] package/binutils: switch to 2.39.x as the default version Now that 2.40 has been released, let's use 2.39.x as the default binutils version. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 2 +- package/binutils/binutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index fe1755683c5d..a1800e49e2cf 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_38_X if !BR2_arc + default BR2_BINUTILS_VERSION_2_39_X if !BR2_arc default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index e34dd79f6ff6..0dd8526b26a7 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-2020.09-release else -BINUTILS_VERSION = 2.38 +BINUTILS_VERSION = 2.39 endif endif # BINUTILS_VERSION From 8a55a0bf8ee78f890f928a3b38c26d45fded25cf Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 11 Jun 2023 15:16:31 +0200 Subject: [PATCH 0874/2890] package/binutils: drop 2.37.x series Now that 2.40.x has been added, that 2.39.x is the default version, drop support for 2.37.x. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 7 - Config.in.legacy | 8 + package/binutils/2.37/0001-sh-conf.patch | 48 --- .../2.37/0002-poison-system-directories.patch | 306 ------------------ ...or1k-fix-building-with-gcc-version-5.patch | 50 --- ...tive-relocation-against-dynamic-on-P.patch | 59 ---- ...K_GOT16-signed-overflow-by-using-spe.patch | 75 ----- ...le-descriptor-if-there-is-no-archive.patch | 236 -------------- ...OT32-relocations-against-ABS-symbols.patch | 47 --- package/binutils/Config.in.host | 8 - package/binutils/binutils.hash | 1 - 11 files changed, 8 insertions(+), 837 deletions(-) delete mode 100644 package/binutils/2.37/0001-sh-conf.patch delete mode 100644 package/binutils/2.37/0002-poison-system-directories.patch delete mode 100644 package/binutils/2.37/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch delete mode 100644 package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch delete mode 100644 package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch delete mode 100644 package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch delete mode 100644 package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch diff --git a/.checkpackageignore b/.checkpackageignore index 278b150cb665..7d544a6e61fa 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -214,13 +214,6 @@ package/berkeleydb/0001-cwd-db_config.patch Upstream package/berkeleydb/0002-atomic_compare_exchange.patch Upstream package/bind/0001-cross.patch Upstream package/bind/S81named Indent Shellcheck Variables -package/binutils/2.37/0001-sh-conf.patch Upstream -package/binutils/2.37/0002-poison-system-directories.patch Upstream -package/binutils/2.37/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch Upstream -package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch Upstream -package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch Upstream -package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch Upstream -package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch Upstream package/binutils/2.38/0001-sh-conf.patch Upstream package/binutils/2.38/0002-poison-system-directories.patch Upstream package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch Upstream diff --git a/Config.in.legacy b/Config.in.legacy index ac2e302a6b06..d3a67aba830d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,14 @@ endif ############################################################################### +comment "Legacy options removed in 2023.08" + +config BR2_BINUTILS_VERSION_2_37_X + bool "binutils 2.37.x has been removed" + select BR2_LEGACY + help + binutils 2.37 has been removed, use a newer version. + comment "Legacy options removed in 2023.05" config BR2_KERNEL_HEADERS_6_2 diff --git a/package/binutils/2.37/0001-sh-conf.patch b/package/binutils/2.37/0001-sh-conf.patch deleted file mode 100644 index fcc597e4d947..000000000000 --- a/package/binutils/2.37/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 33f3c1f804efc2e4f97849081589efb70cda31e5 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.32] -Signed-off-by: Romain Naour -[Thomas: rebase on top of 2.29, in which sh64 support was removed.] -Signed-off-by: Thomas Petazzoni ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 3dd206525a7..6881ce632f5 100755 ---- a/configure -+++ b/configure -@@ -3892,7 +3892,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index 797a624621e..1f9256bbf18 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1175,7 +1175,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.31.1 - diff --git a/package/binutils/2.37/0002-poison-system-directories.patch b/package/binutils/2.37/0002-poison-system-directories.patch deleted file mode 100644 index 1a5fe465752a..000000000000 --- a/package/binutils/2.37/0002-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From 4d8705ddb55897e8a74b617ab95736d520d9e1ea Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.33.1] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texi | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 26d55a00d47..ffad464783c 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -43,6 +43,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index c197aaef3cb..882263aa43f 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -829,6 +829,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1498,6 +1499,8 @@ Optional Features: - --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) -@@ -15236,7 +15239,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 8ea97c43cd4..0f246db67d8 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -106,6 +106,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - 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 35fafebfaed..74e66405de6 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -162,6 +162,14 @@ typedef struct - in the linker script. */ - bool force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bool poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bool error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texi b/ld/ld.texi -index dd8f571d4e4..3ab210b41b9 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2863,6 +2863,18 @@ 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. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 9d0af06f1f6..7cdd3b1c1b1 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ 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)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 9e8bf5fb835..2f0fadfe0a3 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -163,6 +163,8 @@ enum option_values - OPTION_CTF_VARIABLES, - OPTION_NO_CTF_VARIABLES, - OPTION_CTF_SHARE_TYPES, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 42660eb9a3c..1aef9387f93 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -321,6 +321,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = true; - command_line.warn_search_mismatch = true; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = true; -+ command_line.error_poison_system_directories = false; - - /* 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 00274c500d0..4f23b3a2da2 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -595,6 +595,14 @@ static const struct ld_option ld_options[] = - " is: share-unconflicted (default),\n" - " share-duplicated"), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -607,6 +615,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1643,6 +1652,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = false; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = true; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1788,6 +1805,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = true; -+ - while (ingroup) - { - einfo (_("%P: missing --end-group; added as last command line option\n")); --- -2.31.1 - diff --git a/package/binutils/2.37/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.37/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted file mode 100644 index bfd531b81859..000000000000 --- a/package/binutils/2.37/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Jun 2021 17:28:27 +0200 -Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 - -Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use -an old compiler(i.e. gcc 4.9) build fails on: -``` -elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in -C99 or C11 mode - for (size_t i = 0; i < insn_count; i++) - ^ -``` - -So let's declare `size_t i` at the top of the function instead of inside -for loop. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..32063ab0289 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; - unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ size_t i; - - /* Copy instructions into the output buffer. */ -- for (size_t i = 0; i < insn_count; i++) -+ for (i = 0; i < insn_count; i++) - output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - } - - /* Write out the output buffer. */ -- for (size_t i = 0; i < (insn_count+1); i++) -+ for (i = 0; i < (insn_count+1); i++) - bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - --- -2.31.1 - diff --git a/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch deleted file mode 100644 index 0d18321ee111..000000000000 --- a/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 203b80f8dbdd3ddb860114b03351a0dea28c978f Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 10 Jul 2021 17:57:34 +0200 -Subject: [PATCH] or1k: fix pc-relative relocation against dynamic on PC - relative 26 bit relocation - -When building openal we were seeing the assert failure: - -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePausev -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceStopv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceRewindv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePlayv -collect2: error: ld returned 1 exit status - -This happens because in R_OR1K_INSN_REL_26 case we can't reference local -symbol as previously done but we need to make sure that calls to actual -symbol always call the version of current object. - -bfd/Changelog: - - * elf32-or1k.c (or1k_elf_relocate_section): use a separate entry - in switch case R_OR1K_INSN_REL_26 where we need to check for - !SYMBOL_CALLS_LOCAL() instead of !SYMBOL_REFERENCES_LOCAL(). - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 32063ab0289..67252394173 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1543,6 +1543,18 @@ or1k_elf_relocate_section (bfd *output_bfd, - break; - - case R_OR1K_INSN_REL_26: -+ /* For a non-shared link, these will reference plt or call the -+ version of actual object. */ -+ if (bfd_link_pic (info) && !SYMBOL_CALLS_LOCAL (info, h)) -+ { -+ _bfd_error_handler -+ (_("%pB: pc-relative relocation against dynamic symbol %s"), -+ input_bfd, name); -+ ret_val = false; -+ bfd_set_error (bfd_error_bad_value); -+ } -+ break; -+ - case R_OR1K_PCREL_PG21: - case R_OR1K_LO13: - case R_OR1K_SLO13: --- -2.31.1 - diff --git a/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch deleted file mode 100644 index 8609db95b7ab..000000000000 --- a/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 362a20108782b87cd780a989c0dbd014fc2def8b Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 Jan 2022 09:03:28 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special - howto - -Previously when fixing PR 21464 we masked out upper bits of the -relocation value in order to avoid overflow complaints when acceptable. -It turns out this does not work when the relocation value ends up being -signed. - -To fix this this patch introduces a special howto with -complain_on_overflow set to complain_overflow_dont. This is used in -place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 -relocations. - -bfd/ChangeLog: - - PR 28735 - * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. - (or1k_elf_relocate_section): Use new howto instead of trying to - mask out relocation bits. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..7fd88d72442 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = - false), /* pcrel_offset */ - }; - -+/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 -+ relocations when we know we can ignore overflows. */ -+static reloc_howto_type or1k_elf_got16_no_overflow_howto = -+ HOWTO (R_OR1K_GOT16, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ false, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT16", /* name */ -+ false, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ false); /* pcrel_offset */ -+ - /* Map BFD reloc types to Or1k ELF reloc types. */ - - struct or1k_reloc_map -@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, - if (r_type == R_OR1K_GOT_AHI16) - saw_gotha = true; - -- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 -+ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 - relocation we assume the code is doing the right thing to avoid -- overflows. Here we mask the lower 16-bit of the relocation to -- avoid overflow validation failures. */ -+ overflows. */ - if (r_type == R_OR1K_GOT16 && saw_gotha) -- relocation &= 0xffff; -+ howto = &or1k_elf_got16_no_overflow_howto; - - /* Addend should be zero. */ - if (rel->r_addend != 0) --- -2.25.1 - diff --git a/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch b/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch deleted file mode 100644 index 46697cc5c8a4..000000000000 --- a/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch +++ /dev/null @@ -1,236 +0,0 @@ -From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Mon, 26 Jul 2021 05:59:55 -0700 -Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd - -Close the file descriptor if there is no archive plugin file descriptor -to avoid running out of file descriptors on thin archives with many -archive members. - -bfd/ - - PR ld/28138 - * plugin.c (bfd_plugin_close_file_descriptor): Close the file - descriptor there is no archive plugin file descriptor. - -ld/ - - PR ld/28138 - * testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for - native build. - - PR ld/28138 - * testsuite/ld-plugin/lto.exp: Run ld/28138 tests. - * testsuite/ld-plugin/pr28138.c: New file. - * testsuite/ld-plugin/pr28138-1.c: Likewise. - * testsuite/ld-plugin/pr28138-2.c: Likewise. - * testsuite/ld-plugin/pr28138-3.c: Likewise. - * testsuite/ld-plugin/pr28138-4.c: Likewise. - * testsuite/ld-plugin/pr28138-5.c: Likewise. - * testsuite/ld-plugin/pr28138-6.c: Likewise. - * testsuite/ld-plugin/pr28138-7.c: Likewise. - -(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742) -(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2) - -[Upstream: - https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0] -Signed-off-by: Peter Seiderer ---- - bfd/plugin.c | 8 +++++++ - ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++ - ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++ - 10 files changed, 104 insertions(+) - create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c - create mode 100644 ld/testsuite/ld-plugin/pr28138.c - -diff --git a/bfd/plugin.c b/bfd/plugin.c -index 6cfa2b66470..3bab8febe88 100644 ---- a/bfd/plugin.c -+++ b/bfd/plugin.c -@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd) - && !bfd_is_thin_archive (abfd->my_archive)) - abfd = abfd->my_archive; - -+ /* Close the file descriptor if there is no archive plugin file -+ descriptor. */ -+ if (abfd->archive_plugin_fd == -1) -+ { -+ close (fd); -+ return; -+ } -+ - abfd->archive_plugin_fd_open_count--; - /* Dup the archive plugin file descriptor for later use, which - will be closed by _bfd_archive_close_and_cleanup. */ -diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp -index def69e43ab3..999d911ce6a 100644 ---- a/ld/testsuite/ld-plugin/lto.exp -+++ b/ld/testsuite/ld-plugin/lto.exp -@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } { - } - } - -+run_cc_link_tests [list \ -+ [list \ -+ "Build pr28138.a" \ -+ "-T" "" \ -+ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \ -+ pr28138-6.c pr28138-7.c} {} "pr28138.a" \ -+ ] \ -+ [list \ -+ "Build pr28138.o" \ -+ "" "" \ -+ {pr28138.c} {} \ -+ ] \ -+] -+ -+set exec_output [run_host_cmd "sh" \ -+ "-c \"ulimit -n 20; \ -+ $CC -Btmpdir/ld -o tmpdir/pr28138 \ -+ tmpdir/pr28138.o tmpdir/pr28138.a\""] -+set exec_output [prune_warnings $exec_output] -+if [string match "" $exec_output] then { -+ if { [isnative] } { -+ set exec_output [run_host_cmd "tmpdir/pr28138" ""] -+ if [string match "PASS" $exec_output] then { -+ pass "PR ld/28138" -+ } else { -+ fail "PR ld/28138" -+ } -+ } else { -+ pass "PR ld/28138" -+ } -+} else { -+ fail "PR ld/28138" -+} -+ - set testname "Build liblto-11.a" - remote_file host delete "tmpdir/liblto-11.a" - set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] -diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c -new file mode 100644 -index 00000000000..51d119e1642 ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-1.c -@@ -0,0 +1,6 @@ -+extern int a0(void); -+int -+a1(void) -+{ -+ return 1 + a0(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c -new file mode 100644 -index 00000000000..1120cd797e9 ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-2.c -@@ -0,0 +1,6 @@ -+extern int a1(void); -+int -+a2(void) -+{ -+ return 1 + a1(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c -new file mode 100644 -index 00000000000..ec464947ee6 ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-3.c -@@ -0,0 +1,6 @@ -+extern int a2(void); -+int -+a3(void) -+{ -+ return 1 + a2(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c -new file mode 100644 -index 00000000000..475701b2c5c ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-4.c -@@ -0,0 +1,6 @@ -+extern int a3(void); -+int -+a4(void) -+{ -+ return 1 + a3(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c -new file mode 100644 -index 00000000000..e24f86c363e ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-5.c -@@ -0,0 +1,6 @@ -+extern int a4(void); -+int -+a5(void) -+{ -+ return 1 + a4(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c -new file mode 100644 -index 00000000000..b5b938bdb21 ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-6.c -@@ -0,0 +1,6 @@ -+extern int a5(void); -+int -+a6(void) -+{ -+ return 1 + a5(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c -new file mode 100644 -index 00000000000..4ef75bf0f0c ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-7.c -@@ -0,0 +1,6 @@ -+extern int a6(void); -+int -+a7(void) -+{ -+ return 1 + a6(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c -new file mode 100644 -index 00000000000..68252c9f382 ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138.c -@@ -0,0 +1,20 @@ -+#include -+ -+extern int a7(void); -+ -+int -+a0(void) -+{ -+ return 0; -+} -+ -+int -+main() -+{ -+ if (a7() == 7) -+ { -+ printf ("PASS\n"); -+ return 0; -+ } -+ return 1; -+} --- -2.34.1 - diff --git a/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch deleted file mode 100644 index 3e292822613c..000000000000 --- a/package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Mon, 7 Feb 2022 15:22:19 -0800 -Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols - -GOT32 relocations are allowed since absolute value + addend is stored in -the GOT slot. - -Tested on glibc 2.35 build with GCC 11.2 and -Os. - -bfd/ - - PR ld/28870 - * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 - relocations. - - -Signed-off-by: Waldemar Brodkorb - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ac2411fc80..d00dc45677b 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - irel = *rel; - - /* Only allow relocations against absolute symbol, which can be -- resolved as absolute value + addend. GOTPCREL relocations -- are allowed since absolute value + addend is stored in the -- GOT slot. */ -+ resolved as absolute value + addend. GOTPCREL and GOT32 -+ relocations are allowed since absolute value + addend is -+ stored in the GOT slot. */ - if (bed->target_id == X86_64_ELF_DATA) - { - r_type &= ~R_X86_64_converted_reloc_bit; -@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - else - valid_p = (r_type == R_386_32 - || r_type == R_386_16 -- || r_type == R_386_8); -+ || r_type == R_386_8 -+ || r_type == R_386_GOT32 -+ || r_type == R_386_GOT32X); - - if (valid_p) - *no_dynreloc_p = true; diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index a1800e49e2cf..de5ca866e565 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -12,12 +12,6 @@ choice help Select the version of binutils you wish to use. -config BR2_BINUTILS_VERSION_2_37_X - bool "binutils 2.37" - # AVX512FP16 instructions were not supported before binutils - # 2.38 - depends on !BR2_X86_CPU_HAS_AVX512 - config BR2_BINUTILS_VERSION_2_38_X bool "binutils 2.38" @@ -36,7 +30,6 @@ endchoice config BR2_BINUTILS_VERSION string default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC - default "2.37" if BR2_BINUTILS_VERSION_2_37_X default "2.38" if BR2_BINUTILS_VERSION_2_38_X default "2.39" if BR2_BINUTILS_VERSION_2_39_X default "2.40" if BR2_BINUTILS_VERSION_2_40_X @@ -44,7 +37,6 @@ config BR2_BINUTILS_VERSION config BR2_BINUTILS_GPROFNG bool "gprofng support" depends on !BR2_BINUTILS_VERSION_ARC - depends on !BR2_BINUTILS_VERSION_2_37_X depends on !BR2_BINUTILS_VERSION_2_38_X help This option enables support for gprofng, a new profiler. diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index e831d31b8a3e..1a24c2f4bda1 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,5 +1,4 @@ # From https://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz sha512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 binutils-2.40.tar.xz From b335bd18a07363d53b6dc0faa82e26f068d0ae7b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 12:56:58 +0200 Subject: [PATCH 0875/2890] package/leafnode2: bump version to 2.0.0.alpha202301 Rebased patch. Updated license hash due to upstream refresh of the license file: https://gitlab.com/leafnode-2/leafnode-2/-/commit/37442bbb7dd4f3cfd36f7264b9c3772e09531b5a Switched project URLs to gitlab. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/leafnode2/0001-cross_makefile.patch | 10 +++++----- package/leafnode2/Config.in | 9 +-------- package/leafnode2/leafnode2.hash | 4 ++-- package/leafnode2/leafnode2.mk | 6 +++--- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/package/leafnode2/0001-cross_makefile.patch b/package/leafnode2/0001-cross_makefile.patch index b61a8ef3c694..32116446c311 100644 --- a/package/leafnode2/0001-cross_makefile.patch +++ b/package/leafnode2/0001-cross_makefile.patch @@ -10,11 +10,11 @@ Fix cross-compilation issues Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni -Index: b/Makefile.in +Index: b/Makefile.am =================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -1853,7 +1853,7 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -311,7 +311,7 @@ configparam_data.c: $(srcdir)/config.table b_sortnl$(EXEEXT) genconfigparam_data.awk rm -f config.table.sorted @@ -23,7 +23,7 @@ Index: b/Makefile.in $(AWK) -f $(srcdir)/genconfigparam_data.awk $@ \ || { rm -f $@ ; false ; } -@@ -1868,13 +1868,7 @@ +@@ -326,13 +326,7 @@ install-data-hook: $(INSTALL) -d -m 02770 $(DESTDIR)$(SPOOLDIR) $(INSTALL) -d -m 02770 $(DESTDIR)$(SPOOLDIR)/leaf.node diff --git a/package/leafnode2/Config.in b/package/leafnode2/Config.in index e244bdc45ba2..3700b6fb80e6 100644 --- a/package/leafnode2/Config.in +++ b/package/leafnode2/Config.in @@ -7,11 +7,4 @@ config BR2_PACKAGE_LEAFNODE2 server designed for small sites with just a few active newsgroups. - Leafnode-2 needs inetd, check chapter 14 of the documentation - at: - http://krusty.dt.e-technik.tu-dortmund.de/~ma/leafnode/beta/leafnode-readme.txt - - For example, you can add this line to inetd.conf: - nntp stream tcp nowait news /usr/sbin/leafnode - - http://krusty.dt.e-technik.tu-dortmund.de/~ma/leafnode/beta + https://gitlab.com/leafnode-2/leafnode-2 diff --git a/package/leafnode2/leafnode2.hash b/package/leafnode2/leafnode2.hash index 7dfa7cce8d14..d03ea472b10c 100644 --- a/package/leafnode2/leafnode2.hash +++ b/package/leafnode2/leafnode2.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 34eba2cbbb871b724c8d5dd402d1c358aeb21ba426beb5658e155ed0d7461075 leafnode-2.0.0.alpha20140727b.tar.bz2 +sha256 1c74de60c3f91ef6f8a3ec20f0c34a0933658aeac8e3723a5f286c0646319e5c leafnode2-ce7d3b13fb285c9fb7bffc382ea10fd41e12582d.tar.gz sha256 59d37f745dc5a2d63a51dff344f4ad89f72e76f8c7b7d877f20880d838b1bec9 COPYING -sha256 0c92246a9d3636e0aa6a244f6c481639b2e530fbbb25bc048ce7acd83e1fc5f6 COPYING.LGPL +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index e82ca2e1ee18..3ed2e2026646 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -4,12 +4,12 @@ # ################################################################################ -LEAFNODE2_VERSION = 2.0.0.alpha20140727b -LEAFNODE2_SOURCE = leafnode-$(LEAFNODE2_VERSION).tar.bz2 -LEAFNODE2_SITE = http://krusty.dt.e-technik.tu-dortmund.de/~ma/leafnode/beta +LEAFNODE2_VERSION = ce7d3b13fb285c9fb7bffc382ea10fd41e12582d +LEAFNODE2_SITE = $(call gitlab,leafnode-2,leafnode-2,$(LEAFNODE2_VERSION)) LEAFNODE2_LICENSE = LGPL-2.1 LEAFNODE2_LICENSE_FILES = COPYING COPYING.LGPL LEAFNODE2_DEPENDENCIES = host-pcre pcre +LEAFNODE2_AUTORECONF = YES LEAFNODE2_CONF_ENV = \ PCRECONFIG="$(STAGING_DIR)/usr/bin/pcre-config" From ef95ec920cbae32e5a525d887b7a279440d96f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Mon, 3 Jul 2023 11:10:00 +0200 Subject: [PATCH 0876/2890] package/pkgconf: fix download URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to problems with the registrar (dynadot) [1], the dereferenced.org domain got stolen and is up for auction. While sorting that out, the official download site has changed to a different domain [2]. Update PKGCONF_SITE to the new location. There's an upstream bug to track the issue [3]. [1] https://social.treehouse.systems/@ariadne/110643909699308207 [2] https://github.com/pkgconf/pkgconf/commit/437c2a3218bfcb1cae7fa38a4ccd0cb29575ff07 [3] https://github.com/pkgconf/pkgconf/issues/302 Fixes: https://bugs.busybox.net/show_bug.cgi?id=15673 Signed-off-by: Sébastien Szymanski Signed-off-by: Arnout Vandecappelle --- package/pkgconf/pkgconf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index e9587fae6b2c..1d73b691e173 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -5,7 +5,7 @@ ################################################################################ PKGCONF_VERSION = 1.6.3 -PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf +PKGCONF_SITE = https://distfiles.ariadne.space/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license PKGCONF_LICENSE_FILES = COPYING From c15e60c106bc852a4cd1f987357580e70e6c28ef Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 12:31:21 +0200 Subject: [PATCH 0877/2890] package/python-pyicu: fix build Fixes: http://autobuild.buildroot.net/results/977/977c043615603dd3541e23b81c5f11374606aff6/ Set environment variables to cross-compile friendly values, this prevents icu-config picking up host libraries: https://gitlab.pyicu.org/main/pyicu/-/blob/main/setup.py#L89 https://gitlab.pyicu.org/main/pyicu/-/blob/main/setup.py#L179 https://gitlab.pyicu.org/main/pyicu/-/blob/main/setup.py#L216 This follows the upstream build docs: https://gitlab.pyicu.org/main/pyicu#building-pyicu Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/python-pyicu/python-pyicu.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-pyicu/python-pyicu.mk b/package/python-pyicu/python-pyicu.mk index 512b2f857f0a..53e4a15c4f5e 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -12,4 +12,10 @@ PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu PYTHON_PYICU_SETUP_TYPE = setuptools +PYTHON_PYICU_ENV += \ + ICU_VERSION="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --modversion`" \ + PYICU_CFLAGS="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --variable=CXXFLAGS`" \ + PYICU_LFLAGS="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --libs-only-L` \ + `$(PKG_CONFIG_HOST_BINARY) icu-i18n --libs-only-l`" + $(eval $(python-package)) From 3b2913552ee4e304d4d86e577b237652a8f0a99f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 26 Jun 2023 22:29:01 +0200 Subject: [PATCH 0878/2890] package/python-setuptools: add missing dependency on host-python-wheel While migrating to pep517 build backend the host-python-wheel dependency has been added to host-python-setuptools but not to python-setuptools. Note that host-python-wheel is not really needed during the build of (target) setuptools, but the setup.py script checks if the dependency is present in the host directory. To make everything consistent, add host-python-wheel as a build dependency, and BR2_PACKAGE_PYTHON_WHEEL as a runtime dependency. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4537951715 Signed-off-by: Romain Naour Cc: James Hilliard [Arnout: also add runtime dependency on the target package.] Signed-off-by: Arnout Vandecappelle --- package/python-setuptools/Config.in | 3 ++- package/python-setuptools/python-setuptools.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/python-setuptools/Config.in b/package/python-setuptools/Config.in index 28228534f819..73368c1a491a 100644 --- a/package/python-setuptools/Config.in +++ b/package/python-setuptools/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_SETUPTOOLS bool "python-setuptools" - select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime + select BR2_PACKAGE_PYTHON_WHEEL # runtime help Download, build, install, upgrade, and uninstall Python packages. diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index d957930455c1..39ead10f55c6 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -12,6 +12,7 @@ PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = pep517 +PYTHON_SETUPTOOLS_DEPENDENCIES = host-python-wheel HOST_PYTHON_SETUPTOOLS_DEPENDENCIES = host-python-wheel $(eval $(python-package)) From 28fe2d493b3f08153b866a3d6656fb7c487dae38 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Jul 2023 18:03:31 +0200 Subject: [PATCH 0879/2890] package/libks: bump version to 1.8.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libks/libks.hash | 2 +- package/libks/libks.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libks/libks.hash b/package/libks/libks.hash index dba442bdd29f..998811bc90f9 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz +sha256 c677c36a0d8ceca2e53e07d1de66b87045ac2784df458d012557e2432692528b libks-1.8.3.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index c4f0cd5c7838..b17812619d46 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.2 +LIBKS_VERSION = 1.8.3 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From 83cc31689655da15754a3e873b10857ba37877ba Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Jul 2023 18:06:22 +0200 Subject: [PATCH 0880/2890] package/libmicrohttpd: bump version to 0.9.77 Release notes: https://lists.gnu.org/archive/html/libmicrohttpd/2023-05/msg00008.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libmicrohttpd/libmicrohttpd.hash | 2 +- package/libmicrohttpd/libmicrohttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index ce30e2ba1188..a4c8fbca5b81 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f0b1547b5a42a6c0f724e8e1c1cb5ce9c4c35fb495e7d780b9930d35011ceb4c libmicrohttpd-0.9.76.tar.gz +sha256 9e7023a151120060d2806a6ea4c13ca9933ece4eacfc5c9464d20edddb76b0a0 libmicrohttpd-0.9.77.tar.gz sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 4e7b72b65c3a..72b2bbafd899 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.76 +LIBMICROHTTPD_VERSION = 0.9.77 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_CPE_ID_VENDOR = gnu From 9d9c384ac180f04fa546a268d99cd74f88972083 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Jul 2023 18:18:11 +0200 Subject: [PATCH 0881/2890] package/libminiupnpc: bump to version 2.2.5 Changelog: http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-2.2.5.tar.gz Updated license hash due to reformat of license file: https://github.com/miniupnp/miniupnp/commit/af812c877532f2432b0566633e1e539797ef9c13 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libminiupnpc/libminiupnpc.hash | 4 ++-- package/libminiupnpc/libminiupnpc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libminiupnpc/libminiupnpc.hash b/package/libminiupnpc/libminiupnpc.hash index 5dca8dd6cfca..db6b01f0c9ce 100644 --- a/package/libminiupnpc/libminiupnpc.hash +++ b/package/libminiupnpc/libminiupnpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 481a5e4aede64e9ef29895b218836c3608d973e77a35b4f228ab1f3629412c4b miniupnpc-2.2.4.tar.gz -sha256 a0f853256954f388ce4fab5faaef6a1f5bcd5e682c3c7c70b07b7130e932a021 LICENSE +sha256 38acd5f4602f7cf8bcdc1ec30b2d58db2e9912e5d9f5350dd99b06bfdffb517c miniupnpc-2.2.5.tar.gz +sha256 e143c6e207d0bb874c4be76b57689ffa408063a37a735c6dcec3dc600cb522c5 LICENSE diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 9dc5c719a95a..59b593cb36be 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMINIUPNPC_VERSION = 2.2.4 +LIBMINIUPNPC_VERSION = 2.2.5 LIBMINIUPNPC_SOURCE = miniupnpc-$(LIBMINIUPNPC_VERSION).tar.gz LIBMINIUPNPC_SITE = http://miniupnp.free.fr/files LIBMINIUPNPC_INSTALL_STAGING = YES From 0e258b6190a5b335fececc4fbdc7ed448b37a9a0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Jul 2023 18:18:12 +0200 Subject: [PATCH 0882/2890] package/libnatpmp: bump version to 20230423 Updated license hash due to reformat of license file: https://github.com/miniupnp/libnatpmp/commit/d89c1db679c09dbe71ba58b012e4afae2de06376 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libnatpmp/libnatpmp.hash | 4 ++-- package/libnatpmp/libnatpmp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnatpmp/libnatpmp.hash b/package/libnatpmp/libnatpmp.hash index 38bc3f44445e..7bdd784bf7ac 100644 --- a/package/libnatpmp/libnatpmp.hash +++ b/package/libnatpmp/libnatpmp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0 libnatpmp-20150609.tar.gz -sha256 e8d8277e1a101fcfedb0cd5a1cc76646522c0da69f3490dd5a4055fc87ea96a2 LICENSE +sha256 0684ed2c8406437e7519a1bd20ea83780db871b3a3a5d752311ba3e889dbfc70 libnatpmp-20230423.tar.gz +sha256 7184f1e2114b518440962e7de67f0b9d5faa3789ba1f1a7ff33159bd26834b06 LICENSE diff --git a/package/libnatpmp/libnatpmp.mk b/package/libnatpmp/libnatpmp.mk index 3623027713b4..3a625ea0fec7 100644 --- a/package/libnatpmp/libnatpmp.mk +++ b/package/libnatpmp/libnatpmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNATPMP_VERSION = 20150609 +LIBNATPMP_VERSION = 20230423 LIBNATPMP_SITE = http://miniupnp.free.fr/files LIBNATPMP_INSTALL_STAGING = YES LIBNATPMP_LICENSE = BSD-3-Clause From 261c5894b0a83f738322daa0de96cd668e1f2f9a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Jul 2023 18:21:21 +0200 Subject: [PATCH 0883/2890] package/taglib: bump to version 1.13.1 Release notes: https://mail.kde.org/pipermail/taglib-devel/2023-July/003066.html Changelog: https://taglib.org/#taglib-1131-release---jul-1-2023 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/taglib/taglib.hash | 2 +- package/taglib/taglib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/taglib/taglib.hash b/package/taglib/taglib.hash index 7d1b2e8422c5..e83aa451f337 100644 --- a/package/taglib/taglib.hash +++ b/package/taglib/taglib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 58f08b4db3dc31ed152c04896ee9172d22052bc7ef12888028c01d8b1d60ade0 taglib-1.13.tar.gz +sha256 c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b taglib-1.13.1.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING.MPL diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk index c68789100261..9bdf05b85d41 100644 --- a/package/taglib/taglib.mk +++ b/package/taglib/taglib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TAGLIB_VERSION = 1.13 +TAGLIB_VERSION = 1.13.1 TAGLIB_SITE = http://taglib.github.io/releases TAGLIB_INSTALL_STAGING = YES TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1 From 211acb1e3b2bf8c6d24d8c43accb79224b99d72c Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 3 Jul 2023 16:39:31 +0200 Subject: [PATCH 0884/2890] package/uuu: bump to version 1.5.109 Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.109 Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/uuu/uuu.hash | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index a35970c54fda..f42e92a3793b 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 f95ef6e5f4feb8b3e8d2c1163c35415263c82ac4ba3a51bcf4e3d59d3eebd063 uuu_source-uuu_1.5.104.tar.gz +sha256 6c99b82c55202f43583dc41198225dea7d5b050e33e13946751911e473aed4a5 uuu_source-uuu_1.5.109.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE sha256 f68fb8c8002c797a14e63f91963ac247034fdfd44275e4f4a3226111cd0423db README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 07dd6ce5b345..14a8a5ef025d 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.104 +UUU_VERSION = 1.5.109 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License From 200d371d5ec65a087ecb7ec2a75a25938fee73da Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Jul 2023 18:00:42 +0200 Subject: [PATCH 0885/2890] package/libcodec2: bump version to 1.1.1 Release notes: https://github.com/drowe67/codec2/releases/tag/v1.1.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libcodec2/libcodec2.hash | 2 +- package/libcodec2/libcodec2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcodec2/libcodec2.hash b/package/libcodec2/libcodec2.hash index b2de750c3440..edaa275bbc37 100644 --- a/package/libcodec2/libcodec2.hash +++ b/package/libcodec2/libcodec2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d56ba661008a780b823d576a5a2742c94d0b0507574643a7d4f54c76134826a3 libcodec2-1.1.0.tar.gz +sha256 44015b071968d98ee326012c498db6a8308bed1a7a914ecb6d4d8e2a354a4611 libcodec2-1.1.1.tar.gz sha256 9ebb6f82b7380a62ac74c5f0322c88e6744dedf2ebe1f54d6f088282b39844bf COPYING diff --git a/package/libcodec2/libcodec2.mk b/package/libcodec2/libcodec2.mk index 66758a169725..295dd8983f84 100644 --- a/package/libcodec2/libcodec2.mk +++ b/package/libcodec2/libcodec2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCODEC2_VERSION = 1.1.0 +LIBCODEC2_VERSION = 1.1.1 LIBCODEC2_SITE = $(call github,drowe67,codec2,v$(LIBCODEC2_VERSION)) LIBCODEC2_LICENSE = LGPL-2.1 LIBCODEC2_LICENSE_FILES = COPYING From f80063aecbc80f3154271febb60fe797fdeb3b03 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Sun, 2 Jul 2023 13:17:36 -0700 Subject: [PATCH 0886/2890] package/bluez-alsa: allow a samplerate conversion for audio playback In the case of bluetooth audio thet incoming audio stream will be coming from bluetooth devices at varying sample rates like (44.1, 48, 96, 192 kHz) and the odds of a sound device matching that samplerate exactly is a bit slim. So in the case of a bluez audio playback the system will need to do a samplerate conversion. Thus when enabling bluez-alsa and the alsa plugins select libsamplerate to support the shift from the incoming samplerates to an often fix-rated audio device. Signed-off-by: Charles Hardin Signed-off-by: Thomas Petazzoni --- package/bluez-alsa/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/bluez-alsa/Config.in b/package/bluez-alsa/Config.in index 73ae3d5333b4..d70172646fd5 100644 --- a/package/bluez-alsa/Config.in +++ b/package/bluez-alsa/Config.in @@ -13,6 +13,9 @@ config BR2_PACKAGE_BLUEZ_ALSA select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_SBC + # samplerate ALSA plugin is needed for proper sample rate + # conversion with Bluetooth devices + select BR2_PACKAGE_LIBSAMPLERATE if BR2_PACKAGE_ALSA_PLUGINS help Bluetooth Audio ALSA Backend. From ca4a986c9df314bdcf9786c6fe7d292fa75a198e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 20:17:27 +0200 Subject: [PATCH 0887/2890] package/stellarium: bump version to 23.2 Release notes: http://stellarium.org/release/2023/03/26/stellarium-23.1.html http://stellarium.org/release/2023/07/02/stellarium-23.2.html Removed patch which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../stellarium/0001-add-missing-include.patch | 32 ------------------- package/stellarium/stellarium.hash | 2 +- package/stellarium/stellarium.mk | 2 +- 4 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 package/stellarium/0001-add-missing-include.patch diff --git a/.checkpackageignore b/.checkpackageignore index 7d544a6e61fa..0f6bdd92fa2a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1460,7 +1460,6 @@ package/sslh/S35sslh Indent Shellcheck Variables package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch Upstream package/start-stop-daemon/0002-just-warn-on-missing-arch.patch Upstream package/statserial/0001-ncurses-link.patch Upstream -package/stellarium/0001-add-missing-include.patch Upstream package/stunnel/S50stunnel Indent Shellcheck Variables package/sudo/0001-configure.ac-fix-openssl-static-build.patch Upstream package/supervisor/S99supervisord Variables diff --git a/package/stellarium/0001-add-missing-include.patch b/package/stellarium/0001-add-missing-include.patch deleted file mode 100644 index 822fc50367a6..000000000000 --- a/package/stellarium/0001-add-missing-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f36ce55e7a0fbba11fb7e1d4107ef61a79dc95d3 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 25 Dec 2022 20:38:17 +0100 -Subject: [PATCH] add missing include - -Fixes build error: - -stellarium-1.2/plugins/MeteorShowers/src/MeteorShowersMgr.hpp:331:12: - error: field 'm_lastUpdate' has incomplete type 'QDateTime' - -Patch sent upstream: https://github.com/Stellarium/stellarium/pull/2933 - -Signed-off-by: Bernd Kuhls ---- - plugins/MeteorShowers/src/MeteorShowersMgr.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugins/MeteorShowers/src/MeteorShowersMgr.hpp b/plugins/MeteorShowers/src/MeteorShowersMgr.hpp -index 8096856b6d..17716a68b0 100644 ---- a/plugins/MeteorShowers/src/MeteorShowersMgr.hpp -+++ b/plugins/MeteorShowers/src/MeteorShowersMgr.hpp -@@ -20,6 +20,7 @@ - #ifndef METEORSHOWERSMGR_HPP - #define METEORSHOWERSMGR_HPP - -+#include - #include - #include - --- -2.34.1 - diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash index 2488b611a45b..e0ee61d2b619 100644 --- a/package/stellarium/stellarium.hash +++ b/package/stellarium/stellarium.hash @@ -1,4 +1,4 @@ # From https://github.com/Stellarium/stellarium/releases -sha256 802a0e8231cae41ec04f697f70105c291d9719aa6e7fd8cbe1f15068c3324e09 stellarium-1.2.tar.xz +sha256 3aee154d0de3ed484e3e6fee027cf73e6dd0a677b3ea1af348b225ac02339008 stellarium-23.2.tar.xz # Locally computed sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index a62488907f8c..4dc5692d7935 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLARIUM_VERSION = 1.2 +STELLARIUM_VERSION = 23.2 STELLARIUM_SOURCE = stellarium-$(STELLARIUM_VERSION).tar.xz STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ From 94370ed250cba1f5cf01f4e8090df3ef0ca01337 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 3 Jul 2023 21:32:02 +0200 Subject: [PATCH 0888/2890] package/python-setuptools: drop bogus select on missign symbol Commit 3b2913552e (package/python-setuptools: add missing dependency on host-python-wheel) adding the select of the runtime, as a last-minute fixup. However, there is no target python-wheel package; it is a host-only package, leading to sainty-check failures: $ make check-symbol package/python-setuptools/Config.in:5: BR2_PACKAGE_PYTHON_WHEEL referenced but not defined Srop the select. If there was a rationale for actually having python-wheel on the target, it's going to need a bit more. Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/python-setuptools/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-setuptools/Config.in b/package/python-setuptools/Config.in index 73368c1a491a..d47f7587505f 100644 --- a/package/python-setuptools/Config.in +++ b/package/python-setuptools/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_SETUPTOOLS bool "python-setuptools" select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime - select BR2_PACKAGE_PYTHON_WHEEL # runtime help Download, build, install, upgrade, and uninstall Python packages. From 409a5f98767d5bb117504597f83446cb134586d8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 13:56:51 +0200 Subject: [PATCH 0889/2890] package/libssh2: disable rpath Bumping libssh2 to 1.11.0 with buildroot commit af87ad197caf434936fe239f2718fd17b60fcb8b causes build errors with libcurl due to "-R" being added to libssh2.pc. Quoting autobuilder build-end.log checking for recv... no configure: error: Unable to link function recv Quoting autobuilder libcurl-8.1.2/config.log arc-buildroot-linux-uclibc-gcc.br_real: error: unrecognized command-line option '-R' Fixes: http://autobuild.buildroot.net/results/78f/78ffda92d51f8abdbcef93f968ace432d0d44979/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libssh2/libssh2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index 8bedbdffbaf5..a42be46a7ae6 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -11,7 +11,7 @@ LIBSSH2_LICENSE = BSD LIBSSH2_LICENSE_FILES = COPYING LIBSSH2_CPE_ID_VENDOR = libssh2 LIBSSH2_INSTALL_STAGING = YES -LIBSSH2_CONF_OPTS = --disable-examples-build +LIBSSH2_CONF_OPTS = --disable-examples-build --disable-rpath ifeq ($(BR2_PACKAGE_LIBSSH2_MBEDTLS),y) LIBSSH2_DEPENDENCIES += mbedtls From 2bde8c744cbe420f2e85af7a63782bb89ca6da06 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 2 Jul 2023 19:02:29 +0200 Subject: [PATCH 0890/2890] package/xvisor: bump to version 0.3.2 For change log since version 0.3.1, see: https://www.xhypervisor.org/index.php?page=news/20230101 or https://github.com/xvisor/xvisor/blob/master/docs/releases/v0.3.2 This commit also drop the patch, as an equivalent fix, included in this version, was made upstream in: https://github.com/xvisor/xvisor/commit/eb1d1dd4658c2bab6c49abb7bc51c231dc5cc0bd The file .checkpackageignore is also updated to reflect this patch removal. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...psmouse-back.c-fix-build-with-gcc-11.patch | 115 ------------------ package/xvisor/xvisor.hash | 2 +- package/xvisor/xvisor.mk | 2 +- 4 files changed, 2 insertions(+), 118 deletions(-) delete mode 100644 package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch diff --git a/.checkpackageignore b/.checkpackageignore index 0f6bdd92fa2a..a48712460f45 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1660,7 +1660,6 @@ package/xinetd/0004-configure-rlim_t.patch Upstream package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch Upstream package/xl2tp/xl2tpd TrailingSpace package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch Upstream -package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch Upstream package/xxhash/0001-fix-man-page-installation.patch Upstream package/xxhash/0002-Makefile-add-dedicated-install-targets.patch Upstream package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch Upstream diff --git a/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch deleted file mode 100644 index 1c02f45c9d5b..000000000000 --- a/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 0e07e82121697d99470a147eadad9a708889c4df Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 2 Sep 2021 18:13:03 +0200 -Subject: [PATCH] psmouse-back.c: fix build with gcc 11 - -Fix the following build failures with gcc 11 by defining inline -functions as static: - -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/build/drivers/drivers.o: in function `psmouse_extensions': -/home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `lifebook_detect' -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `alps_detect' -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `ps2pp_init' -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `trackpoint_detect' -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `fsp_detect' - -Fixes: - - http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/xvisor/xvisor/pull/139] ---- - drivers/input/mouse/alps.h | 4 ++-- - drivers/input/mouse/lifebook.h | 6 +++--- - drivers/input/mouse/logips2pp.h | 2 +- - drivers/input/mouse/sentelic.h | 4 ++-- - drivers/input/mouse/trackpoint.h | 2 +- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h -index ae1ac354..acc1e89e 100644 ---- a/drivers/input/mouse/alps.h -+++ b/drivers/input/mouse/alps.h -@@ -51,11 +51,11 @@ struct alps_data { - int alps_detect(struct psmouse *psmouse, bool set_properties); - int alps_init(struct psmouse *psmouse); - #else --inline int alps_detect(struct psmouse *psmouse, bool set_properties) -+static inline int alps_detect(struct psmouse *psmouse, bool set_properties) - { - return -ENOSYS; - } --inline int alps_init(struct psmouse *psmouse) -+static inline int alps_init(struct psmouse *psmouse) - { - return -ENOSYS; - } -diff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h -index 4c4326c6..0baf02a7 100644 ---- a/drivers/input/mouse/lifebook.h -+++ b/drivers/input/mouse/lifebook.h -@@ -16,14 +16,14 @@ void lifebook_module_init(void); - int lifebook_detect(struct psmouse *psmouse, bool set_properties); - int lifebook_init(struct psmouse *psmouse); - #else --inline void lifebook_module_init(void) -+static inline void lifebook_module_init(void) - { - } --inline int lifebook_detect(struct psmouse *psmouse, bool set_properties) -+static inline int lifebook_detect(struct psmouse *psmouse, bool set_properties) - { - return -ENOSYS; - } --inline int lifebook_init(struct psmouse *psmouse) -+static inline int lifebook_init(struct psmouse *psmouse) - { - return -ENOSYS; - } -diff --git a/drivers/input/mouse/logips2pp.h b/drivers/input/mouse/logips2pp.h -index 0c186f02..439e9c58 100644 ---- a/drivers/input/mouse/logips2pp.h -+++ b/drivers/input/mouse/logips2pp.h -@@ -14,7 +14,7 @@ - #ifdef CONFIG_MOUSE_PS2_LOGIPS2PP - int ps2pp_init(struct psmouse *psmouse, bool set_properties); - #else --inline int ps2pp_init(struct psmouse *psmouse, bool set_properties) -+static inline int ps2pp_init(struct psmouse *psmouse, bool set_properties) - { - return -ENOSYS; - } -diff --git a/drivers/input/mouse/sentelic.h b/drivers/input/mouse/sentelic.h -index aa697ece..42df9e3b 100644 ---- a/drivers/input/mouse/sentelic.h -+++ b/drivers/input/mouse/sentelic.h -@@ -123,11 +123,11 @@ struct fsp_data { - extern int fsp_detect(struct psmouse *psmouse, bool set_properties); - extern int fsp_init(struct psmouse *psmouse); - #else --inline int fsp_detect(struct psmouse *psmouse, bool set_properties) -+static inline int fsp_detect(struct psmouse *psmouse, bool set_properties) - { - return -ENOSYS; - } --inline int fsp_init(struct psmouse *psmouse) -+static inline int fsp_init(struct psmouse *psmouse) - { - return -ENOSYS; - } -diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h -index e558a709..f14e59c0 100644 ---- a/drivers/input/mouse/trackpoint.h -+++ b/drivers/input/mouse/trackpoint.h -@@ -145,7 +145,7 @@ struct trackpoint_data - #ifdef CONFIG_MOUSE_PS2_TRACKPOINT - int trackpoint_detect(struct psmouse *psmouse, bool set_properties); - #else --inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties) -+static inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties) - { - return -ENOSYS; - } --- -2.32.0 - diff --git a/package/xvisor/xvisor.hash b/package/xvisor/xvisor.hash index 45b6fec49c09..4676db9e8ca7 100644 --- a/package/xvisor/xvisor.hash +++ b/package/xvisor/xvisor.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 b1bb2ca09340e87a2f465c65196892cdd0f59b798794ae69e35d1f883cf9ba49 xvisor-0.3.1.tar.xz +sha256 fbced0f74b75758d4859d329b86c213bd24662168179ebfb2b02b987a1070215 xvisor-0.3.2.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index d7bb288ea8a6..eba37be9b7a2 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -4,7 +4,7 @@ # ################################################################################ -XVISOR_VERSION = 0.3.1 +XVISOR_VERSION = 0.3.2 XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz XVISOR_SITE = http://www.xhypervisor.org/tarball XVISOR_LICENSE = GPL-2.0+ From ff037fe5430738e85d9c2270883e71cd77e99ff3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 14:33:19 +0200 Subject: [PATCH 0891/2890] package/mpir: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccuwJnnt.s:124: Error: selected processor does not support `umull ip,r6,r2,r1' in Thumb mode /tmp/ccuwJnnt.s:159: Error: selected processor does not support `umull ip,r0,r7,r1' in Thumb mode Fixes: http://autobuild.buildroot.net/results/610/61094bc7b7eb1d1e49bf8fcd1864b5cd3d7c4499/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/mpir/mpir.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mpir/mpir.mk b/package/mpir/mpir.mk index 91f704d30cd9..5dbd760aa1f8 100644 --- a/package/mpir/mpir.mk +++ b/package/mpir/mpir.mk @@ -36,4 +36,8 @@ ifeq ($(BR2_powerpc64le),y) MPIR_CONF_ENV += MPN_PATH="generic" endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +MPIR_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + $(eval $(autotools-package)) From 6a21733f839478d902f3eab287a82b456e55f708 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 18:53:20 +0200 Subject: [PATCH 0892/2890] package/e2fsprogs: bump version to 1.47.0 Release notes: https://e2fsprogs.sourceforge.net/e2fsprogs-release.html Removed patch which is included this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...-sanity-check-to-extent-manipulation.patch | 59 ------------------- package/e2fsprogs/e2fsprogs.hash | 4 +- package/e2fsprogs/e2fsprogs.mk | 2 +- 4 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 package/e2fsprogs/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch diff --git a/.checkpackageignore b/.checkpackageignore index a48712460f45..d3e5af412940 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -378,7 +378,6 @@ package/dvblast/0002-fix-int-types.patch Upstream package/dvbsnoop/0001-musl-types-h.patch Upstream package/dvdrw-tools/0001-limits.h.patch Upstream package/dvdrw-tools/0002-Include-sysmacros.h-to-compile-with-newer-gcc.patch Upstream -package/e2fsprogs/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch Upstream package/earlyoom/0001-main.c-fix-build-with-kernel-4.3.patch Upstream package/earlyoom/S02earlyoom Indent Shellcheck package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch Upstream diff --git a/package/e2fsprogs/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch b/package/e2fsprogs/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch deleted file mode 100644 index b5299a2a78e7..000000000000 --- a/package/e2fsprogs/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ab51d587bb9b229b1fade1afd02e1574c1ba5c76 Mon Sep 17 00:00:00 2001 -From: Lukas Czerner -Date: Thu, 21 Apr 2022 19:31:48 +0200 -Subject: libext2fs: add sanity check to extent manipulation - -It is possible to have a corrupted extent tree in such a way that a leaf -node contains zero extents in it. Currently if that happens and we try -to traverse the tree we can end up accessing wrong data, or possibly -even uninitialized memory. Make sure we don't do that. - -Additionally make sure that we have a sane number of bytes passed to -memmove() in ext2fs_extent_delete(). - -Note that e2fsck is currently unable to spot and fix such corruption in -pass1. - -Signed-off-by: Lukas Czerner -Reported-by: Nils Bars -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2068113 -Addresses: CVE-2022-1304 -Addresses-Debian-Bug: #1010263 -Signed-off-by: Theodore Ts'o - -[Retrieved from: -https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?h=maint&id=ab51d587bb9b229b1fade1afd02e1574c1ba5c76] -Signed-off-by: Fabrice Fontaine ---- - lib/ext2fs/extent.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c -index b324c7b0..1a206a16 100644 ---- a/lib/ext2fs/extent.c -+++ b/lib/ext2fs/extent.c -@@ -495,6 +495,10 @@ retry: - ext2fs_le16_to_cpu(eh->eh_entries); - newpath->max_entries = ext2fs_le16_to_cpu(eh->eh_max); - -+ /* Make sure there is at least one extent present */ -+ if (newpath->left <= 0) -+ return EXT2_ET_EXTENT_NO_DOWN; -+ - if (path->left > 0) { - ix++; - newpath->end_blk = ext2fs_le32_to_cpu(ix->ei_block); -@@ -1630,6 +1634,10 @@ errcode_t ext2fs_extent_delete(ext2_extent_handle_t handle, int flags) - - cp = path->curr; - -+ /* Sanity check before memmove() */ -+ if (path->left < 0) -+ return EXT2_ET_EXTENT_LEAF_BAD; -+ - if (path->left) { - memmove(cp, cp + sizeof(struct ext3_extent_idx), - path->left * sizeof(struct ext3_extent_idx)); --- -cgit - diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 452c8d5689ba..28a47c15d18a 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.5/sha256sums.asc -sha256 2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e e2fsprogs-1.46.5.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.0/sha256sums.asc +sha256 144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db e2fsprogs-1.47.0.tar.xz # Locally calculated sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 39c9e0764476..75214be8c785 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.46.5 +E2FSPROGS_VERSION = 1.47.0 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) From 81b25fe881bb771d6510098fd564d1743e289042 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 18:48:05 +0200 Subject: [PATCH 0893/2890] package/dos2unix: bump version to 7.5.0 Changelog: https://waterlan.home.xs4all.nl/dos2unix/ChangeLog.txt Updated license hash due to upstream commit which update project URLs and copyright year: https://sourceforge.net/p/dos2unix/dos2unix/ci/c5acfaf73db3686cf49a46705f00ad8eeb3f7151/ https://sourceforge.net/p/dos2unix/dos2unix/ci/59510e21846bb9c7c2efdf326dd33d573883f611/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dos2unix/dos2unix.hash | 6 +++--- package/dos2unix/dos2unix.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash index a16c1aecacb5..032c8ea2d211 100644 --- a/package/dos2unix/dos2unix.hash +++ b/package/dos2unix/dos2unix.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.4.3.tar.gz.asc -sha256 b68db41956daf933828423aa30510e00c12d29ef5916e715e8d4e694fe66ca72 dos2unix-7.4.3.tar.gz -sha256 275ce1371734904b275e83bf760e3e6d2a520614545a3850c9568d1892b940fd COPYING.txt +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc +sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz +sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index f16a527f2ee9..6d1e70cf266b 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOS2UNIX_VERSION = 7.4.3 +DOS2UNIX_VERSION = 7.5.0 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt From 2bc29d4eecb2aab67564cddf3afe3b297d51045c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 18:40:25 +0200 Subject: [PATCH 0894/2890] package/bluez-alsa: bump version to 4.1.1 Changelog: https://github.com/arkq/bluez-alsa/blob/master/NEWS Updated license hash due to copyright year bump: https://github.com/arkq/bluez-alsa/commit/165e15bce4f9c8dd6238ee8d105ab9fa857c63a1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/bluez-alsa/bluez-alsa.hash | 4 ++-- package/bluez-alsa/bluez-alsa.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bluez-alsa/bluez-alsa.hash b/package/bluez-alsa/bluez-alsa.hash index ad7fe6270857..551386560393 100644 --- a/package/bluez-alsa/bluez-alsa.hash +++ b/package/bluez-alsa/bluez-alsa.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 ce5e060e61669d61d44f5f9bad34a7b88378376e9d49d31482406a68127a6b29 bluez-alsa-4.0.0.tar.gz -sha256 aaebd0cca73b0f361cb7f1bffa40418b2485fc10bfae7a47c193679c7e26d2e3 LICENSE +sha256 b69a3e6dd69315194403ee930ac1553aed3fb9a3988e502ae5c24a8bfef70f9f bluez-alsa-4.1.1.tar.gz +sha256 956564dcf06ba65cd7a5eb6cdfd695e2ab0f09ea9684e4eaf079f5d533bd206d LICENSE diff --git a/package/bluez-alsa/bluez-alsa.mk b/package/bluez-alsa/bluez-alsa.mk index 649810b0ad43..38682c275582 100644 --- a/package/bluez-alsa/bluez-alsa.mk +++ b/package/bluez-alsa/bluez-alsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -BLUEZ_ALSA_VERSION = 4.0.0 +BLUEZ_ALSA_VERSION = 4.1.1 BLUEZ_ALSA_SITE = $(call github,Arkq,bluez-alsa,v$(BLUEZ_ALSA_VERSION)) BLUEZ_ALSA_LICENSE = MIT BLUEZ_ALSA_LICENSE_FILES = LICENSE From 7cac499ec46655a491e59b5bbc2a83a2137099bd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 18:40:26 +0200 Subject: [PATCH 0895/2890] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.68 Changelog: https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog Removed patch which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../bluez5_utils-headers.mk | 2 +- .../bluez5_utils/0001-musl-max-input.patch | 37 ------------------- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 2 +- 4 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 package/bluez5_utils/0001-musl-max-input.patch diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 8ca3764935f6..0790dd7e0e5a 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.66 +BLUEZ5_UTILS_HEADERS_VERSION = 5.68 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/0001-musl-max-input.patch b/package/bluez5_utils/0001-musl-max-input.patch deleted file mode 100644 index 8612bac07fe7..000000000000 --- a/package/bluez5_utils/0001-musl-max-input.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ca6546fe521360fcf905bc115b893f322e706cb2 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 31 Jan 2023 05:52:58 +0000 -Subject: shared: define MAX_INPUT for musl - -musl systems don't have MAX_INPUT. Just define it to _POSIX_MAX_INPUT -which musl does have if it's not already defined. - -Note that on glibc, the values match anyway (as of glibc-2.36), and -indeed POSIX_MAX_INPUT has the same value on musl too. - -Bug: https://bugs.gentoo.org/888467 -Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=ca6546fe521360fcf905bc115b893f322e706cb2 -Signed-off-by: Florian Fainelli ---- - src/shared/util.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/shared/util.c b/src/shared/util.c -index 2f0ae0e86..b466fb001 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -28,6 +28,11 @@ - #include - #endif - -+/* define MAX_INPUT for musl */ -+#ifndef MAX_INPUT -+#define MAX_INPUT _POSIX_MAX_INPUT -+#endif -+ - #include "src/shared/util.h" - - void *util_malloc(size_t size) --- -cgit - diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 9467647592d9..45952e60f19d 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574 bluez-5.66.tar.xz +sha256 fc505e6445cb579a55cacee6821fe70d633921522043d322b696de0a175ff933 bluez-5.68.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 37a2e79a7a50..1e87041610d2 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.66 +BLUEZ5_UTILS_VERSION = 5.68 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES From e867b1ba43c60bbc39d767843919b718b6fdc729 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 3 Jul 2023 21:16:17 +0200 Subject: [PATCH 0896/2890] package/rtl8821cu: bump to version 2023-06-24 With this version we can build with Linux 6.4. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8821cu/rtl8821cu.hash | 2 +- package/rtl8821cu/rtl8821cu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8821cu/rtl8821cu.hash b/package/rtl8821cu/rtl8821cu.hash index 45460d6d12a7..84c724c04463 100644 --- a/package/rtl8821cu/rtl8821cu.hash +++ b/package/rtl8821cu/rtl8821cu.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 32589c3ac3ffde6de3ecaca83570ab07a2b92a66e3265294b0469375b007a480 rtl8821cu-80781de376007ecd778dfb2bef05533e3a6cc7c6.tar.gz +sha256 78a8e730ad1ec05b10c4ee97b5cf0a8f5bcd1654b2c5332533c5cf4bd77078d8 rtl8821cu-dc9ee6c6a8b47d0e365fcf1977439c7243da71d5.tar.gz sha256 22cdb0a9cf492dbf05c5b27381a5c0e73ae0d4622427b522b0ba92b7495e5fb0 LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index 953da1f01cf9..2a42a0f28ec4 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8821CU_VERSION = 80781de376007ecd778dfb2bef05533e3a6cc7c6 +RTL8821CU_VERSION = dc9ee6c6a8b47d0e365fcf1977439c7243da71d5 RTL8821CU_SITE = $(call github,morrownr,8821cu-20210916,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE From 8539a2075c268eef7fc1742603ca48ecca14ee5e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 17:02:32 +0200 Subject: [PATCH 0897/2890] package/sconeserver: re-add dependency to pcre While pcre was an optional dependency with autoconf [1] upstream removed the HAVE_LIBPCRE defines with the introduction of cmake [2] breaking the build without pcre after buildroot switched to cmake with commit 8b42bbf30a914b0fd40a4518e61ac7bc511a7deb. Fixes: http://autobuild.buildroot.net/results/a15/a15db87c8cec195905b6bcc2cbd3da59ad8aa3b9/ [1] https://github.com/sconemad/sconeserver/commit/98ec61436c9ea68ffe2d70a818c1175dcafa2a79 [2] https://github.com/sconemad/sconeserver/commit/0cb655721d7f8aa5d6d14fc1dfce18c518ce2419 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/sconeserver/Config.in | 1 + package/sconeserver/sconeserver.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index 3040dddbbbea..0e8a99509059 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -3,6 +3,7 @@ menuconfig BR2_PACKAGE_SCONESERVER depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() + select BR2_PACKAGE_PCRE select BR2_PACKAGE_ZLIB help Sconeserver is a modular, object-orientated and extremely diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index bfbd5dc6ede0..89abc8d3b297 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -10,7 +10,7 @@ SCONESERVER_LICENSE = GPL-2.0+ SCONESERVER_LICENSE_FILES = COPYING SCONESERVER_DEPENDENCIES = \ host-pkgconf \ - $(if $(BR2_PACKAGE_PCRE),pcre) \ + pcre \ zlib # disable image as it fails to build with ImageMagick # disable markdown module because its git submodule cmark From e7d0d24c1b611b415f2fa93284f5a3dd746a05d0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 17:47:15 +0200 Subject: [PATCH 0898/2890] package/autoconf-archive: bump version to 2023.02.20 Added sha1 hash provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/autoconf-archive/autoconf-archive.hash | 4 +++- package/autoconf-archive/autoconf-archive.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/autoconf-archive/autoconf-archive.hash b/package/autoconf-archive/autoconf-archive.hash index ff7710dc2b63..c4658e6f917e 100644 --- a/package/autoconf-archive/autoconf-archive.hash +++ b/package/autoconf-archive/autoconf-archive.hash @@ -1,4 +1,6 @@ +# From https://lists.gnu.org/archive/html/autoconf-archive-announce/2023-02/msg00000.html +sha1 e26d15db0f1ec60e9ea8ff024cf3ee895fa2eabd autoconf-archive-2023.02.20.tar.xz # Computed locally -sha256 e07454f00d8cae7907bed42d0747798927809947684d94c37207a4d63a32f423 autoconf-archive-2022.09.03.tar.xz +sha256 71d4048479ae28f1f5794619c3d72df9c01df49b1c628ef85fde37596dc31a33 autoconf-archive-2023.02.20.tar.xz sha256 e6037104443f9a7829b2aa7c5370d0789a7bda3ca65a0b904cdc0c2e285d9195 COPYING sha256 23ed0b84fa023bfa33433b498192cd08a3bfb1f4864a8ed791a84f3eb48b2dd2 COPYING.EXCEPTION diff --git a/package/autoconf-archive/autoconf-archive.mk b/package/autoconf-archive/autoconf-archive.mk index 0ffdf61ddfff..07ac7e974333 100644 --- a/package/autoconf-archive/autoconf-archive.mk +++ b/package/autoconf-archive/autoconf-archive.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOCONF_ARCHIVE_VERSION = 2022.09.03 +AUTOCONF_ARCHIVE_VERSION = 2023.02.20 AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive AUTOCONF_ARCHIVE_LICENSE = GPL-3.0+ with exception From 7ee2bd48f11ec9362f6bdbec29a733296b7a01e7 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sun, 2 Jul 2023 14:22:35 +0200 Subject: [PATCH 0899/2890] configs/chiliboard: uboot needs openssl Fixes uboot build errors: In file included from tools/imagetool.h:24, from tools/aisimage.c:7: include/image.h:1383:12: fatal error: openssl/evp.h: No such file or directory 1383 | # include | Signed-off-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- configs/grinn_chiliboard_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index e7862d17380b..a5a8f7a65f2e 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -18,6 +18,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" From cef05ae1566a4a62915362a46f17ace581908881 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Jun 2023 17:21:48 +0200 Subject: [PATCH 0900/2890] package/libgcrypt: disable asm on i386 Fixes: http://autobuild.buildroot.net/results/933/93330f9e1867b1ddc1de19b57d70d223b6f23994/ Code failing to build on i386 was added in libgcrypt-10.0.0 https://github.com/gpg/libgcrypt/commit/9d909cb67e70fd792926ac1e2ab305b2cc96bc27 which was added in buildroot with commit d96b9ed0738bae270c479bdaf21eebd4c1f9930d Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libgcrypt/libgcrypt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 4fffe5360e1f..b74838b64993 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -21,8 +21,8 @@ LIBGCRYPT_CONF_OPTS = \ $(if $(BR2_OPTIMIZE_0),--disable-ppc-crypto-support,) \ --with-gpg-error-prefix=$(STAGING_DIR)/usr -# Libgcrypt doesn't support assembly for coldfire -ifeq ($(BR2_m68k_cf),y) +# disable asm for broken archs +ifeq ($(BR2_i386)$(BR2_m68k_cf),y) LIBGCRYPT_CONF_OPTS += --disable-asm endif From 6255ea2f6591ae294d1a354d6a30e8b5b245d3d6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Jul 2023 22:20:11 +0200 Subject: [PATCH 0901/2890] package/libnatpmp: fix header install Upstream renamed declspec.h to natpmp_declspec.h https://github.com/miniupnp/libnatpmp/commit/1d113363980a98a5868ff2c2b05d7c94e3a18a70 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libnatpmp/libnatpmp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libnatpmp/libnatpmp.mk b/package/libnatpmp/libnatpmp.mk index 3a625ea0fec7..99d46d814a87 100644 --- a/package/libnatpmp/libnatpmp.mk +++ b/package/libnatpmp/libnatpmp.mk @@ -18,7 +18,7 @@ endef define LIBNATPMP_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ PREFIX=$(STAGING_DIR) \ - HEADERS='declspec.h natpmp.h' \ + HEADERS='natpmp_declspec.h natpmp.h' \ $(TARGET_CONFIGURE_OPTS) install endef From 6ebb7c37526348fc0ed1359d1c07f12059e416a4 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 2 Jul 2023 13:54:43 +0200 Subject: [PATCH 0902/2890] package/xz: bump to version 5.4.3 This commit changes the version branch from 5.2.x to 5.4.x. This old stable 5.2.x branch is expected to be end-of-life. The package site [1] mention: """ 5.4.3 was released on 2023-05-04. A minor bug fix release 5.2.12 to the old stable branch was made on 2023-05-04. This is probably the last release in the 5.2.x series. """ For a change log since 5.2.10, see [2]. This commit removes the package patch since the new version includes alternate workarounds. See comment in [3]. The COPYING licence file hash has changed. A note about Doxygen-generated HTML was added in [4]. COPYING.GPLv3 license file hash has also changed, as the file was updated (http links changed by https) in [5]. [1] https://tukaani.org/xz/ [2] https://git.tukaani.org/?p=xz.git;a=blob;f=NEWS;h=7f83c81f61e8e6aa81525e44c072c76205eeb14b;hb=238b4e5458b4bd2cadefb768b8ea7c6b70a191ac [3] https://github.com/tukaani-project/xz/pull/32#issuecomment-1438396969 [4] https://github.com/tukaani-project/xz/commit/f68f4b27f62f53fdac570885a1f4f23367ce6599 [5] https://github.com/tukaani-project/xz/commit/5a7b930efa7f9849d8da8397e8e5d8638f92be40 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...0001-Detect-symver-attribute-support.patch | 70 ------------------- package/xz/xz.hash | 8 +-- package/xz/xz.mk | 2 +- 3 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 package/xz/0001-Detect-symver-attribute-support.patch diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch deleted file mode 100644 index 462fa9d86ba5..000000000000 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ /dev/null @@ -1,70 +0,0 @@ -From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 -From: Vincent Fazio -Date: Wed, 8 Feb 2023 12:58:37 +0000 -Subject: [PATCH] Detect symver attribute support - -On Microblaze, builds will fail when trying to add symver information -because __attribute__((symver ..)) is not supported even though -__has_attribute(__symver__) returns true. - -Support for symver needs to be detected via a compile test since -__has_attribute can report false positives [0]. - -Add a configure compile check for __attribute__((symver ..)) to ensure -it is supported and define a variable to advertise support. - -[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 - -Upstream: https://github.com/tukaani-project/xz/pull/32 -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vincent Fazio -[Peter: patch configure instead of configure.ac so autoreconf isn't -triggered at build time] -Signed-off-by: Peter Korsgaard ---- - configure | 15 +++++++++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 671d3bc..27b56ee 100644 ---- a/src/liblzma/common/common.h -+++ b/src/liblzma/common/common.h -@@ -76,7 +76,7 @@ - // too (which doesn't support __symver__) so use it to detect if __symver__ - // is available. This should be far more reliable than looking at compiler - // version macros as nowadays especially __GNUC__ is defined by many compilers. --# if lzma_has_attribute(__symver__) -+# if defined(HAVE_SYMVER_ATTRIBUTE) - # define LZMA_SYMVER_API(extnamever, type, intname) \ - extern __attribute__((__symver__(extnamever))) \ - LZMA_API(type) intname -diff --git a/configure b/configure -index ff0eed5..e685b30 100755 ---- a/configure -+++ b/configure -@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } - - printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h - -+ OLD_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__attribute__ ((symver ("test@TEST"))) void foo(void) { } -+ -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ -+printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CFLAGS="$OLD_CFLAGS" - ;; - *) - enable_symbol_versions=generic --- -2.34.1 - diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 1153e02b4d4e..0a8a13f1eba6 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,9 +1,9 @@ # Locally calculated after checking pgp signature -# https://tukaani.org/xz/xz-5.2.10.tar.bz2.sig -sha256 01b71df61521d9da698ce3c33148bff06a131628ff037398c09482f3a26e5408 xz-5.2.10.tar.bz2 +# https://tukaani.org/xz/xz-5.4.3.tar.gz.sig +sha256 9243a04598d7a70c1f567a0143a255581ac5c64b140fd55fd5cbc1e00b0e6f90 xz-5.4.3.tar.bz2 # Hash for license files -sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING +sha256 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPLv3 +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING.GPLv3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 0120d23b85e8..dcdbe142b61e 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.2.10 +XZ_VERSION = 5.4.3 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES From 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 13:04:47 +0200 Subject: [PATCH 0903/2890] package/putty: bump version to 0.78 Changelog: https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html Removed patch, the patched file does not exist anymore in this release. Updated license hash due to copyright year bump: https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=ce59d8bb4f7a1c6aff677d1431ec84a803a24091 Switched build system to cmake. Added optional dependency to libgtk3. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...1-unix-uxutils.h-fix-build-on-uclibc.patch | 41 ------------------- package/putty/Config.in | 6 +-- package/putty/putty.hash | 11 +++-- package/putty/putty.mk | 13 +++--- 5 files changed, 14 insertions(+), 58 deletions(-) delete mode 100644 package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch diff --git a/.checkpackageignore b/.checkpackageignore index d3e5af412940..24adeeb70d07 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1239,7 +1239,6 @@ package/pulseaudio/S50pulseaudio ConsecutiveEmptyLines EmptyLastLine Indent Vari package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch Upstream package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch Upstream package/pulseview/0003-Support-glibmm-2.68.patch Upstream -package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch Upstream package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch Upstream package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch Upstream package/python-crossbar/0001-Avoid-intentional-syntax-error.patch Upstream diff --git a/package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch b/package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch deleted file mode 100644 index 78cef8b908be..000000000000 --- a/package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3f30f3a7e3f07f5ca3cef0f405b02e22a018c6e4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 9 May 2021 15:22:29 +0200 -Subject: [PATCH] unix/uxutils.h: fix build on uclibc - -Build on uclibc is broken since version 0.75 and commit -65383082bf0c49cec63f4b36001a40bd9b13edf6 because AT_HWCAP2 is used -even if is not available: - -unix/uxutils.c: In function 'platform_aes_hw_available': -unix/uxutils.c:13:22: error: 'AT_HWCAP2' undeclared (first use in this function) - 13 | return getauxval(AT_HWCAP2) & HWCAP2_AES; - | ^~~~~~~~~ - -To fix this build failure, include - -Fixes: - - http://autobuild.buildroot.org/results/726f7c5ce13e78ed91e827b872e9d7ccfa13f298 - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to Simon Tatham ] ---- - unix/uxutils.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/unix/uxutils.h b/unix/uxutils.h -index c9acff53..b80bf972 100644 ---- a/unix/uxutils.h -+++ b/unix/uxutils.h -@@ -18,6 +18,8 @@ - - #if defined __arm__ || defined __aarch64__ - -+#include -+ - #ifdef HAVE_SYS_TYPES_H - #include - #endif --- -2.30.2 - diff --git a/package/putty/Config.in b/package/putty/Config.in index cd8b3bb2132d..f89283b99ae7 100644 --- a/package/putty/Config.in +++ b/package/putty/Config.in @@ -3,10 +3,10 @@ config BR2_PACKAGE_PUTTY depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR help - PuTTY is a free SSH and Telnet client. Without GTK2 + PuTTY is a free SSH and Telnet client. Without GTK2 or GTK3 activated, only the commandline tools plink, pscp, psftp, - and puttygen are built; enable GTK2 for the graphical - client. + and puttygen are built; enable GTK2 or GTK3 for the + graphical client. http://www.chiark.greenend.org.uk/~sgtatham/putty/ diff --git a/package/putty/putty.hash b/package/putty/putty.hash index 861d45cb769d..c691a4f975bf 100644 --- a/package/putty/putty.hash +++ b/package/putty/putty.hash @@ -1,8 +1,7 @@ -# Hashes from: http://the.earth.li/~sgtatham/putty/0.76/{md5,sha1,sha256,sha512}sums -md5 9d22f8c56c1eaa1c0af3098438f25908 putty-0.76.tar.gz -sha1 de09f50aee330eb05ad0cb81b970d0cc8e5c9b25 putty-0.76.tar.gz -sha256 547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f putty-0.76.tar.gz -sha512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25 putty-0.76.tar.gz +# Hashes from: http://the.earth.li/~sgtatham/putty/0.78/{sha1,sha256,sha512}sums +sha1 198f01db6bea708e480fb11dd23026eda7b3f49f putty-0.78.tar.gz +sha256 274e01bcac6bd155dfd647b2f18f791b4b17ff313753aa919fcae2e32d34614f putty-0.78.tar.gz +sha512 d7a3e2eabd5f1f65fc0f3f1ee0789c30fbe891b57f63ddeac0b92befcb6aecd4a748f04a21c76ee42d992deb77c2e1a0454a71cc620ef26fbf23af660bd84bb5 putty-0.78.tar.gz # Locally calculated -sha256 3f3e870dd3d0867d79370b1d433602c60bb91b59de04e5d8f2a149b788530d53 LICENCE +sha256 7b10c93f0d582e820a9e6f8c6abbcff54192e41e60644f4d09b96b14fdbc74f8 LICENCE diff --git a/package/putty/putty.mk b/package/putty/putty.mk index e57a78be9615..82b7464bb4e6 100644 --- a/package/putty/putty.mk +++ b/package/putty/putty.mk @@ -4,18 +4,17 @@ # ################################################################################ -PUTTY_VERSION = 0.76 +PUTTY_VERSION = 0.78 PUTTY_SITE = http://the.earth.li/~sgtatham/putty/$(PUTTY_VERSION) PUTTY_LICENSE = MIT PUTTY_LICENSE_FILES = LICENCE PUTTY_CPE_ID_VENDOR = putty -PUTTY_CONF_OPTS = --disable-gtktest +PUTTY_DEPENDENCIES = host-pkgconf -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -PUTTY_CONF_OPTS += --with-gtk=2 +ifeq ($(BR2_PACKAGE_LIBGTK3),y) +PUTTY_DEPENDENCIES += libgtk3 +else ifeq ($(BR2_PACKAGE_LIBGTK2),y) PUTTY_DEPENDENCIES += libgtk2 -else -PUTTY_CONF_OPTS += --without-gtk endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) From 21f6859647a9ebab2fc09824403514cbaea523a4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 26 Jun 2023 07:46:52 +0200 Subject: [PATCH 0904/2890] package/petitboot: fix install buildroot commit 4c8ab13b960edcd290ea5ca7a7e739cb993fb863 added a link of /usr/sbin/pb-udhcpc in $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ without creating that directory first. Fixes: http://autobuild.buildroot.net/results/778/77802098355dd99a9e7e6d9178f900a9a8fe72a3/ Signed-off-by: Bernd Kuhls Reviewed-by: Laurent Vivier Signed-off-by: Arnout Vandecappelle --- package/petitboot/petitboot.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 4d56b73938e7..8b4c14207ec4 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -55,6 +55,7 @@ define PETITBOOT_POST_INSTALL $(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb $(INSTALL) -m 0755 -D $(PETITBOOT_PKGDIR)/S15pb-discover \ $(TARGET_DIR)/etc/init.d/S15pb-discover + mkdir -p $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ ln -sf /usr/sbin/pb-udhcpc \ $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ endef From 11aa7ac8fa3a21dc2476dd09539ea3cf3e48f03d Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 26 Jun 2023 09:05:35 +0200 Subject: [PATCH 0905/2890] package/gnuradio: fix build with python-pybind > 2.10.0 Since commit 0e82c360942907f5a2f379e64e0d211aaff80774 (and since release 2.10.1), a new variable called PYBIND11_PYTHONLIBS_OVERWRITE was introduced and set to ON by default. According to comment before this option: "Overwrite cached values read from Python library (classic search). Turn off if cross-compiling and manually setting these values." In buildroot's context this option must be disabled to keep variables provided by buildroot and lib/app. Fixes: - http://autobuild.buildroot.net/results/7423df5db5237d94bb49e32698828d4fe470e39b/ Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Arnout Vandecappelle --- package/gnuradio/gnuradio.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index d9218b533d65..1453b7849370 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -116,6 +116,9 @@ ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GNURADIO_DEPENDENCIES += python3 python-pybind \ host-python-numpy host-python-packaging GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON +# mandatory to avoid pybind11 to overwrite variables provided +# by gnuradio and buildroot +GNURADIO_CONF_OPTS += -DPYBIND11_PYTHONLIBS_OVERWRITE=OFF # mandatory to install python modules in site-packages and to use # correct path for python libraries GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ From 6f4e0e38f865f61d9ea5de8b07eaceec96863fd6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 4 Jul 2023 19:03:03 +0200 Subject: [PATCH 0906/2890] package/libva: bump version to 2.19.0 Release notes: https://github.com/intel/libva/blob/v2.19-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libva/libva.hash | 2 +- package/libva/libva.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 8173876bbd98..b9dba9e91a45 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9d666c70c12dfefcdd27ae7dea771557f75e24961d0ed4cb050d96fb6136f438 libva-2.18.0.tar.gz +sha256 8cb5e2a9287a76b12c0b6cb96f4f27a0321bbe693df43cd950e5d4542db7f227 libva-2.19.0.tar.gz sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index dbb0b8f6e442..fd796cfd6abf 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.18.0 +LIBVA_VERSION = 2.19.0 LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING From dc4d70ff1f828b92219f0915e6a296f3ab60edb6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 4 Jul 2023 19:03:04 +0200 Subject: [PATCH 0907/2890] package/libva-utils: bump version to 2.19.0 Release notes: https://github.com/intel/libva-utils/blob/v2.19-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libva-utils/libva-utils.hash | 2 +- package/libva-utils/libva-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 3cde9cd28418..e46a0522f8f6 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c4c0555c96ca678f9ac47fbb56f0ae56ca39fd50fe3553bae5cb13117bfcb406 libva-utils-2.18.2.tar.gz +sha256 4135992ab534d0cfd71a93c28e1a22f79c0003cf8d157ffd4621e5e482191b4f libva-utils-2.19.0.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 38d46a08c9b1..4b2f5907ea8b 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.18.2 +LIBVA_UTILS_VERSION = 2.19.0 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From 3512b76f2ec3612a3329bad6da5e82064fd06e6a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 16:41:16 +0200 Subject: [PATCH 0908/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 315af971db09..fba0e1244ba5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.3.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.3.10" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index f49ab52afb85..d6371a49064d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 41ecf21399b17ab85163750ba22347d09b54fa099b80b63d0e2ef0066129b13e linux-6.3.9.tar.xz -sha256 be368143bc5d0dc73dd3e8c6191630c1620520379baf6f47c16116b2c0bc26ac linux-6.1.35.tar.xz +sha256 e0a9ad8692b2191cbd33db371a780a3fe375de90123a307ecd874c0860cd46e3 linux-6.3.10.tar.xz +sha256 d8ca0e300f30b9ff70c6e1497c638a1dac1407f45d3655e9c62c6e45a08afe6b linux-6.1.36.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 4e6bf4dadb04d5d11d1d4cc37c0eabcf33bc333b7dd3dc2143c3099a823eb5b3 linux-5.15.118.tar.xz -sha256 280662ec8dc8738cf947ad66e748141abd58cbe3b5ed66b7f2b153222b7c7090 linux-5.10.185.tar.xz -sha256 3abed132e76c6575733acba39eaa54f6d8f4b1dc951b0e601a33959743b13e35 linux-5.4.248.tar.xz +sha256 7aa5a0fd3520947e5599e811d28acdc30e36446c016c7dcee3793e6d1cbecfcf linux-5.15.119.tar.xz +sha256 1e60296a135d272bb7ce645f6ae68fbd4ffd1972cb4b82c38c6faa1172481be3 linux-5.10.186.tar.xz +sha256 dc5458462c6edbe3473fc6dee80fbe0841df7c177fe0546c2f131e5918f5351d linux-5.4.249.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 286a9b8c75bff7bdf66985e12a3a650b2bd638a776a5a6e93415930855662a73 linux-4.19.287.tar.xz -sha256 aca4750f02f4090b753c1445db44dfa90de535eca73a7b0a7aa4453f65ba1ff9 linux-4.14.319.tar.xz +sha256 33ebd0c445b58c814428558496b65a192410f000096b0e2e6f5d813ecd95e3eb linux-4.19.288.tar.xz +sha256 ed82679c0c6e600db80050d09e2294fb28b61cf27dc98657296c7eb5250a7625 linux-4.14.320.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 10e33a730634..baeabd94dbf6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -396,13 +396,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.319" if BR2_KERNEL_HEADERS_4_14 - default "4.19.287" if BR2_KERNEL_HEADERS_4_19 - default "5.4.248" if BR2_KERNEL_HEADERS_5_4 - default "5.10.185" if BR2_KERNEL_HEADERS_5_10 - default "5.15.118" if BR2_KERNEL_HEADERS_5_15 - default "6.1.35" if BR2_KERNEL_HEADERS_6_1 - default "6.3.9" if BR2_KERNEL_HEADERS_6_3 + default "4.14.320" if BR2_KERNEL_HEADERS_4_14 + default "4.19.288" if BR2_KERNEL_HEADERS_4_19 + default "5.4.249" if BR2_KERNEL_HEADERS_5_4 + default "5.10.186" if BR2_KERNEL_HEADERS_5_10 + default "5.15.119" if BR2_KERNEL_HEADERS_5_15 + default "6.1.36" if BR2_KERNEL_HEADERS_6_1 + default "6.3.10" if BR2_KERNEL_HEADERS_6_3 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 32230a52aaf9651f8b9ad2692d59db70ac8f27a3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 16:41:17 +0200 Subject: [PATCH 0909/2890] {toolchain, linux-headers}: add support for 6.4 headers Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index d6371a49064d..a300d7e9f2d8 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3 linux-6.4.tar.xz sha256 e0a9ad8692b2191cbd33db371a780a3fe375de90123a307ecd874c0860cd46e3 linux-6.3.10.tar.xz sha256 d8ca0e300f30b9ff70c6e1497c638a1dac1407f45d3655e9c62c6e45a08afe6b linux-6.1.36.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index baeabd94dbf6..e7175faf7071 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_3 + default BR2_KERNEL_HEADERS_6_4 help Select the kernel version to get headers from. @@ -52,6 +52,10 @@ config BR2_KERNEL_HEADERS_6_1 config BR2_KERNEL_HEADERS_6_3 bool "Linux 6.3.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 + +config BR2_KERNEL_HEADERS_6_4 + bool "Linux 6.4.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -129,8 +133,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 + bool "6.4.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_3 - bool "6.3.x or later" + bool "6.3.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_2 @@ -403,6 +411,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.119" if BR2_KERNEL_HEADERS_5_15 default "6.1.36" if BR2_KERNEL_HEADERS_6_1 default "6.3.10" if BR2_KERNEL_HEADERS_6_3 + default "6.4" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index ff0eb93017f6..2479128cab85 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -608,6 +608,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -621,6 +625,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 default "6.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 default "6.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 8ca66ab7b660..5bfc4d072365 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -142,8 +142,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_4 + bool "6.4.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_3 - bool "6.3.x or later" + bool "6.3.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_2 From f1970c666a4cc4f679365a5c2d93bf8ec5cf71fd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 16:41:18 +0200 Subject: [PATCH 0910/2890] linux: bump latest version to 6.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index fba0e1244ba5..359adf3bee44 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.3)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.4)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.162-cip24)" @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.3.10" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.4" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From f059c876f76ebef26802b5476dffcf8a17799f38 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 4 Jul 2023 19:07:37 +0200 Subject: [PATCH 0911/2890] package/intel-mediadriver: bump version to 23.2.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index b4129eb3bff2..81fa5ba02751 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3796fea4201e24310b3d100b64cfb288fb92b93ce9de54526efa43e2ea68853a intel-media-23.2.1.tar.gz +sha256 dfcf2facc4f8bf3df6b147222786032be195874adacc2f4071fc6c91a0abdf0a intel-media-23.2.4.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 6895d60be6ac..dc63bb6239ef 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 23.2.1 +INTEL_MEDIADRIVER_VERSION = 23.2.4 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From a932fbed9c230310189f72a1f4f5c0cbe173a17e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 4 Jul 2023 19:09:20 +0200 Subject: [PATCH 0912/2890] package/libssh2: fix build with mbedtls Fixes: http://autobuild.buildroot.net/results/3f2/3f295deaee31266f394035924ec0192edcca4b1e/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...more-size_t-to-sync-up-with-crypto-h.patch | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 package/libssh2/0001-mbedtls-use-more-size_t-to-sync-up-with-crypto-h.patch diff --git a/package/libssh2/0001-mbedtls-use-more-size_t-to-sync-up-with-crypto-h.patch b/package/libssh2/0001-mbedtls-use-more-size_t-to-sync-up-with-crypto-h.patch new file mode 100644 index 000000000000..3cac13386436 --- /dev/null +++ b/package/libssh2/0001-mbedtls-use-more-size_t-to-sync-up-with-crypto-h.patch @@ -0,0 +1,106 @@ +From 1153ebdeba563ac657b525edd6bf6da68b1fe5e2 Mon Sep 17 00:00:00 2001 +From: Viktor Szakats +Date: Tue, 30 May 2023 17:28:03 +0000 +Subject: [PATCH] mbedtls: use more `size_t` to sync up with `crypto.h` + +Ref: 5a96f494ee0b00282afb2db2e091246fc5e1774a #846 #879 + +Fixes #1053 +Closes #1054 + +Upstream: https://github.com/libssh2/libssh2/commit/1153ebdeba563ac657b525edd6bf6da68b1fe5e2 + +Signed-off-by: Bernd Kuhls +--- + src/mbedtls.c | 14 ++++++++------ + src/mbedtls.h | 13 ++++++------- + 2 files changed, 14 insertions(+), 13 deletions(-) + +diff --git a/src/mbedtls.c b/src/mbedtls.c +index e387cdb19..cd14a4bd8 100644 +--- a/src/mbedtls.c ++++ b/src/mbedtls.c +@@ -186,7 +186,7 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx) + int + _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx, + mbedtls_md_type_t mdtype, +- const unsigned char *key, unsigned long keylen) ++ const unsigned char *key, size_t keylen) + { + const mbedtls_md_info_t *md_info; + int ret, hmac; +@@ -221,7 +221,7 @@ _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, unsigned char *hash) + } + + int +-_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen, ++_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen, + mbedtls_md_type_t mdtype, unsigned char *hash) + { + const mbedtls_md_info_t *md_info; +@@ -497,8 +497,9 @@ int + _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, + size_t hash_len, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, unsigned long m_len) ++ size_t sig_len, ++ const unsigned char *m, ++ size_t m_len) + { + int ret; + int md_type; +@@ -548,8 +549,9 @@ _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, + int + _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx * rsactx, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, unsigned long m_len) ++ size_t sig_len, ++ const unsigned char *m, ++ size_t m_len) + { + return _libssh2_mbedtls_rsa_sha2_verify(rsactx, SHA_DIGEST_LENGTH, + sig, sig_len, m, m_len); +diff --git a/src/mbedtls.h b/src/mbedtls.h +index d9592f721..03484da17 100644 +--- a/src/mbedtls.h ++++ b/src/mbedtls.h +@@ -478,12 +478,12 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx); + int + _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx, + mbedtls_md_type_t mdtype, +- const unsigned char *key, unsigned long keylen); ++ const unsigned char *key, size_t keylen); + + int + _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, unsigned char *hash); + int +-_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen, ++_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen, + mbedtls_md_type_t mdtype, unsigned char *hash); + + _libssh2_bn * +@@ -526,9 +526,8 @@ _libssh2_mbedtls_rsa_new_private_frommemory(libssh2_rsa_ctx **rsa, + int + _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx *rsa, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, +- unsigned long m_len); ++ size_t sig_len, ++ const unsigned char *m, size_t m_len); + int + _libssh2_mbedtls_rsa_sha1_sign(LIBSSH2_SESSION *session, + libssh2_rsa_ctx *rsa, +@@ -540,8 +539,8 @@ int + _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, + size_t hash_len, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, unsigned long m_len); ++ size_t sig_len, ++ const unsigned char *m, size_t m_len); + int + _libssh2_mbedtls_rsa_sha2_sign(LIBSSH2_SESSION *session, + libssh2_rsa_ctx *rsa, From adfdeb1f82544466c5948f4c42e1eccd3ab0f72c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 31 May 2023 20:13:44 +0200 Subject: [PATCH 0913/2890] package/samba4: bump version to 4.18.3 Release notes: https://www.samba.org/samba/history/samba-4.18.3.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 20390fb6b4bc..05563d00cf23 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.18.2.tar.asc -sha256 5bf87e179616cd12a52d85fb8b26eec709f13709a2b67fe42b1fb0213f7e8106 samba-4.18.2.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.18.3.tar.asc +sha256 c67e1453165a3918ffffad600236ca3966b47bde4798e89ae600ae3903ccc32c samba-4.18.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 4489c28d2bdf..75938e21a893 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.18.2 +SAMBA4_VERSION = 4.18.3 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 006badd9b61ec281d656e23009ddc326a94ae39e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 5 Jul 2023 18:29:36 +0200 Subject: [PATCH 0914/2890] package/samba4: bump version to 4.18.4 Release notes: https://www.samba.org/samba/history/samba-4.18.4.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 05563d00cf23..cc7eee620f2f 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.18.3.tar.asc -sha256 c67e1453165a3918ffffad600236ca3966b47bde4798e89ae600ae3903ccc32c samba-4.18.3.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.18.4.tar.asc +sha256 6ba7b3503cc59c9ff4f6fcb1b510c2c855fff93e0b366ab891a32a4732e88e53 samba-4.18.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 75938e21a893..a14cc63c010c 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.18.3 +SAMBA4_VERSION = 4.18.4 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 6021f3678b44d43da7057e3135da842cde1ffa05 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 5 Jul 2023 18:46:14 +0200 Subject: [PATCH 0915/2890] board/raspberrypi: handle dtb overlays for all variants Most rpi defconfigs use dtb overlays, but not rpi0 / rpi2 - Making it harder to use overlays on those boards as the genimage files have to be tweaked. To fix this, create the rpi-firmware/overlays directory in the post-build script if needed and unconditionally include it in the genimage files so rpi0/rpi2 works consistently with the other variants. Signed-off-by: Peter Korsgaard --- board/raspberrypi/genimage-raspberrypi0.cfg | 1 + board/raspberrypi/genimage-raspberrypi2.cfg | 1 + board/raspberrypi/post-build.sh | 3 +++ 3 files changed, 5 insertions(+) diff --git a/board/raspberrypi/genimage-raspberrypi0.cfg b/board/raspberrypi/genimage-raspberrypi0.cfg index 1fa3f5096fd9..313f85f651cc 100644 --- a/board/raspberrypi/genimage-raspberrypi0.cfg +++ b/board/raspberrypi/genimage-raspberrypi0.cfg @@ -7,6 +7,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "zImage" } } diff --git a/board/raspberrypi/genimage-raspberrypi2.cfg b/board/raspberrypi/genimage-raspberrypi2.cfg index acd23e7ca8f5..dad927553751 100644 --- a/board/raspberrypi/genimage-raspberrypi2.cfg +++ b/board/raspberrypi/genimage-raspberrypi2.cfg @@ -7,6 +7,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "zImage" } } diff --git a/board/raspberrypi/post-build.sh b/board/raspberrypi/post-build.sh index 5e5eb7110076..b24256fceaba 100755 --- a/board/raspberrypi/post-build.sh +++ b/board/raspberrypi/post-build.sh @@ -9,3 +9,6 @@ if [ -e ${TARGET_DIR}/etc/inittab ]; then sed -i '/GENERIC_SERIAL/a\ tty1::respawn:/sbin/getty -L tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab fi + +# exnsure overlays exists for genimage +mkdir -p "${BINARIES_DIR}/rpi-firmware/overlays" From a7e4f557f5c5874c84d6ae2e28d752603e18ab3f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 1 Jun 2023 18:36:01 +0200 Subject: [PATCH 0916/2890] package/busybox: bump version to 1.36.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/busybox/busybox.hash | 4 ++-- package/busybox/busybox.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 6d1c36906dd2..6eba365ecc77 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 -sha256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5 busybox-1.36.0.tar.bz2 +# From https://busybox.net/downloads/busybox-1.36.1.tar.bz2.sha256 +sha256 b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314 busybox-1.36.1.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index fd4f3c17c5ab..eb5e7ad9222a 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.36.0 +BUSYBOX_VERSION = 1.36.1 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 From 40c7d10b2be015ef13557adb5841fa7d2795048b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 8 Jul 2023 13:35:38 +0200 Subject: [PATCH 0917/2890] package/dfu-programmer: link with -latomic if needed Fixes: http://autobuild.buildroot.net/results/e2b/e2b813fdcbb3862366609affe88551c3036b21b8/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dfu-programmer/dfu-programmer.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/dfu-programmer/dfu-programmer.mk b/package/dfu-programmer/dfu-programmer.mk index 3b1589125c55..707e143eb3f2 100644 --- a/package/dfu-programmer/dfu-programmer.mk +++ b/package/dfu-programmer/dfu-programmer.mk @@ -18,4 +18,8 @@ endef DFU_PROGRAMMER_POST_PATCH_HOOKS == DFU_PROGRAMMER_ADD_MISSING_FILE +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +DFU_PROGRAMMER_CONF_OPTS += LIBS=-latomic +endif + $(eval $(autotools-package)) From 3ca3304276bd155d3d29fb87f227866bd7f32ec7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 7 Jul 2023 07:34:42 +0200 Subject: [PATCH 0918/2890] package/php: bump version to 8.2.8 Changelog: https://www.php.net/ChangeLog-8.php#8.2.8 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 4fe77f1c5bac..9fb4aebec14d 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 4b9fb3dcd7184fe7582d7e44544ec7c5153852a2528de3b6754791258ffbdfa0 php-8.2.7.tar.xz +sha256 cfe1055fbcd486de7d3312da6146949aae577365808790af6018205567609801 php-8.2.8.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 3bb27f1306fa..6a2a6ae71b15 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.7 +PHP_VERSION = 8.2.8 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From c3cee366cb23252102d26713e1398caa7733c8fe Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 12:09:30 +0200 Subject: [PATCH 0919/2890] package/musl: bump version to 1.2.4 Removed patch which is included in this release. Switched _SITE according to http://www.musl-libc.org/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...rameter-name-in-internal-netlink.h-R.patch | 33 ------------------- package/musl/Config.in | 2 +- package/musl/musl.hash | 4 +-- package/musl/musl.mk | 4 +-- 5 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch diff --git a/.checkpackageignore b/.checkpackageignore index 24adeeb70d07..7f45b6a808cf 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1010,7 +1010,6 @@ package/musepack/0004-missing-sys-select.patch Upstream package/musepack/0005-fix-build-with-gcc-10.patch Upstream package/musl/0001-avoid-kernel-if_ether.h.patch Upstream package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch Upstream -package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch Upstream package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream package/nanocom/0001-fix-build-with-gcc-10.patch Upstream package/ncftp/0001-fix-gcc-10.patch Upstream diff --git a/package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch b/package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch deleted file mode 100644 index fa3057ff082b..000000000000 --- a/package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8cf87b3027009c0acac591d9ae80262dc25daccf Mon Sep 17 00:00:00 2001 -From: Ondrej Jirman -Date: Wed, 21 Nov 2018 17:29:21 +0100 -Subject: [PATCH] fix incorrect parameter name in internal netlink.h RTA_OK - macro - -the wrong name works only by accident. - -Signed-off-by: Ondrej Jirman -Signed-off-by: Rich Felker -Signed-off-by: Petr Vorel - -[ upstream status: 8cf87b3027009c0acac591d9ae80262dc25daccf ] ---- - src/network/netlink.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/network/netlink.h b/src/network/netlink.h -index 38acb178..873fabe2 100644 ---- a/src/network/netlink.h -+++ b/src/network/netlink.h -@@ -86,7 +86,7 @@ struct ifaddrmsg { - #define RTA_DATALEN(rta) ((rta)->rta_len-sizeof(struct rtattr)) - #define RTA_DATAEND(rta) ((char*)(rta)+(rta)->rta_len) - #define RTA_NEXT(rta) (struct rtattr*)((char*)(rta)+NETLINK_ALIGN((rta)->rta_len)) --#define RTA_OK(nlh,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr)) -+#define RTA_OK(rta,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr)) - - #define NLMSG_RTA(nlh,len) ((void*)((char*)(nlh)+sizeof(struct nlmsghdr)+NETLINK_ALIGN(len))) - #define NLMSG_RTAOK(rta,nlh) RTA_OK(rta,NLMSG_DATAEND(nlh)) --- -2.36.0 - diff --git a/package/musl/Config.in b/package/musl/Config.in index c1a10bdd5832..f3210c511995 100644 --- a/package/musl/Config.in +++ b/package/musl/Config.in @@ -37,4 +37,4 @@ config BR2_PACKAGE_MUSL # Compatibility headers: cdefs.h, queue.h select BR2_PACKAGE_MUSL_COMPAT_HEADERS help - https://www.musl-libc.org/ + http://musl.libc.org/ diff --git a/package/musl/musl.hash b/package/musl/musl.hash index e093a5358e64..3b5fccc9e282 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://musl.libc.org/releases/musl-1.2.3.tar.gz.asc -sha256 7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4 musl-1.2.3.tar.gz +# http://musl.libc.org/releases/musl-1.2.4.tar.gz.asc +sha256 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039 musl-1.2.4.tar.gz sha256 f9bc4423732350eb0b3f7ed7e91d530298476f8fec0c6c427a1c04ade22655af COPYRIGHT diff --git a/package/musl/musl.mk b/package/musl/musl.mk index 30c3c2fbc010..08706c139ff4 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,8 +4,8 @@ # ################################################################################ -MUSL_VERSION = 1.2.3 -MUSL_SITE = http://www.musl-libc.org/releases +MUSL_VERSION = 1.2.4 +MUSL_SITE = http://musl.libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT MUSL_CPE_ID_VENDOR = musl-libc From 4a239f14efdd4eb0fcbf89d403cde4dd31205a41 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 11:50:57 +0200 Subject: [PATCH 0920/2890] package/fwts: fix build with BR2_OPTIMIZE_0 Fixes: http://autobuild.buildroot.net/results/fab/fabd031d38cb618cdb11b4a86cd853b0da61695b/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/fwts/fwts.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index f04c7a848fc4..3af54a1afdfa 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -15,6 +15,10 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) +ifeq ($(BR2_OPTIMIZE_0),y) +FWTS_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -O1" +endif + ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) From a749a93b7def81096f33310a5892f677c9fc8bb1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 11:50:58 +0200 Subject: [PATCH 0921/2890] package/fwts: bump version to 23.07.00 Release notes: https://wiki.ubuntu.com/FirmwareTestSuite/ReleaseNotes Updated license hash due to copyright year bump and formatting changes: https://git.launchpad.net/fwts/commit/debian/copyright?id=64d2ea181d887d877104cd08defbd3427015070a https://git.launchpad.net/fwts/commit/debian/copyright?id=88edd4da5885e182a339c57c4d70768f6fab695b Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/fwts/fwts.hash | 4 ++-- package/fwts/fwts.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index 612bc768dd01..8525d47ecb67 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,5 +1,5 @@ # Hash from: http://fwts.ubuntu.com/release/SHA256SUMS -sha256 fee1c323fb9725c2b99c348c434d63196391cad66566d34b42707e55d14d7f25 fwts-V22.09.00.tar.gz +sha256 a15e11c42856e9dfcf7ac23ed370618d2777eb996dd7843accf12d45b21b551c fwts-V23.07.00.tar.gz # Hash for license file -sha256 fbbea748555635dd8c7e6e2f99cddd778f5ee3f9e3510775183bf9799076e5e5 debian/copyright +sha256 b9e44b1f9f65178e037a59a31b051b51dbd6a531d27c8775d3438a6ce53fc874 debian/copyright diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index 3af54a1afdfa..f06609777db2 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWTS_VERSION = 22.09.00 +FWTS_VERSION = 23.07.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = http://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 From af5ccec266dbb7925ac12622f379dacb20087ddd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 16:51:18 +0200 Subject: [PATCH 0922/2890] utils/genrandconfig: disable cramfs images Fixes build error: warning: estimate of required size (upper bound) is 1374MB, but maximum image size is 272MB, we might die prematurely mkcramfs: filesystem too big Fixes: http://autobuild.buildroot.net/results/d47/d47f9b462707dffe1b6665f143701303b04e2adc/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 2b0baedf310f..0938260c1be4 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -512,6 +512,9 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_OPTEE_OS=y\n') configlines.remove('BR2_TARGET_OPTEE_OS_PLATFORM=""\n') + if 'BR2_TARGET_ROOTFS_CRAMFS=y\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_CRAMFS=y\n') + if 'BR2_TARGET_ROOTFS_EXT2=y\n' in configlines and \ 'BR2_TARGET_ROOTFS_EXT2_SIZE="60M"\n' in configlines: configlines.remove('BR2_TARGET_ROOTFS_EXT2_SIZE="60M"\n') From 76059865ad2e99375fb5ba4b93ed0464cb14734b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 17:19:19 +0200 Subject: [PATCH 0923/2890] package/dahdi-linux: fix build on Linux 6.4 Fixes: http://autobuild.buildroot.net/results/8b1/8b140b7f4d2f2b3080cab90906c3cebea0e510c5/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0006-Fix-build-on-Linux-6.4.patch | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 package/dahdi-linux/0006-Fix-build-on-Linux-6.4.patch diff --git a/package/dahdi-linux/0006-Fix-build-on-Linux-6.4.patch b/package/dahdi-linux/0006-Fix-build-on-Linux-6.4.patch new file mode 100644 index 000000000000..992cb4d51367 --- /dev/null +++ b/package/dahdi-linux/0006-Fix-build-on-Linux-6.4.patch @@ -0,0 +1,69 @@ +From b393e59d7eb2951e2fb279fca1c4756ea165aeee Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 9 Jul 2023 17:14:31 +0200 +Subject: [PATCH] Fix build on Linux 6.4 + +Needed after upstream changes in kernel 6.4: +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/include/linux/device/class.h?id=1aaba11da9aa +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=48380368dec14859723b9e3fbd43e042638d9a76 + +Upstream: https://github.com/asterisk/dahdi-linux/pull/22 + +Signed-off-by: Bernd Kuhls +--- + drivers/dahdi/dahdi-sysfs-chan.c | 4 ++++ + drivers/dahdi/voicebus/voicebus.c | 4 ++++ + drivers/dahdi/wctdm24xxp/base.c | 4 ++++ + 3 files changed, 12 insertions(+) + +diff --git a/drivers/dahdi/dahdi-sysfs-chan.c b/drivers/dahdi/dahdi-sysfs-chan.c +index a91e6ed..b18b5f9 100644 +--- a/drivers/dahdi/dahdi-sysfs-chan.c ++++ b/drivers/dahdi/dahdi-sysfs-chan.c +@@ -482,7 +482,11 @@ int __init dahdi_sysfs_chan_init(const struct file_operations *fops) + } + should_cleanup.channel_driver = 1; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) + dahdi_class = class_create(THIS_MODULE, "dahdi"); ++#else ++ dahdi_class = class_create("dahdi"); ++#endif + if (IS_ERR(dahdi_class)) { + res = PTR_ERR(dahdi_class); + dahdi_err("%s: class_create(dahi_chan) failed. Error: %d\n", +diff --git a/drivers/dahdi/voicebus/voicebus.c b/drivers/dahdi/voicebus/voicebus.c +index 8a1f7a6..d141aaf 100644 +--- a/drivers/dahdi/voicebus/voicebus.c ++++ b/drivers/dahdi/voicebus/voicebus.c +@@ -1135,7 +1135,11 @@ static void vb_stop_txrx_processors(struct voicebus *vb) + */ + void voicebus_stop(struct voicebus *vb) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) + static DEFINE_SEMAPHORE(stop); ++#else ++ static DEFINE_SEMAPHORE(stop, 1); ++#endif + + down(&stop); + +diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c +index a28e249..4392b45 100644 +--- a/drivers/dahdi/wctdm24xxp/base.c ++++ b/drivers/dahdi/wctdm24xxp/base.c +@@ -224,7 +224,11 @@ mod_hooksig(struct wctdm *wc, struct wctdm_module *mod, enum dahdi_rxsig rxsig) + } + + struct wctdm *ifaces[WC_MAX_IFACES]; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) + DEFINE_SEMAPHORE(ifacelock); ++#else ++DEFINE_SEMAPHORE(ifacelock, 1); ++#endif + + static void wctdm_release(struct wctdm *wc); + +-- +2.39.2 + From c1a7079a2387738044dd76105267d6477418df48 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 09:55:42 +0200 Subject: [PATCH 0924/2890] package/mesa3d-demos: needs C++ Reference: https://gitlab.freedesktop.org/mesa/demos/-/blob/main/meson.build#L21 Fixes: http://autobuild.buildroot.net/results/90e/90e98fa0f37462cadea0fcbff9feabad5554587d/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-demos/Config.in | 6 ++++++ package/piglit/Config.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/mesa3d-demos/Config.in b/package/mesa3d-demos/Config.in index b716cf579918..7848bb6faf6f 100644 --- a/package/mesa3d-demos/Config.in +++ b/package/mesa3d-demos/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MESA3D_DEMOS bool "mesa3d-demos" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \ || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL @@ -10,3 +11,8 @@ config BR2_PACKAGE_MESA3D_DEMOS OpenGL demos from the Mesa 3D project. http://mesa3d.org + +comment "mesa3d-demos needs a toolchain with C++" + depends on !BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \ + || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 5e957a555acb..22d1c7c28e7d 100644 --- a/package/piglit/Config.in +++ b/package/piglit/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_PIGLIT BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \ BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \ BR2_PACKAGE_WAFFLE_SUPPORTS_GBM - depends on BR2_INSTALL_LIBSTDCPP # python-numpy + depends on BR2_INSTALL_LIBSTDCPP # mesa3d-demos, python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBPNG From 80304d9911f34f8a0173a4f37d52f93177478cc7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 09:55:43 +0200 Subject: [PATCH 0925/2890] package/mesa3d-demos: bump version to 9.0.0 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-March/000711.html Rebased patch, switched tarball to xz. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...s-makes-opengl-an-optional-component.patch | 28 +++++++++++-------- package/mesa3d-demos/mesa3d-demos.hash | 6 ++-- package/mesa3d-demos/mesa3d-demos.mk | 6 ++-- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch index e51b6f1a2ad3..af929003db71 100644 --- a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch +++ b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch @@ -9,6 +9,8 @@ This patch is a port of [1] for the new meson build system. https://git.busybox.net/buildroot/tree/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch?h=2022.08 Signed-off-by: Julien Olivain +[Bernd: rebased for version 9.0.0] +Signed-off-by: Bernd Kuhls --- meson.build | 19 ++++++++++++------- meson_options.txt | 1 + @@ -20,7 +22,7 @@ diff --git a/meson.build b/meson.build index e1968fab..a15699d6 100644 --- a/meson.build +++ b/meson.build -@@ -38,7 +38,10 @@ add_project_arguments( +@@ -39,7 +39,10 @@ add_project_arguments( dep_m = cc.find_library('m', required : false) dep_winmm = cc.find_library('winmm', required : false) @@ -30,30 +32,34 @@ index e1968fab..a15699d6 100644 + add_project_arguments('-DEGL_NO_X11=1', language: 'c') +endif + dep_epoll = dependency('epoll-shim', required : false) dep_gles1 = dependency('glesv1_cm', required : get_option('gles1')) - dep_gles2 = dependency('glesv2', required : get_option('gles2')) -@@ -75,13 +78,15 @@ endif +@@ -87,15 +87,17 @@ dep_threads = dependency('threads') --dep_glu = dependency('glu', required : dep_x11.found()) --if not dep_glu.found() +-dep_glu = dependency('glu', required : false) +-# GLU is part of OpenGL.Framework +-if not dep_glu.found() and host_machine.system() != 'darwin' - _glu_name = 'GLU' - if host_machine.system() == 'windows' - _glu_name = 'glu32' +if dep_gl.found() -+ dep_glu = dependency('glu', required : dep_x11.found()) -+ if not dep_glu.found() ++ dep_glu = dependency('glu', required : false) ++ # GLU is part of OpenGL.Framework ++ if not dep_glu.found() and host_machine.system() != 'darwin' + _glu_name = 'GLU' + if host_machine.system() == 'windows' + _glu_name = 'glu32' + endif -+ dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') ++ dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h', ++ required : dep_x11.found()) endif -- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') +- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h', +- required : dep_x11.found()) endif - # GBM is needed for EGL on KMS + dep_glx = dependency('glx', required: false, disabler : true) diff --git a/meson_options.txt b/meson_options.txt index ddadd2e3..f5405698 100644 --- a/meson_options.txt @@ -64,7 +70,7 @@ index ddadd2e3..f5405698 100644 +option('gl', type : 'feature') option('gles1', type : 'feature') option('gles2', type : 'feature') - option('osmesa', type : 'feature') + option('glut', type : 'feature') diff --git a/src/egl/meson.build b/src/egl/meson.build index d1846921..42bf8ecd 100644 --- a/src/egl/meson.build diff --git a/package/mesa3d-demos/mesa3d-demos.hash b/package/mesa3d-demos/mesa3d-demos.hash index b0cfb888165b..cdf9adb3fda4 100644 --- a/package/mesa3d-demos/mesa3d-demos.hash +++ b/package/mesa3d-demos/mesa3d-demos.hash @@ -1,3 +1,3 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html -sha256 cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1 mesa-demos-8.5.0.tar.bz2 -sha512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8 mesa-demos-8.5.0.tar.bz2 +# From https://lists.freedesktop.org/archives/mesa-announce/2023-March/000711.html +sha256 3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b mesa-demos-9.0.0.tar.xz +sha512 af33ef72a521416e39d93370b2b4ccb768f08084c9e4c0aa62868210d9465c858e5cb8e5d23952295a3073946f609eb8723ee60b39dd9fb6696c4e45aafbb2c1 mesa-demos-9.0.0.tar.xz diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 5f7fe8e24dc8..29cb00bb8a42 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -4,9 +4,9 @@ # ################################################################################ -MESA3D_DEMOS_VERSION = 8.5.0 -MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2 -MESA3D_DEMOS_SITE = https://archive.mesa3d.org/demos/$(MESA3D_DEMOS_VERSION) +MESA3D_DEMOS_VERSION = 9.0.0 +MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.xz +MESA3D_DEMOS_SITE = https://archive.mesa3d.org/demos MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT From 683b3e93eb40bf4b312d76a1ce88b2df0519487a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 10:19:24 +0200 Subject: [PATCH 0926/2890] package/valgrind: bump version to 3.21.0 Added sha1 hash provided by upstream, removed md5 hash. Release notes: https://valgrind.org/docs/manual/dist.news.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/valgrind/valgrind.hash | 4 ++-- package/valgrind/valgrind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash index 83717f26f3de..d406babe3566 100644 --- a/package/valgrind/valgrind.hash +++ b/package/valgrind/valgrind.hash @@ -1,7 +1,7 @@ # From https://valgrind.org/downloads/current.html -md5 e3ca8e03c6c527e80e7da5135a1b6beb valgrind-3.20.0.tar.bz2 +sha1 817d769743d278b5d07526e85115082054e9bf9c valgrind-3.21.0.tar.bz2 # locally computed -sha256 8536c031dbe078d342f121fa881a9ecd205cb5a78e639005ad570011bdb9f3c6 valgrind-3.20.0.tar.bz2 +sha256 10ce1618bb3e33fad16eb79552b0a3e1211762448a0d7fce11c8a6243b9ac971 valgrind-3.21.0.tar.bz2 # License files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 98beb7ffef28..4c4c3ce543f4 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALGRIND_VERSION = 3.20.0 +VALGRIND_VERSION = 3.21.0 VALGRIND_SITE = https://sourceware.org/pub/valgrind VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2 From 88c7359f65381d49fa497f9e33bf54bb31a14e6c Mon Sep 17 00:00:00 2001 From: Danny Wood Date: Tue, 20 Jun 2023 12:18:55 +0100 Subject: [PATCH 0927/2890] package/mariadb: update to version 10.11.4 Remove 0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch as it is now upstream. Update README.md hash for minor formatting changes. Release notes: https://mariadb.com/kb/en/mariadb-10-11-4-release-notes/ Changelog: https://mariadb.com/kb/en/mariadb-10-11-4-changelog/ Signed-off-by: Danny Wood Signed-off-by: Peter Korsgaard --- ...mpat.h-fix-build-with-libressl-3.5.0.patch | 39 ------------------- package/mariadb/mariadb.hash | 6 +-- package/mariadb/mariadb.mk | 2 +- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch diff --git a/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch deleted file mode 100644 index fd3e6e66079b..000000000000 --- a/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 79ed770a37c8669390a58a4485dd8f5565fe2497 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 15 Jan 2023 19:12:05 +0100 -Subject: [PATCH] include/ssl_compat.h: fix build with libressl >= 3.5.0 - -Fix the following build failure with libressl >= 3.5.0: - -In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: -/tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': -/tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} - 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) - | ^~ - -Fixes: - - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/MariaDB/server/pull/2435] ---- - include/ssl_compat.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/ssl_compat.h b/include/ssl_compat.h -index 664f3aac87c..3678e5fa084 100644 ---- a/include/ssl_compat.h -+++ b/include/ssl_compat.h -@@ -19,7 +19,8 @@ - /* OpenSSL version specific definitions */ - #if defined(OPENSSL_VERSION_NUMBER) - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -+ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) - #define HAVE_OPENSSL11 1 - #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) - #define ERR_remove_state(X) ERR_clear_error() --- -2.39.0 - diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index c4064cff66f4..03ce5a968a9c 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,6 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.36 -sha512 321b4c48fcea4413eb239c4904c806306de660f2844edfa1d2a2a15213db287070d0f923db976588dfe329559d565bd98bddef3aaf8f14502f8c3db2ee27757a mariadb-10.3.36.tar.gz +# From https://downloads.mariadb.org/mariadb/10.11.4 +sha512 62fc05395857dd036ebeed53b1ff0ecd9abd95ce8e5316194286521caae0f9452cf96a93613adec809e39e1d8ef20c330b24fee82b3bb90ee27a84f2bbd0d8d2 mariadb-10.11.4.tar.gz # Hash for license files -sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md +sha256 2b278a3a2f20696113a7c57c4f3e6a5cdb9a25f2a827e72e0c089a2f805ff91a README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 5fb88762787f..a743d020c086 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.3.36 +MARIADB_VERSION = 10.11.4 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text From 40370b86929ff659301c2e8bcc4dea3bb2370525 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 8 Jul 2023 21:41:44 +0200 Subject: [PATCH 0928/2890] package/perl-html-parser: bump version to 3.81 Removed md5 hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-html-parser/perl-html-parser.hash | 3 +-- package/perl-html-parser/perl-html-parser.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/perl-html-parser/perl-html-parser.hash b/package/perl-html-parser/perl-html-parser.hash index ccd115d6c954..fbdffa03d684 100644 --- a/package/perl-html-parser/perl-html-parser.hash +++ b/package/perl-html-parser/perl-html-parser.hash @@ -1,6 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 8e7151d08f30457a2ba80020b936285f HTML-Parser-3.80.tar.gz -sha256 63411db03016747e37c2636db11b05f8cc71608ef5bff36d04ddb0dc92f7835b HTML-Parser-3.80.tar.gz +sha256 c0910a5c8f92f8817edd06ccfd224ba1c2ebe8c10f551f032587a1fc83d62ff2 HTML-Parser-3.81.tar.gz # computed by scancpan sha256 9081922eb873ec1809c20672a7385a65f3c6b1163166bf69b2bbe986fb5b0159 LICENSE diff --git a/package/perl-html-parser/perl-html-parser.mk b/package/perl-html-parser/perl-html-parser.mk index 1e1f8e605019..50efaa273a38 100644 --- a/package/perl-html-parser/perl-html-parser.mk +++ b/package/perl-html-parser/perl-html-parser.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTML_PARSER_VERSION = 3.80 +PERL_HTML_PARSER_VERSION = 3.81 PERL_HTML_PARSER_SOURCE = HTML-Parser-$(PERL_HTML_PARSER_VERSION).tar.gz PERL_HTML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTML_PARSER_LICENSE = Artistic or GPL-1.0+ From 8caa83002edb57e4b8817ad204cd3e8022aff39a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 8 Jul 2023 21:41:45 +0200 Subject: [PATCH 0929/2890] package/perl-http-daemon: bump version to 6.16 Removed md5 hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-http-daemon/perl-http-daemon.hash | 3 +-- package/perl-http-daemon/perl-http-daemon.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/perl-http-daemon/perl-http-daemon.hash b/package/perl-http-daemon/perl-http-daemon.hash index c19b3b9558e1..b1d92ad8e6ee 100644 --- a/package/perl-http-daemon/perl-http-daemon.hash +++ b/package/perl-http-daemon/perl-http-daemon.hash @@ -1,6 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 3111b0081d08d8b225f52884033de349 HTTP-Daemon-6.14.tar.gz -sha256 f0767e7f3cbb80b21313c761f07ad8ed253bce9fa2d0ba806b3fb72d309b2e1d HTTP-Daemon-6.14.tar.gz +sha256 b38d092725e6fa4e0c4dc2a47e157070491bafa0dbe16c78a358e806aa7e173d HTTP-Daemon-6.16.tar.gz # computed by scancpan sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENCE diff --git a/package/perl-http-daemon/perl-http-daemon.mk b/package/perl-http-daemon/perl-http-daemon.mk index fe50c768bff7..c017c4e09918 100644 --- a/package/perl-http-daemon/perl-http-daemon.mk +++ b/package/perl-http-daemon/perl-http-daemon.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_DAEMON_VERSION = 6.14 +PERL_HTTP_DAEMON_VERSION = 6.16 PERL_HTTP_DAEMON_SOURCE = HTTP-Daemon-$(PERL_HTTP_DAEMON_VERSION).tar.gz PERL_HTTP_DAEMON_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_DAEMON_DEPENDENCIES = host-perl-module-build-tiny From 737dc627324dec90b007c2ddf96a10402c43b56f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 8 Jul 2023 21:41:46 +0200 Subject: [PATCH 0930/2890] package/perl-mail-dkim: bump version to 1.20230630 Removed md5 hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-mail-dkim/perl-mail-dkim.hash | 3 +-- package/perl-mail-dkim/perl-mail-dkim.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/perl-mail-dkim/perl-mail-dkim.hash b/package/perl-mail-dkim/perl-mail-dkim.hash index 6edeaa9d8b25..5b0e77294d22 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.hash +++ b/package/perl-mail-dkim/perl-mail-dkim.hash @@ -1,6 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 5a0dec58f0c2526521b2952a3c126906 Mail-DKIM-1.20220520.tar.gz -sha256 8ac4b8c84bbfad00a3d24bf676493d207dd3cd4a735efabb9e17181534f23646 Mail-DKIM-1.20220520.tar.gz +sha256 0fa09a93a00f43ac91017a91628265ae7d47deb507e2770532bbb2597550d3d4 Mail-DKIM-1.20230630.tar.gz # computed by scancpan sha256 ffaa40feb768566e52d93879fedd2c5483828b6de483874f30a0a4425351555f LICENSE diff --git a/package/perl-mail-dkim/perl-mail-dkim.mk b/package/perl-mail-dkim/perl-mail-dkim.mk index f3383a02bf46..4f4d86ee104d 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.mk +++ b/package/perl-mail-dkim/perl-mail-dkim.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MAIL_DKIM_VERSION = 1.20220520 +PERL_MAIL_DKIM_VERSION = 1.20230630 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MB/MBRADSHAW PERL_MAIL_DKIM_LICENSE = Artistic or GPL-1.0+ From 38efcd326205baa0d2dfaf021836f5ac870edf45 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 8 Jul 2023 21:41:47 +0200 Subject: [PATCH 0931/2890] package/perl-net-dns: bump version to 1.39 Removed md5 hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-net-dns/perl-net-dns.hash | 3 +-- package/perl-net-dns/perl-net-dns.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index a98ac3525da2..f6292d242a03 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b70b74481908d995f57569ab7cfe6432 Net-DNS-1.36.tar.gz -sha256 143ba0e530f8b727be61ec052974cbf52df5b0afc0582d75b04809e0b2a95ebe Net-DNS-1.36.tar.gz +sha256 e99cdedf9f0d60dca16f613e488c5b7f123c2fb24b3346d580cfe7da40851ac6 Net-DNS-1.39.tar.gz # computed by scancpan sha256 1e44fcf65509b47a251eda0ce1f8bd6aefa13517e38cb1e95b8d36120fb15452 LICENSE diff --git a/package/perl-net-dns/perl-net-dns.mk b/package/perl-net-dns/perl-net-dns.mk index f4c20c07ad12..2626c22d64bd 100644 --- a/package/perl-net-dns/perl-net-dns.mk +++ b/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.36 +PERL_NET_DNS_VERSION = 1.39 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT From ccdeeb03c3312347fcf7ad8d153dedd9ff32ba2e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 8 Jul 2023 21:41:48 +0200 Subject: [PATCH 0932/2890] package/perl-net-http: bump version to 6.23 Removed md5 hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-net-http/perl-net-http.hash | 3 +-- package/perl-net-http/perl-net-http.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/perl-net-http/perl-net-http.hash b/package/perl-net-http/perl-net-http.hash index f02fd908087c..094b9e5da03f 100644 --- a/package/perl-net-http/perl-net-http.hash +++ b/package/perl-net-http/perl-net-http.hash @@ -1,6 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1d46019fb8559070a5ec1d838b690657 Net-HTTP-6.22.tar.gz -sha256 62faf9a5b84235443fe18f780e69cecf057dea3de271d7d8a0ba72724458a1a2 Net-HTTP-6.22.tar.gz +sha256 0d65c09dd6c8589b2ae1118174d3c1a61703b6ecfc14a3442a8c74af65e0c94e Net-HTTP-6.23.tar.gz # computed by scancpan sha256 0ed700a4bfc022e999d83407f71ab62ead96662d8f7bbebfd857376bf3ed6528 LICENSE diff --git a/package/perl-net-http/perl-net-http.mk b/package/perl-net-http/perl-net-http.mk index b4cef6188b64..08e81f95a177 100644 --- a/package/perl-net-http/perl-net-http.mk +++ b/package/perl-net-http/perl-net-http.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_HTTP_VERSION = 6.22 +PERL_NET_HTTP_VERSION = 6.23 PERL_NET_HTTP_SOURCE = Net-HTTP-$(PERL_NET_HTTP_VERSION).tar.gz PERL_NET_HTTP_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_NET_HTTP_LICENSE = Artistic or GPL-1.0+ From 6e0f16e2b0a358f60a682952d45b329d8e73f670 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 8 Jul 2023 21:41:49 +0200 Subject: [PATCH 0933/2890] package/perl-uri: bump version to 5.19 Removed md5 hash. Switch to new maintainer repo as indicated by metacpan. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-uri/perl-uri.hash | 3 +-- package/perl-uri/perl-uri.mk | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index daf043347ff1..eaf57623b345 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 63675c429cfb1df73d7d21a9302e1000 URI-5.17.tar.gz -sha256 5f7e42b769cb27499113cfae4b786c37d49e7c7d32dbb469602cd808308568f8 URI-5.17.tar.gz +sha256 8fed5f819905c8a8e18f4447034322d042c3536b43c13ac1f09ba92e1a50a394 URI-5.19.tar.gz # computed by scancpan sha256 d4f0b7a8771dcb1eee79a38c2e466eb997e23565a6687dd1900a2027eabe12a0 LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index d4bfcb44ef1a..a7fab863a676 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_URI_VERSION = 5.17 +PERL_URI_VERSION = 5.19 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz -PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS +PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SI/SIMBABQUE PERL_URI_LICENSE = Artistic or GPL-1.0+ PERL_URI_LICENSE_FILES = LICENSE PERL_URI_DISTNAME = URI From e97efdeef9a5a61cbd3c246aa605a88c5dfaf905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Zwing?= Date: Fri, 7 Jul 2023 16:49:39 +0200 Subject: [PATCH 0934/2890] package/wine: bump to version 8.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Zwing Signed-off-by: Thomas Petazzoni --- package/wine/wine.hash | 2 +- package/wine/wine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wine/wine.hash b/package/wine/wine.hash index b87964da1223..58261d3b1875 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 0272c20938f8721ae4510afaa8b36037457dd57661e4d664231079b9e91c792e wine-8.0.tar.xz +sha256 22035f3836b4f9c3b1940ad90f9b9e3c1be09234236d2a80d893180535c75b7d wine-8.0.1.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB sha256 793d045546467c8f49e35fbd6e02859e57e78f8bb53571e8200bffd0e966dfa8 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index a629bf0dd674..ccaeadff5e8e 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,7 +4,7 @@ # ################################################################################ -WINE_VERSION = 8.0 +WINE_VERSION = 8.0.1 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz WINE_SITE = https://dl.winehq.org/wine/source/8.0 WINE_LICENSE = LGPL-2.1+ From c143e7ed41c83e872994399fd96e7d4d1569034c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 7 Jul 2023 17:17:05 +0200 Subject: [PATCH 0935/2890] package/xmrig: bump version to 6.20.0 Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 4eccef4806e1..eab24a7eab8f 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8c7e48690c8e0f6cbc22c2ad2093328152e34208d1c33dc24008dfcab22ea3eb xmrig-6.19.3.tar.gz +sha256 86c62eb6db83981b21ac1faac69c28fee2952cbbc207ea7476707d4f1799633f xmrig-6.20.0.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index a49580fc7fdb..982ccc8c5dfe 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.19.3 +XMRIG_VERSION = 6.20.0 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From 6ca47ce9bdb38f522500e5b5290f75ed09b47bd3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 7 Jul 2023 17:18:13 +0200 Subject: [PATCH 0936/2890] package/hwloc: bump version to 2.9.2 Removed md5 hash. Changelog: https://github.com/open-mpi/hwloc/blob/v2.9/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/hwloc/hwloc.hash | 5 ++--- package/hwloc/hwloc.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index 963a1fd93019..d40315a3af66 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,6 +1,5 @@ # From https://www.open-mpi.org/software/hwloc/v2.9/ -md5 49869a8e19754299db512572abc5eb2b hwloc-2.9.0.tar.bz2 -sha1 ee178b64234fdbf70f576b79963459ab80880583 hwloc-2.9.0.tar.bz2 -sha256 2070e963596a2421b9af8eca43bdec113ee1107aaf7ccb475d4d3767a8856887 hwloc-2.9.0.tar.bz2 +sha1 be2a4f299c0da7670d39724986268bfa3fac6aee hwloc-2.9.2.tar.bz2 +sha256 0a87fdf677f8b00b567d229b6320bf6b25c693edaa43e0b85268d999d6b060cf hwloc-2.9.2.tar.bz2 # Locally computed sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index c97e46999ce4..6f3b8069e6fa 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -5,7 +5,7 @@ ################################################################################ HWLOC_VERSION_MAJOR = 2.9 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).0 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).2 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) HWLOC_LICENSE = BSD-3-Clause From c19594a10f94c65d52c4996dccc576ca917433d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Zwing?= Date: Fri, 7 Jul 2023 19:15:29 +0200 Subject: [PATCH 0937/2890] package/libkrb5: bump to 1.21 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The hash of the NOTICE file has changed due to: - Update in copyright year - Addition of a BSD-2-Clause license, so no change from that perspective Signed-off-by: André Zwing Signed-off-by: Thomas Petazzoni --- package/libkrb5/libkrb5.hash | 4 ++-- package/libkrb5/libkrb5.mk | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash index 94dfa2ed6ea3..22178d0dec9d 100644 --- a/package/libkrb5/libkrb5.hash +++ b/package/libkrb5/libkrb5.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851 krb5-1.20.1.tar.gz +sha256 69f8aaff85484832df67a4bbacd99b9259bd95aab8c651fbbe65cdc9620ea93b krb5-1.21.tar.gz # Hash for license file: -sha256 cfadcf7b2ead2f3af793c25c00638c9908ac0023b101695f40cb9a03b16811dc NOTICE +sha256 0d5373486138cb176c063db98274b4c4ab6ef3518c4191360736384b780306c2 NOTICE diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index 9bacfaee5854..62a34b23791a 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBKRB5_VERSION_MAJOR = 1.20 -LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).1 -LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR) +LIBKRB5_VERSION = 1.21 +LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION) LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src LIBKRB5_LICENSE = MIT, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, others From 68e4436077c0bcc28aaf83cb99d57284dadb3736 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 10 Jul 2023 14:23:07 +0200 Subject: [PATCH 0938/2890] package/rauc: bump to version 1.10 This release version inludes several enhancements and bugfixes. https://github.com/rauc/rauc/releases/tag/v1.10 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/rauc/rauc.hash | 2 +- package/rauc/rauc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 1cd5f7f31454..3a1fa6f5f9f0 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 73802ce28d1045c757b547f5b4a222f0e825b5df77bca3464350278fc6fd200e rauc-1.9.tar.xz +sha256 d3eec057e74d41565bbdfa10ff8bb2edb38e39af2b2126f8ad1d2174ae034d47 rauc-1.10.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 4168d6c2dbba..9f0571402f77 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.9 +RAUC_VERSION = 1.10 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From 353c06849bc9f9549f0cabefa74c915ce98ae528 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 20:02:49 +0200 Subject: [PATCH 0939/2890] package/dahdi-linux: fix build with kernel < 6.3 Buildroot commit 840b5527466502f02b86c95f9bf95557d35c8571 added a patch from upstream bug tracker which fixes build with kernel >= 6.3 but broke the build with earlier kernels. This patch adds additional code for compatibility with kernel < 6.3. Fixes: http://autobuild.buildroot.net/results/c8c/c8c51153d3a61842d57a2a4be3dc75ec9964e41c/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...atch => 0005-Fix-build-on-Linux-6.3.patch} | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) rename package/dahdi-linux/{0005-drivers-dahdi-fix-build-with-clang-16.patch => 0005-Fix-build-on-Linux-6.3.patch} (75%) diff --git a/package/dahdi-linux/0005-drivers-dahdi-fix-build-with-clang-16.patch b/package/dahdi-linux/0005-Fix-build-on-Linux-6.3.patch similarity index 75% rename from package/dahdi-linux/0005-drivers-dahdi-fix-build-with-clang-16.patch rename to package/dahdi-linux/0005-Fix-build-on-Linux-6.3.patch index 535e1628c9b4..f2ac4d2dc3a4 100644 --- a/package/dahdi-linux/0005-drivers-dahdi-fix-build-with-clang-16.patch +++ b/package/dahdi-linux/0005-Fix-build-on-Linux-6.3.patch @@ -1,4 +1,4 @@ -From d51c10dae5a06709983b929fc6f9fb18eec41951 Mon Sep 17 00:00:00 2001 +From c4969d756eac041758856b99a1084158c06beb7e Mon Sep 17 00:00:00 2001 From: Brahmajit Das Date: Thu, 22 Jun 2023 15:52:18 +0000 Subject: [PATCH] drivers/dahdi: fix build with clang-16 @@ -31,15 +31,16 @@ Signed-off-by: Brahmajit Das Upstream: https://github.com/asterisk/dahdi-linux/pull/21 -Signed-off-by: Bernd Kuhls +[Bernd: updated patch for compatibility with kernel < 6.3] +Signed-off-by: Bernd Kuhls --- - drivers/dahdi/dahdi-sysfs.c | 8 ++++---- - drivers/dahdi/wctc4xxp/base.c | 2 +- - drivers/dahdi/xpp/xbus-sysfs.c | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) + drivers/dahdi/dahdi-sysfs.c | 12 ++++++++++-- + drivers/dahdi/wctc4xxp/base.c | 2 +- + drivers/dahdi/xpp/xbus-sysfs.c | 4 ++++ + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c -index ca29ddba..0c5bd982 100644 +index ca29ddba..38236929 100644 --- a/drivers/dahdi/dahdi-sysfs.c +++ b/drivers/dahdi/dahdi-sysfs.c @@ -47,7 +47,7 @@ static int span_match(struct device *dev, struct device_driver *driver) @@ -51,16 +52,19 @@ index ca29ddba..0c5bd982 100644 { return dev_get_drvdata(dev); } -@@ -68,7 +68,7 @@ static inline struct dahdi_span *dev_to_span(struct device *dev) +@@ -68,7 +68,11 @@ static inline struct dahdi_span *dev_to_span(struct device *dev) return err; \ } while (0) --static int span_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) + static int span_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#else +static int span_uevent(const struct device *dev, struct kobj_uevent_env *kenv) ++#endif { struct dahdi_span *span; -@@ -415,7 +415,7 @@ static struct { +@@ -415,7 +419,7 @@ static struct { unsigned int clean_chardev:1; } should_cleanup; @@ -69,12 +73,15 @@ index ca29ddba..0c5bd982 100644 { return container_of(dev, struct dahdi_device, dev); } -@@ -438,7 +438,7 @@ static inline struct dahdi_device *to_ddev(struct device *dev) +@@ -438,7 +442,11 @@ static inline struct dahdi_device *to_ddev(struct device *dev) return err; \ } while (0) --static int device_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) + static int device_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#else +static int device_uevent(const struct device *dev, struct kobj_uevent_env *kenv) ++#endif { struct dahdi_device *ddev; @@ -92,15 +99,18 @@ index ec6fc436..db70ea7e 100644 # ifdef HAVE_NET_DEVICE_OPS netdev->netdev_ops = &wctc4xxp_netdev_ops; diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c -index d8c11dc3..29ad3619 100644 +index d8c11dc3..11b3ed3e 100644 --- a/drivers/dahdi/xpp/xbus-sysfs.c +++ b/drivers/dahdi/xpp/xbus-sysfs.c -@@ -418,7 +418,7 @@ static int astribank_match(struct device *dev, struct device_driver *driver) +@@ -418,7 +418,11 @@ static int astribank_match(struct device *dev, struct device_driver *driver) return err; \ } while (0) --static int astribank_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) + static int astribank_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#else +static int astribank_uevent(const struct device *dev, struct kobj_uevent_env *kenv) ++#endif { xbus_t *xbus; extern char *initdir; From 0df456ea6e05306fb077e96064adf68f3863eeea Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 11:24:56 +0200 Subject: [PATCH 0940/2890] package/zlib-ng: bump version to 2.1.3 Removed all patches because they are included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...rd-for-vec_sumsu-to-prevent-undefine.patch | 27 ------ ...ix-version-in-zlib.pc-when-building-.patch | 53 ----------- ...-sys-auxv.h-exists-at-configure-time.patch | 90 ------------------- package/zlib-ng/zlib-ng.hash | 2 +- package/zlib-ng/zlib-ng.mk | 2 +- 5 files changed, 2 insertions(+), 172 deletions(-) delete mode 100644 package/zlib-ng/0001-Use-static-keyword-for-vec_sumsu-to-prevent-undefine.patch delete mode 100644 package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch delete mode 100644 package/zlib-ng/0003-zlib-ng-check-that-sys-auxv.h-exists-at-configure-time.patch diff --git a/package/zlib-ng/0001-Use-static-keyword-for-vec_sumsu-to-prevent-undefine.patch b/package/zlib-ng/0001-Use-static-keyword-for-vec_sumsu-to-prevent-undefine.patch deleted file mode 100644 index cc103215de3c..000000000000 --- a/package/zlib-ng/0001-Use-static-keyword-for-vec_sumsu-to-prevent-undefine.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 677f56825f7080403e18e57ffe8177f3df290f20 Mon Sep 17 00:00:00 2001 -From: Nathan Moinvaziri -Date: Sun, 23 Jan 2022 12:59:01 -0800 -Subject: [PATCH] Use static keyword for vec_sumsu to prevent undefined - reference error when g++ linking. - -Signed-off-by: Joel Stanley ---- - arch/power/adler32_power8.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/power/adler32_power8.c b/arch/power/adler32_power8.c -index 029aa3a84c57..fc4086322efc 100644 ---- a/arch/power/adler32_power8.c -+++ b/arch/power/adler32_power8.c -@@ -44,7 +44,7 @@ - #include "adler32_p.h" - - /* Vector across sum unsigned int (saturate). */ --inline vector unsigned int vec_sumsu(vector unsigned int __a, vector unsigned int __b) { -+static inline vector unsigned int vec_sumsu(vector unsigned int __a, vector unsigned int __b) { - __b = vec_sld(__a, __a, 8); - __b = vec_add(__b, __a); - __a = vec_sld(__b, __b, 4); --- -2.35.1 - diff --git a/package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch b/package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch deleted file mode 100644 index 749c45ddcad6..000000000000 --- a/package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9fcc446306f27eb253545540ce28403874b899fa Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 May 2022 23:25:21 +0200 -Subject: [PATCH] CMakeLists.txt: fix version in zlib.pc when building - statically - -When building statically (i.e. with BUILD_SHARED_LIBS=OFF), -ZLIB_FULL_VERSION is not set resulting in an empty version in zlib.pc -and the following build failure with transmission: - -checking for ZLIB... configure: error: Package requirements (zlib >= 1.2.3) were not met: - -Package dependency requirement 'zlib >= 1.2.3' could not be satisfied. -Package 'zlib' has version '', required version is '>= 1.2.3' - -Fixes: - - http://autobuild.buildroot.org/results/b3b882482f517726e5c780ba4c37818bd379df82 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zlib-ng/zlib-ng/pull/1278] ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a62a95e..6a26d59 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -150,8 +150,10 @@ if(ZLIB_COMPAT) - add_definitions(-DZLIB_COMPAT) - set(WITH_GZFILEOP ON) - set(SUFFIX "") -+ set(ZLIB_FULL_VERSION ${ZLIB_HEADER_VERSION}.zlib-ng) - else() - set(SUFFIX "-ng") -+ set(ZLIB_FULL_VERSION ${ZLIBNG_HEADER_VERSION}) - endif() - - if(WITH_GZFILEOP) -@@ -1068,10 +1070,8 @@ if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS) - set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) - - if(ZLIB_COMPAT) -- set(ZLIB_FULL_VERSION ${ZLIB_HEADER_VERSION}.zlib-ng) - set_target_properties(zlib PROPERTIES SOVERSION 1) - else() -- set(ZLIB_FULL_VERSION ${ZLIBNG_HEADER_VERSION}) - set_target_properties(zlib PROPERTIES SOVERSION 2) - endif() - --- -2.35.1 - diff --git a/package/zlib-ng/0003-zlib-ng-check-that-sys-auxv.h-exists-at-configure-time.patch b/package/zlib-ng/0003-zlib-ng-check-that-sys-auxv.h-exists-at-configure-time.patch deleted file mode 100644 index ba8297cda7b0..000000000000 --- a/package/zlib-ng/0003-zlib-ng-check-that-sys-auxv.h-exists-at-configure-time.patch +++ /dev/null @@ -1,90 +0,0 @@ -From e1baa6b439c06f3d0e6be3e381cc746ffb55aee1 Mon Sep 17 00:00:00 2001 -From: Mika Lindqvist -Date: Wed, 13 Apr 2022 01:22:29 +0300 -Subject: [PATCH] Check that sys/auxv.h exists at configure time and add - preprocessor define for it. * Protect including sys/auxv.h in all relevant - files with the new preprocessor define * Test for both existence of both - sys/auxv.h and getauxval() with both cmake and configure - -[Ben Hutchings: Backport to 2.0.6: - - Drop the s390 changes - - Change some filenames] - -Backported from: e1baa6b439c06f3d0e6be3e381cc746ffb55aee1 -Signed-off-by: Ben Hutchings ---- - CMakeLists.txt | 4 ++++ - arch/arm/armfeature.c | 2 +- - arch/power/power.c | 5 ++++- - configure | 13 +++++++++++++ - 4 files changed, 22 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0dd196130..e4e4b7332 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -338,6 +338,10 @@ endif() - # - # Check for standard/system includes - # -+check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) -+if(HAVE_SYS_AUXV_H) -+ add_definitions(-DHAVE_SYS_AUXV_H) -+endif() - check_include_file(sys/sdt.h HAVE_SYS_SDT_H) - if(HAVE_SYS_SDT_H) - add_definitions(-DHAVE_SYS_SDT_H) -diff --git a/arch/arm/arm_features.c b/arch/arm/arm_features.c -index 195c94992..f6b67687f 100644 ---- a/arch/arm/armfeature.c -+++ b/arch/arm/armfeature.c -@@ -1,6 +1,6 @@ - #include "../../zutil.h" - --#if defined(__linux__) -+#if defined(__linux__) && defined(HAVE_SYS_AUXV_H) - # include - # ifdef ARM_ASM_HWCAP - # include -diff --git a/arch/power/power_features.c b/arch/power/power_features.c -index 9186b40d8..65599d9a7 100644 ---- a/arch/power/power.c -+++ b/arch/power/power.c -@@ -1,9 +1,12 @@ - /* POWER feature check - * Copyright (C) 2020 Matheus Castanho , IBM -+ * Copyright (C) 2021-2022 Mika T. Lindqvist - * For conditions of distribution and use, see copyright notice in zlib.h - */ - --#include -+#ifdef HAVE_SYS_AUXV_H -+# include -+#endif - #include "../../zutil.h" - - Z_INTERNAL int power_cpu_has_arch_2_07; -diff --git a/configure b/configure -index aed1909cc..a357e1c8a 100755 ---- a/configure -+++ b/configure -@@ -776,6 +776,19 @@ else - echo "Checking for strerror... No." | tee -a configure.log - fi - -+# check for getauxval() for architecture feature detection at run-time -+cat > $test.c < -+int main() { return getauxval(0); } -+EOF -+if try $CC $CFLAGS -o $test $test.c $LDSHAREDLIBC; then -+ echo "Checking for getauxval() in sys/auxv.h... Yes." | tee -a configure.log -+ CFLAGS="${CFLAGS} -DHAVE_SYS_AUXV_H" -+ SFLAGS="${SFLAGS} -DHAVE_SYS_AUXV_H" -+else -+ echo "Checking for getauxval() in sys/auxv.h... No." | tee -a configure.log -+fi -+ - # We need to remove zconf.h from source directory if building outside of it - if [ "$SRCDIR" != "$BUILDDIR" ]; then - rm -f $SRCDIR/zconf${SUFFIX}.h diff --git a/package/zlib-ng/zlib-ng.hash b/package/zlib-ng/zlib-ng.hash index a799cfe253c4..a2fe98435c90 100644 --- a/package/zlib-ng/zlib-ng.hash +++ b/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6 zlib-ng-2.0.6.tar.gz +sha256 d20e55f89d71991c59f1c5ad1ef944815e5850526c0d9cd8e504eaed5b24491a zlib-ng-2.1.3.tar.gz sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index aa65d8437dbc..23f1bd215872 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLIB_NG_VERSION = 2.0.6 +ZLIB_NG_VERSION = 2.1.3 ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md From 88a2e0c473fe78ba571bf48fb4e9cc94c86a3df4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Jul 2023 18:49:57 +0200 Subject: [PATCH 0941/2890] {linux, linux-headers}: bump 5.15.x / 6.{1, 3, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 8 ++++---- package/linux-headers/Config.in.host | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 359adf3bee44..17bf808cdc00 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.4" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.4.2" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index a300d7e9f2d8..a4542b94b6ea 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,9 +1,9 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3 linux-6.4.tar.xz -sha256 e0a9ad8692b2191cbd33db371a780a3fe375de90123a307ecd874c0860cd46e3 linux-6.3.10.tar.xz -sha256 d8ca0e300f30b9ff70c6e1497c638a1dac1407f45d3655e9c62c6e45a08afe6b linux-6.1.36.tar.xz +sha256 a326ab224176c5b17c73c9ccad85f32e49b6e4e764861d57595727b7ef10062c linux-6.4.2.tar.xz +sha256 cb7fdefc207dd4e8ef947fccd687126425edce0138ca11191bc0590c678e6cd7 linux-6.3.12.tar.xz +sha256 f9a4f91b609f7d332a5f2be01ab86336fa00149fae6bdc19f16fa19f78802d43 linux-6.1.38.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 7aa5a0fd3520947e5599e811d28acdc30e36446c016c7dcee3793e6d1cbecfcf linux-5.15.119.tar.xz +sha256 6499089eae6b271063cb3e873ab7f4ba0543cfb21dcc9c54d9bcf5357db683f6 linux-5.15.120.tar.xz sha256 1e60296a135d272bb7ce645f6ae68fbd4ffd1972cb4b82c38c6faa1172481be3 linux-5.10.186.tar.xz sha256 dc5458462c6edbe3473fc6dee80fbe0841df7c177fe0546c2f131e5918f5351d linux-5.4.249.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e7175faf7071..1944d47e4eab 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -408,10 +408,10 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.288" if BR2_KERNEL_HEADERS_4_19 default "5.4.249" if BR2_KERNEL_HEADERS_5_4 default "5.10.186" if BR2_KERNEL_HEADERS_5_10 - default "5.15.119" if BR2_KERNEL_HEADERS_5_15 - default "6.1.36" if BR2_KERNEL_HEADERS_6_1 - default "6.3.10" if BR2_KERNEL_HEADERS_6_3 - default "6.4" if BR2_KERNEL_HEADERS_6_4 + default "5.15.120" if BR2_KERNEL_HEADERS_5_15 + default "6.1.38" if BR2_KERNEL_HEADERS_6_1 + default "6.3.12" if BR2_KERNEL_HEADERS_6_3 + default "6.4.2" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 025ce96406309d1dd4411ae253e5cc6a8cdb9aec Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 8 Jul 2023 13:14:31 +0200 Subject: [PATCH 0942/2890] package/emlog: fix build on Linux 6.4 Fixes: http://autobuild.buildroot.net/results/f6c/f6c52f58c3c016cee59d2dfe513c449d96dc3b09/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../emlog/0001-Fix-build-on-Linux-6.4.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/emlog/0001-Fix-build-on-Linux-6.4.patch diff --git a/package/emlog/0001-Fix-build-on-Linux-6.4.patch b/package/emlog/0001-Fix-build-on-Linux-6.4.patch new file mode 100644 index 000000000000..65440c1933c1 --- /dev/null +++ b/package/emlog/0001-Fix-build-on-Linux-6.4.patch @@ -0,0 +1,34 @@ +From 32ec7f7b4eb1466100d59aaea8855d770af54327 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 8 Jul 2023 13:10:24 +0200 +Subject: [PATCH] Fix build on Linux 6.4 + +Needed after upstream changes in kernel 6.4: +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/include/linux/device/class.h?id=1aaba11da9aa + +Upstream: https://github.com/nicupavel/emlog/pull/15 + +Signed-off-by: Bernd Kuhls +--- + emlog.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/emlog.c b/emlog.c +index 4462466..2ead738 100644 +--- a/emlog.c ++++ b/emlog.c +@@ -500,7 +500,11 @@ static int __init emlog_init(void) + + pr_info("version %s running, major is %u, MINOR is %u, max size %d K.\n", EMLOG_VERSION, (unsigned)MAJOR(emlog_dev_type), (unsigned)MINOR(emlog_dev_type), emlog_max_size); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) + emlog_class = class_create(THIS_MODULE, DEVICE_NAME); ++#else ++ emlog_class = class_create(DEVICE_NAME); ++#endif + if (emlog_class == NULL) { + pr_err("Can not class_create.\n"); + ret_val = -4; goto emlog_init_error; +-- +2.39.2 + From 9206caf13ec38841d93c7b8434fcc3668dffbc36 Mon Sep 17 00:00:00 2001 From: "friedtj@free.fr" Date: Sat, 8 Jul 2023 15:00:18 +0200 Subject: [PATCH 0943/2890] package/linuxptp: bump version to 4.0 The current linuxptp is missing multiple options added lately as described at https://www.mail-archive.com/linuxptp-devel@lists.sourceforge.net/msg04908.html and the upgrade to 4.0 removes the need for applying patches already included in the current release. Tested functional on a Raspberry Pi Compute Module 4 (raspberrypicm4io_64_defconfig). Signed-off-by: Jean-Michel Friedt Signed-off-by: Thomas Petazzoni --- ...g.h-drop-clock_nanosleep-replacement.patch | 49 ------------------- ...itional-assignment-for-KBUILD_OUTPUT.patch | 43 ---------------- package/linuxptp/linuxptp.hash | 6 +-- package/linuxptp/linuxptp.mk | 2 +- 4 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch delete mode 100644 package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch diff --git a/package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch b/package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch deleted file mode 100644 index 54ef963ae452..000000000000 --- a/package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 947bf03ec3d9eaa0bfc0269eed86b9364e94bc1a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 5 Aug 2018 15:25:53 +0200 -Subject: [PATCH] missing.h: drop clock_nanosleep() replacement - -Since uClibc-ng commits 68628fe7d463541bf3c33da6b214e63c0cc9feed -("librt: declare clock_nanosleep not only for NPTL") and -ddbb03e77ac1a48740688814b82f45c97ee81f37 ("librt: clock_nanosleep -could be even used without threads"), clock_nanosleep() is always -provided by uClibc, regardless of the thread implementation (none, -linuxthreads, nptl). These commits will be part of the upcoming 1.0.31 -release of uClibc-ng. - -Thanks to this, we can drop the replacement clock_nanosleep() -implementation added by linuxptp. Without this, linuxptp fails to -build with: - -missing.h:117:19: error: static declaration of 'clock_nanosleep' follows non-static declaration - static inline int clock_nanosleep(clockid_t clock_id, int flags, - ^~~~~~~~~~~~~~~ -In file included from clockadj.h:24:0, - from clockadj.c:24: - -Signed-off-by: Thomas Petazzoni ---- - missing.h | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/missing.h b/missing.h -index 2f7adb9..60f89a3 100644 ---- a/missing.h -+++ b/missing.h -@@ -129,13 +129,6 @@ enum { - - #define TFD_TIMER_ABSTIME (1 << 0) - --static inline int clock_nanosleep(clockid_t clock_id, int flags, -- const struct timespec *request, -- struct timespec *remain) --{ -- return syscall(__NR_clock_nanosleep, clock_id, flags, request, remain); --} -- - static inline int timerfd_create(int clockid, int flags) - { - return syscall(__NR_timerfd_create, clockid, flags); --- -2.14.4 - diff --git a/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch b/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch deleted file mode 100644 index 73cd34f7447c..000000000000 --- a/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Changqing Li -Date: Wed, 23 Nov 2022 08:23:46 +0800 -Subject: [Linuxptp-devel] [PATCH] makefile: use conditional assignment for KBUILD_OUTPUT - -Refer [1],from make 4.4, all variables that are marked as export will -also be passed to the shell started by the shell function. use "=" will -make KBUILD_OUTPUT always empty for shell function, use "?=" to make -"export KBUILD_OUTPUT" in enrironment can work. - -[snip of 4.4 NEWS] -* WARNING: Backward-incompatibility! - Previously makefile variables marked as export were not exported to commands - started by the $(shell ...) function. Now, all exported variables are - exported to $(shell ...). -[snip] - -[1] https://git.savannah.gnu.org/cgit/make.git/tree/NEWS?h=4.4&id=ed493f6c9116cc217b99c2cfa6a95f15803235a2#n74 - -Signed-off-by: Changqing Li - -[Retrieved from mailing list. The patch was not yet accepted and applied: -https://www.mail-archive.com/linuxptp-devel@lists.sourceforge.net/msg06151.html] -Signed-off-by: Heiko Thiery - ---- - makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/makefile b/makefile -index 9aed383..ba3fb38 100644 ---- a/makefile -+++ b/makefile -@@ -15,7 +15,7 @@ - # with this program; if not, write to the Free Software Foundation, Inc., - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - --KBUILD_OUTPUT = -+KBUILD_OUTPUT ?= - - DEBUG = - CC = $(CROSS_COMPILE)gcc --- -2.25.1 diff --git a/package/linuxptp/linuxptp.hash b/package/linuxptp/linuxptp.hash index a5479b0ebc01..edbfb4455344 100644 --- a/package/linuxptp/linuxptp.hash +++ b/package/linuxptp/linuxptp.hash @@ -1,9 +1,5 @@ -# From https://sourceforge.net/projects/linuxptp/files/v3.1.1/ -sha1 f905eabc6fd0f03c6a353f9c4ba188a3bd1b774c linuxptp-3.1.1.tgz -md5 3b79ab5e77c5b5cf06bc1c8350d405bb linuxptp-3.1.1.tgz - # Locally computed: -sha256 94d6855f9b7f2d8e9b0ca6d384e3fae6226ce6fc012dbad02608bdef3be1c0d9 linuxptp-3.1.1.tgz +sha256 d27d5ef296bb3d285e22e69f75ae023b4b42a2f4655130d6d390d8afcbc3d933 linuxptp-4.0.tgz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/linuxptp/linuxptp.mk b/package/linuxptp/linuxptp.mk index 048dd0b896fd..054442d56952 100644 --- a/package/linuxptp/linuxptp.mk +++ b/package/linuxptp/linuxptp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUXPTP_VERSION = 3.1.1 +LINUXPTP_VERSION = 4.0 LINUXPTP_SOURCE = linuxptp-$(LINUXPTP_VERSION).tgz LINUXPTP_SITE = http://downloads.sourceforge.net/linuxptp LINUXPTP_LICENSE = GPL-2.0+ From f12f54998a70cf30323b9eda9ea9cc95453d11d6 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 3 Jul 2023 22:20:20 +0200 Subject: [PATCH 0944/2890] package/rtl8192eu: bump to version 2023-06-23 on branch 5.11.2.1 Drop local patch that has been upstreamed. It now supports building with Linux version > 6.1 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...02-Fix-conflicting-get_ra-on-PowerPC.patch | 124 ------------------ package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 3 files changed, 2 insertions(+), 126 deletions(-) delete mode 100644 package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch diff --git a/package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch b/package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch deleted file mode 100644 index dbc4ddd2e819..000000000000 --- a/package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 4a7e9c3c02a759d818a68c5d23ad7623d8b82ee6 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 11 Mar 2023 19:26:32 +0100 -Subject: [PATCH] Fix conflicting get_ra() on PowerPC - -In PowerPc Linux only get_ra() exists[0] and conflicts with local get_ra() -that has a completely different purpose. So let's rename local get_ra() -to rtl_get_ra() to make it different from Linux's get_ra(). - -[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/powerpc/include/asm/disassemble.h?h=v6.1-rc7#n49 - -Signed-off-by: Giulio Benetti ---- - core/rtw_odm.c | 6 +++--- - core/rtw_recv.c | 6 +++--- - hal/hal_com.c | 2 +- - include/wifi.h | 2 +- - os_dep/linux/ioctl_cfg80211.c | 2 +- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/core/rtw_odm.c b/core/rtw_odm.c -index 750598c..18e0222 100644 ---- a/core/rtw_odm.c -+++ b/core/rtw_odm.c -@@ -258,7 +258,7 @@ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys) - RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n" - , *phys & 0xf - , MAC_ARG(get_ta(wlanhdr)) -- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" -+ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" - , HDATA_RATE(attrib->data_rate) - , phys_t0->band, phys_t0->channel, phys_t0->rxsc - ); -@@ -368,7 +368,7 @@ type1_end: - RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, rf_mode:%u, l_rxsc:%u, ht_rxsc:%u) => %u,%u\n" - , *phys & 0xf - , MAC_ARG(get_ta(wlanhdr)) -- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" -+ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" - , HDATA_RATE(attrib->data_rate) - , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc - , pkt_cch, pkt_bw -@@ -386,7 +386,7 @@ type1_end: - RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n" - , *phys & 0xf - , MAC_ARG(get_ta(wlanhdr)) -- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" -+ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" - , HDATA_RATE(attrib->data_rate) - , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc - ); -diff --git a/core/rtw_recv.c b/core/rtw_recv.c -index 63ecbc6..d52a7bb 100755 ---- a/core/rtw_recv.c -+++ b/core/rtw_recv.c -@@ -4245,7 +4245,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe) - - if (check_fwstate(mlmepriv, WIFI_MONITOR_STATE) - #ifdef RTW_SIMPLE_CONFIG -- || (check_fwstate(mlmepriv, WIFI_AP_STATE) && padapter->rtw_simple_config == _TRUE && IS_MCAST(get_ra(ptr))) -+ || (check_fwstate(mlmepriv, WIFI_AP_STATE) && padapter->rtw_simple_config == _TRUE && IS_MCAST(rtl_get_ra(ptr))) - #endif - ) { - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)) -@@ -4598,7 +4598,7 @@ void rx_query_phy_status( - wlanhdr = get_recvframe_data(precvframe); - - ta = get_ta(wlanhdr); -- ra = get_ra(wlanhdr); -+ ra = rtl_get_ra(wlanhdr); - is_ra_bmc = IS_MCAST(ra); - - if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) { -@@ -4746,7 +4746,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) - { - s32 ret = _SUCCESS; - u8 *pbuf = precvframe->u.hdr.rx_data; -- u8 *ra = get_ra(pbuf); -+ u8 *ra = rtl_get_ra(pbuf); - u8 ra_is_bmc = IS_MCAST(ra); - bool phy_queried = 0; - _adapter *primary_padapter = precvframe->u.hdr.adapter; -diff --git a/hal/hal_com.c b/hal/hal_com.c -index 96c7ade..fe5b156 100755 ---- a/hal/hal_com.c -+++ b/hal/hal_com.c -@@ -13590,7 +13590,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe) - - /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/ - if (psta) { -- if (IS_MCAST(get_ra(get_recvframe_data(prframe)))) -+ if (IS_MCAST(rtl_get_ra(get_recvframe_data(prframe)))) - psta_dframe_info = &psta->sta_dframe_info_bmc; - else - psta_dframe_info = &psta->sta_dframe_info; -diff --git a/include/wifi.h b/include/wifi.h -index 322cfba..dd289f2 100644 ---- a/include/wifi.h -+++ b/include/wifi.h -@@ -459,7 +459,7 @@ __inline static int IS_MCAST(const u8 *da) - return _FALSE; - } - --__inline static unsigned char *get_ra(unsigned char *pframe) -+__inline static unsigned char *rtl_get_ra(unsigned char *pframe) - { - unsigned char *ra; - ra = GetAddr1Ptr(pframe); -diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c -index 942971f..f36c77a 100755 ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -7076,7 +7076,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra - indicate: - #endif - #if defined(RTW_DEDICATED_P2P_DEVICE) -- if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), get_ra(frame), &wdev)) -+ if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), rtl_get_ra(frame), &wdev)) - if (0) - RTW_INFO("redirect to pd_wdev:%p\n", wdev); - #endif --- -2.34.1 - diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index 2d6498f19d4f..852868967071 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 72d1d97c6d2038885e5666f3271609b4dcbe45633c19a5606dc59745ff8ab543 rtl8192eu-865656c3a1d1aee8c4ba459ce7608756d17c712f.tar.gz +sha256 665a8f857b3881554edd6d5e5e6c8f058b8ecfecf921817993e861d48e214d36 rtl8192eu-ac8517206e14f70babbeed68e136ee23c85cba3d.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index da6fe42e996a..9ae29d994003 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = 865656c3a1d1aee8c4ba459ce7608756d17c712f +RTL8192EU_VERSION = ac8517206e14f70babbeed68e136ee23c85cba3d RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 From ff2c69a9009341f9bd9e3a99cc984d36cfa395a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacy=20Gaw=C4=99dzki?= Date: Mon, 3 Jul 2023 23:15:59 +0200 Subject: [PATCH 0945/2890] package/iproute2: add optional dependency on libbpf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ignacy Gawędzki Signed-off-by: Thomas Petazzoni --- package/iproute2/iproute2.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 15af076db9c9..49a65516d665 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -38,8 +38,16 @@ ifeq ($(BR2_PACKAGE_BERKELEYDB_COMPAT185),y) IPROUTE2_DEPENDENCIES += berkeleydb endif +ifeq ($(BR2_PACKAGE_LIBBPF),y) +IPROUTE2_DEPENDENCIES += libbpf +IPROUTE2_CONFIGURE_OPTS += --libbpf_force on +else +IPROUTE2_CONFIGURE_OPTS += --libbpf_force off +endif + define IPROUTE2_CONFIGURE_CMDS - cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure + cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure \ + $(IPROUTE2_CONFIGURE_OPTS) $(IPROUTE2_DISABLE_IPTABLES) endef From b5cae6ed9973db0ca84d67ab0fd3763e554550f6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 4 Jul 2023 08:19:44 +0200 Subject: [PATCH 0946/2890] package/bluez5_utils: fix cross build Fix build error introduced by bumping bluez5_utils to 5.68 with buildroot commit 7cac499ec46655a491e59b5bbc2a83a2137099bd due to upstream commit https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/configure.ac?id=1106b28be85ac9586d1758839226e163e9030ee2 Fixes: http://autobuild.buildroot.net/results/564/564952e0f9c7f69ef266d7df455ca033fb52d9f7/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-configure-Check-ell-path.patch | 35 +++++++++++++++++++ package/bluez5_utils/bluez5_utils.mk | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 package/bluez5_utils/0001-configure-Check-ell-path.patch diff --git a/package/bluez5_utils/0001-configure-Check-ell-path.patch b/package/bluez5_utils/0001-configure-Check-ell-path.patch new file mode 100644 index 000000000000..3e5f7c651685 --- /dev/null +++ b/package/bluez5_utils/0001-configure-Check-ell-path.patch @@ -0,0 +1,35 @@ +From 124187ef9abed60a7c40f751153e9c4516cd1f91 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sat, 1 Jul 2023 01:31:20 +0000 +Subject: [PATCH] configure: Check ell path + +Use of AC_CHECK_FILE prevents cross compilation. +Instead use test to support cross compiling. + +Signed-off-by: Rudi Heitbaum + +Upstream: https://github.com/bluez/bluez/pull/546 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index eff297960..bc7edfcd3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -298,9 +298,10 @@ if (test "${enable_external_ell}" = "yes"); then + AC_SUBST(ELL_LIBS) + fi + if (test "${enable_external_ell}" != "yes"); then +- AC_CHECK_FILE(${srcdir}/ell/ell.h, dummy=yes, +- AC_CHECK_FILE(${srcdir}/../ell/ell/ell.h, dummy=yes, +- AC_MSG_ERROR(ELL source is required or use --enable-external-ell))) ++ if (test ! -f ${srcdir}/ell/ell.h) && ++ (test ! -f ${srcdir}/../ell/ell/ell.h); then ++ AC_MSG_ERROR(ELL source is required or use --enable-external-ell) ++ fi + fi + AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes" || + (test "${enable_btpclient}" != "yes" && diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 1e87041610d2..82800c043001 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -9,6 +9,8 @@ BLUEZ5_UTILS_VERSION = 5.68 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES +# 0001-configure-Check-ell-path.patch +BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez From 568dd29c2f9c3c55355469897bf29236fb2f364b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Jul 2023 21:20:32 +0200 Subject: [PATCH 0947/2890] package/alsa-lib: Fix symver build error on non-ELF platforms Fixes: http://autobuild.buildroot.net/results/1e9/1e965d83d75615f35308440c5db044314a349357/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ver-build-error-on-non-ELF-platforms.patch | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 package/alsa-lib/0002-Fix-symver-build-error-on-non-ELF-platforms.patch diff --git a/package/alsa-lib/0002-Fix-symver-build-error-on-non-ELF-platforms.patch b/package/alsa-lib/0002-Fix-symver-build-error-on-non-ELF-platforms.patch new file mode 100644 index 000000000000..499bbb2ae44a --- /dev/null +++ b/package/alsa-lib/0002-Fix-symver-build-error-on-non-ELF-platforms.patch @@ -0,0 +1,84 @@ +From 317aafb133ed797c4cd62599565a77ecc595daea Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Thu, 29 Jun 2023 07:57:21 +0200 +Subject: [PATCH] Fix symver build error on non-ELF platforms + +The following error is observed on Microblaze [1] build: + + error: symver is only supported on ELF platforms + +due to using __attribute__((symver)) on non-ELF platform. + +[1] http://autobuild.buildroot.net/results/1e9/1e965d83d75615f35308440c5db044314a349357/build-end.log + +ac_check_attribute_symver.m4 was downloaded from +https://github.com/smuellerDD/libkcapi/blob/master/m4/ac_check_attribute_symver.m4 + +Upstream: https://github.com/alsa-project/alsa-lib/pull/334 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 1 + + include/alsa-symbols.h | 2 +- + m4/ac_check_attribute_symver.m4 | 24 ++++++++++++++++++++++++ + 3 files changed, 26 insertions(+), 1 deletion(-) + create mode 100644 m4/ac_check_attribute_symver.m4 + +diff --git a/configure.ac b/configure.ac +index 0588eec3..71ec0b15 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,6 +46,7 @@ dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST + AC_C_INLINE + AC_HEADER_TIME ++AC_CHECK_ATTRIBUTE_SYMVER + + dnl Checks for library functions. + AC_PROG_GCC_TRADITIONAL +diff --git a/include/alsa-symbols.h b/include/alsa-symbols.h +index f8c49103..521e5956 100644 +--- a/include/alsa-symbols.h ++++ b/include/alsa-symbols.h +@@ -29,7 +29,7 @@ + #define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post + #define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name) + +-#if __GNUC__ > 10 ++#if HAVE_ATTRIBUTE_SYMVER && __GNUC__ > 10 + #define symbol_version(real, name, version) \ + extern __typeof (real) real __attribute__((symver (#name "@" #version))) + #define default_symbol_version(real, name, version) \ +diff --git a/m4/ac_check_attribute_symver.m4 b/m4/ac_check_attribute_symver.m4 +new file mode 100644 +index 00000000..b484c5eb +--- /dev/null ++++ b/m4/ac_check_attribute_symver.m4 +@@ -0,0 +1,24 @@ ++dnl Check compiler support for symver function attribute ++AC_DEFUN([AC_CHECK_ATTRIBUTE_SYMVER], [ ++ saved_CFLAGS=$CFLAGS ++ CFLAGS="-O0 -Werror" ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[ ++ void _test_attribute_symver(void); ++ __attribute__((__symver__("sym@VER_1.2.3"))) void _test_attribute_symver(void) {} ++ ]], ++ [[ ++ _test_attribute_symver() ++ ]] ++ )], ++ [ ++ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 if __attribute__((symver)) is supported]) ++ ], ++ [ ++ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 0, [Define to 0 if __attribute__((symver)) is not supported]) ++ ] ++ ) ++ CFLAGS=$saved_CFLAGS ++]) ++ +-- +2.39.2 + From ea7caf9c47fb271d24b8bec6df08d6b60596759a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 10 Jul 2023 19:41:41 +0200 Subject: [PATCH 0948/2890] .checkpackageignore: update after patch removals Several recent commits removed patches without updating .checkpatchignore, let's fix that. Fixes: .checkpackageignore:882: ignored file package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch is missing .checkpackageignore:883: ignored file package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch is missing .checkpackageignore:949: ignored file package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch is missing .checkpackageignore:1357: ignored file package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch is missing .checkpackageignore:1685: ignored file package/zlib-ng/0001-Use-static-keyword-for-vec_sumsu-to-prevent-undefine.patch is missing .checkpackageignore:1686: ignored file package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch is missing .checkpackageignore:1687: ignored file package/zlib-ng/0003-zlib-ng-check-that-sys-auxv.h-exists-at-configure-time.patch is missing Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 7f45b6a808cf..b583c3db6aeb 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -879,8 +879,6 @@ package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch Upstream package/linux-tools/S10hyperv Variables package/linux-zigbee/0001-test-serial-Remove-test-serial.patch Upstream package/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch Upstream -package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch Upstream -package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch Upstream package/linuxptp/S65ptp4l Indent Shellcheck package/linuxptp/S66phc2sys Indent Shellcheck package/lirc-tools/0001-plugins-devinput.c-fix-build-with-musl-1.2.0.patch Upstream @@ -946,7 +944,6 @@ package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch Upst package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch Upstream package/makedumpfile/0002-Handle-__mips64.patch Upstream package/mariadb/0001-add-extra-check-for-librt.patch Upstream -package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch Upstream package/mariadb/S97mysqld Indent Shellcheck Variables package/matchbox-keyboard/mb-applet-kbd-wrapper.sh Shellcheck TrailingSpace package/matchbox-lib/0001-index-is-legacy.patch Upstream @@ -1354,7 +1351,6 @@ package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.p package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch Upstream package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch Upstream package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch Upstream -package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch Upstream package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch Upstream package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch Upstream package/rtmpdump/0001-include-limits.h.patch Upstream @@ -1682,9 +1678,6 @@ package/zip/0005-unix-configure-remove-GID-UID-size-check.patch Upstream package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch Upstream package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch Upstream package/zip/0008-fix-musl-static-build.patch Upstream -package/zlib-ng/0001-Use-static-keyword-for-vec_sumsu-to-prevent-undefine.patch Upstream -package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch Upstream -package/zlib-ng/0003-zlib-ng-check-that-sys-auxv.h-exists-at-configure-time.patch Upstream package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch Upstream package/znc/0001-LibreSSL-3.5-opaqued-structures.patch Upstream package/znc/0002-Fix-build-with-libressl.patch Upstream From c7d1e92b1cbbb67cebea8e43d087fcc1aab657e7 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Thu, 29 Jun 2023 15:51:24 +0200 Subject: [PATCH 0949/2890] package/libcamera-apps: bump to version 1.2.0 Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- package/libcamera-apps/libcamera-apps.hash | 2 +- package/libcamera-apps/libcamera-apps.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash index 20a06aa8fe09..97fcef7ddfaa 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a19f3960b97ec1c0d42df8af972868ff0d4c48be6096e7ac02dbaaa4c7c75636 libcamera-apps-1.1.2.tar.gz +sha256 49ace5382a0a9f8b05d20077fc0900b801fff83dae6ca9e3caa94dae16dbef27 libcamera-apps-1.2.0.tar.gz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 592773eec85c..022e6055b50d 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 1.1.2 +LIBCAMERA_APPS_VERSION = 1.2.0 LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION)) LIBCAMERA_APPS_LICENSE = BSD-2-Clause LIBCAMERA_APPS_LICENSE_FILES = license.txt From 4c1b141c2900fa8085b1bc148ad54c2e7ff85a96 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 29 Jun 2023 18:59:19 +0200 Subject: [PATCH 0950/2890] package/kodi: bump version to 20.2-Nexus Removed patch which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-jsonschemabuilder.mk | 2 +- .../kodi-texturepacker/kodi-texturepacker.mk | 2 +- ...fer-Remove-forward-declararion-of-Fl.patch | 42 ------------------- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 5 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 72a2f05bd665..569bde8cd24e 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 20.1-Nexus +KODI_JSONSCHEMABUILDER_VERSION = 20.2-Nexus KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index cb6b04d069cd..44eba85d75fc 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 20.1-Nexus +KODI_TEXTUREPACKER_VERSION = 20.2-Nexus KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch b/package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch deleted file mode 100644 index 87df0e4c9aa1..000000000000 --- a/package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Markus=20H=C3=A4rer?= -Date: Sun, 28 May 2023 00:49:40 +0200 -Subject: [PATCH] SavestateFlatBuffer: Remove forward declararion of - FlatBufferBuilder - -This caused a compiler error with recent faltbuffers because the type changed: - -In file included from xbmc/cores/RetroPlayer/savestates/SavestateDatabase.cpp:12: -xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h:19:7: error: definition of type 'FlatBufferBuilder' conflicts with type alias of the same name -class FlatBufferBuilder; - ^ -/usr/include/flatbuffers/flatbuffer_builder.h:1414:7: note: 'FlatBufferBuilder' declared here -using FlatBufferBuilder = FlatBufferBuilderImpl; - ^ -1 error generated. - -(cherry picked from commit 351184d7e4e3edc447d04a297769eb41a477ba68) - -Upstream: https://github.com/xbmc/xbmc/commit/07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c - -Signed-off-by: Bernd Kuhls ---- - xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h b/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h -index cb93e6bbc2e12..fa42a9bad7034 100644 ---- a/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h -+++ b/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h -@@ -14,11 +14,6 @@ - - #include - --namespace flatbuffers --{ --class FlatBufferBuilder; --} -- - namespace KODI - { - namespace RETRO diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index ea9a588aebc2..37fbf0c004e2 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 cd4158b2bc2d9593ad2f5c1cd2494957ab726b13d8379bbfb09d7d36df7b7d7e kodi-20.1-Nexus.tar.gz +sha256 4e81abf81172812bc8891f69a7a80a2b846298cecaae7b5009725e28a3040c23 kodi-20.2-Nexus.tar.gz sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 70ed27055565..7cbc1df40a52 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 20.1 +KODI_VERSION_MAJOR = 20.2 KODI_VERSION_NAME = Nexus KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) From 506f018b3a8709190f79f19c8d7824b3cfa18191 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 09:04:30 +0200 Subject: [PATCH 0951/2890] package/libasplib: remove package Added in 2015 to be used by Kodi ADSP addons these efforts have stopped: https://forum.kodi.tv/showthread.php?tid=252871&pid=3053658#pid3053658 so this package is no longer needed. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - Config.in.legacy | 6 +++ DEVELOPERS | 1 - package/Config.in | 1 - ...asplib_CPUTimer.h-Fix-time.h-include.patch | 39 ------------------- package/libasplib/Config.in | 11 ------ package/libasplib/libasplib.hash | 3 -- package/libasplib/libasplib.mk | 21 ---------- 8 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 package/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch delete mode 100644 package/libasplib/Config.in delete mode 100644 package/libasplib/libasplib.hash delete mode 100644 package/libasplib/libasplib.mk diff --git a/.checkpackageignore b/.checkpackageignore index b583c3db6aeb..3d8924c4e887 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -687,7 +687,6 @@ package/libabseil-cpp/0001-force-position-independent-code.patch Upstream package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch Upstream package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch Upstream package/libart/0001-art-config-cross.patch Sob Upstream -package/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch Upstream package/libatasmart/0001-strpool-cross-flags.patch Upstream package/libavl/0001-fix-makefile.patch Upstream package/libb64/0001-Integer-overflows.patch Upstream diff --git a/Config.in.legacy b/Config.in.legacy index d3a67aba830d..7184d0a8b9c3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.08" +config BR2_PACKAGE_LIBASPLIB + bool "libasplib removed" + select BR2_LEGACY + help + libasplib is no longer needed. + config BR2_BINUTILS_VERSION_2_37_X bool "binutils 2.37.x has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 188c579010a5..e716642c6b66 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -357,7 +357,6 @@ F: package/kodi* F: package/lame/ F: package/leafnode2/ F: package/libaacs/ -F: package/libasplib/ F: package/libass/ F: package/libbdplus/ F: package/libbluray/ diff --git a/package/Config.in b/package/Config.in index bff090a66163..9cdbd677ff6a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1405,7 +1405,6 @@ menu "Audio/Sound" source "package/caps/Config.in" source "package/fdk-aac/Config.in" source "package/libao/Config.in" - source "package/libasplib/Config.in" source "package/libbroadvoice/Config.in" source "package/libcdaudio/Config.in" source "package/libcddb/Config.in" diff --git a/package/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch b/package/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch deleted file mode 100644 index e0d0beccff05..000000000000 --- a/package/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7291289ba0c052e45e2a0330642318798d6a4caf Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 27 Jan 2017 16:02:27 +0100 -Subject: [PATCH] asplib_CPUTimer.h: Fix time.h include - -According to https://linux.die.net/man/3/clock_gettime time.h needs to -be included instead of sys/time.h. - -This patch fixes a build error found by buildroot autobuilders: - -http://autobuild.buildroot.net/results/cc0/cc0b928ee24a526b7c82fd3f391e2be024a14578// - -/home/peko/autobuild/instance-1/output/build/libasplib-be7fac89218a84b75f7598e3d76625ece99296f2/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.cpp: In member function 'void asplib::CCPUTimer::start_Timer()': -/home/peko/autobuild/instance-1/output/build/libasplib-be7fac89218a84b75f7598e3d76625ece99296f2/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.cpp:69:19: error: 'CLOCK_REALTIME' was not declared in this scope - clock_gettime(CLOCK_REALTIME, &m_startTime); - -Patch sent upstream: https://github.com/AchimTuran/asplib/pull/34 - -Signed-off-by: Bernd Kuhls ---- - asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h b/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h -index a61ff49..a9676e0 100644 ---- a/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h -+++ b/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h -@@ -29,7 +29,7 @@ - #include - #include - #elif defined(TARGET_LINUX) -- #include -+ #include - #endif - - namespace asplib --- -2.11.0 - diff --git a/package/libasplib/Config.in b/package/libasplib/Config.in deleted file mode 100644 index 89d5448473e7..000000000000 --- a/package/libasplib/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBASPLIB - bool "libasplib" - depends on BR2_INSTALL_LIBSTDCPP - help - asplib (Achim's Signal Processing LIBrary), is a small and - lightweight C++ library for digital signal processing. - - https://github.com/AchimTuran/asplib - -comment "asplib needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/libasplib/libasplib.hash b/package/libasplib/libasplib.hash deleted file mode 100644 index 251a50ee457a..000000000000 --- a/package/libasplib/libasplib.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 68e117348fa17592dde7672477e927119a0e477103ced1d3a57d92e30880a147 libasplib-be7fac89218a84b75f7598e3d76625ece99296f2.tar.gz -sha256 12ac5047f2af0522f06798b1589ffc4599bc29c91f954d7874e0320634e777c0 LICENSE diff --git a/package/libasplib/libasplib.mk b/package/libasplib/libasplib.mk deleted file mode 100644 index 5da85abe0c6d..000000000000 --- a/package/libasplib/libasplib.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libasplib -# -################################################################################ - -LIBASPLIB_VERSION = be7fac89218a84b75f7598e3d76625ece99296f2 -LIBASPLIB_SITE = $(call github,AchimTuran,asplib,$(LIBASPLIB_VERSION)) -LIBASPLIB_LICENSE = GPL-3.0+ -LIBASPLIB_LICENSE_FILES = LICENSE -LIBASPLIB_INSTALL_STAGING = YES - -LIBASPLIB_CONF_OPTS = \ - -DASPLIB_MODULES_TO_BUILD=some \ - -DBUILD_BIQUAD=ON \ - -DBUILD_IIR=ON \ - -DBUILD_LOGGER=ON \ - -DBUILD_SIGNALS=ON \ - -DBUILD_TIMER=ON - -$(eval $(cmake-package)) From 7d271346e560dd08faf7c4e51c4b46517d5f2638 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 13:22:46 +0200 Subject: [PATCH 0952/2890] DEVELOPERS: add Bernd Kuhls to various packages Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e716642c6b66..2a5aad2be390 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -329,11 +329,13 @@ F: package/dht/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ +F: package/ethtool/ F: package/eudev/ F: package/exim/ F: package/fetchmail/ F: package/ffmpeg/ F: package/flac/ +F: package/flatbuffers/ F: package/freeswitch/ F: package/freeswitch-mod-bcg729/ F: package/freetype/ @@ -355,12 +357,14 @@ F: package/intel-microcode/ F: package/jsoncpp/ F: package/kodi* F: package/lame/ +F: package/lcms2/ F: package/leafnode2/ F: package/libaacs/ F: package/libass/ F: package/libbdplus/ F: package/libbluray/ F: package/libbroadvoice/ +F: package/libcap/ F: package/libcdio/ F: package/libcec/ F: package/libcodec2/ @@ -372,6 +376,7 @@ F: package/libdvdcss/ F: package/libdvdnav/ F: package/libdvdread/ F: package/libebur128/ +F: package/libfribidi/ F: package/libfreeglut/ F: package/libg7221/ F: package/libglew/ @@ -400,16 +405,23 @@ F: package/libudfread/ F: package/libunibreak/ F: package/liburiparser/ F: package/libutp/ +F: package/libuv/ F: package/libva/ F: package/libva-intel-driver/ F: package/libva-utils/ F: package/libvorbis/ F: package/libvpx/ F: package/libyuv/ +F: package/linux-firmware/ +F: package/mc/ F: package/mesa3d/ F: package/minidlna/ F: package/mjpg-streamer/ +F: package/mpg123/ +F: package/ntp/ F: package/nut/ +F: package/opus/ +F: package/pciutils/ F: package/perl-crypt-openssl-guess/ F: package/perl-crypt-openssl-random/ F: package/perl-crypt-openssl-rsa/ @@ -438,6 +450,8 @@ F: package/php/ F: package/pixman/ F: package/pngquant/ F: package/pound/ +F: package/pppd/ +F: package/privoxy/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ @@ -452,8 +466,10 @@ F: package/python-pylru/ F: package/python-requests-oauthlib/ F: package/python-slob/ F: package/rsync/ +F: package/rrdtool/ F: package/rtmpdump/ F: package/samba4/ +F: package/sofia-sip/ F: package/softether/ F: package/spandsp/ F: package/sqlite/ @@ -470,6 +486,9 @@ F: package/vdr-plugin-vnsiserver/ F: package/vlc/ F: package/vnstat/ F: package/waylandpp/ +F: package/wget/ +F: package/wireless-regdb/ +F: package/wireless_tools/ F: package/x264/ F: package/x265/ F: package/xmrig/ From 2b6ea18e47c88b899ac45d8e60d3a7bc2f983d66 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 13:22:47 +0200 Subject: [PATCH 0953/2890] DEVELOPERS: remove Bernd Kuhls from various packages Remove packages which are no longer runtime-tested here. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 2a5aad2be390..086e0478eb14 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -321,8 +321,6 @@ F: package/apr-util/ F: package/bcg729/ F: package/bento4/ F: package/bitcoin/ -F: package/bluez-tools/ -F: package/boinc/ F: package/clamav/ F: package/dav1d/ F: package/dht/ @@ -343,13 +341,10 @@ F: package/fstrcmp/ F: package/ghostscript/ F: package/giflib/ F: package/gkrellm/ -F: package/gli/ -F: package/glmark2/ F: package/gpsd/ F: package/gptfdisk/ F: package/hdparm/ F: package/hddtemp/ -F: package/inih/ F: package/intel-gmmlib/ F: package/intel-mediadriver/ F: package/intel-mediasdk/ @@ -400,7 +395,6 @@ F: package/libsidplay2/ F: package/libsilk/ F: package/libsndfile/ F: package/libsoundtouch/ -F: package/libsquish/ F: package/libudfread/ F: package/libunibreak/ F: package/liburiparser/ @@ -449,7 +443,6 @@ F: package/perl-www-robotrules/ F: package/php/ F: package/pixman/ F: package/pngquant/ -F: package/pound/ F: package/pppd/ F: package/privoxy/ F: package/pure-ftpd/ @@ -470,7 +463,6 @@ F: package/rrdtool/ F: package/rtmpdump/ F: package/samba4/ F: package/sofia-sip/ -F: package/softether/ F: package/spandsp/ F: package/sqlite/ F: package/stellarium/ @@ -480,12 +472,8 @@ F: package/tor/ F: package/transmission/ F: package/tvheadend/ F: package/unixodbc/ -F: package/utf8proc/ -F: package/vdr/ -F: package/vdr-plugin-vnsiserver/ F: package/vlc/ F: package/vnstat/ -F: package/waylandpp/ F: package/wget/ F: package/wireless-regdb/ F: package/wireless_tools/ From 3435d52bab9c04d8ee214f3958be3bccd6ec83d1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 26 Jun 2023 22:05:50 +0200 Subject: [PATCH 0954/2890] support/testing/tests/package/test_dos2unix.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../testing/tests/package/test_dos2unix.py | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 support/testing/tests/package/test_dos2unix.py diff --git a/DEVELOPERS b/DEVELOPERS index 086e0478eb14..c1819954ae8b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1729,6 +1729,7 @@ F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ +F: support/testing/tests/package/test_dos2unix.py F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py diff --git a/support/testing/tests/package/test_dos2unix.py b/support/testing/tests/package/test_dos2unix.py new file mode 100644 index 000000000000..af5850ae3e96 --- /dev/null +++ b/support/testing/tests/package/test_dos2unix.py @@ -0,0 +1,45 @@ +import os + +import infra.basetest + + +class TestDos2Unix(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_DOS2UNIX=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can run. This test also checks that we're + # using the real "dos2unix" rather than the applet provided in + # BusyBox, since the "--version" option is recognized by the + # real dos2unix and return an error in BusyBox. + self.assertRunOk("dos2unix --version") + + # Create a text file with UNIX new-lines + self.assertRunOk("echo -e 'Hello\\nBuildroot' > original.txt") + + # Convert the original UNIX file to DOS + self.assertRunOk("unix2dos -n original.txt dos.txt") + + # DOS file is expected to be different than the UNIX file + _, exit_code = self.emulator.run("cmp original.txt dos.txt") + self.assertNotEqual(exit_code, 0) + + # The "cat -A" command should print '^M$' for CR-LF + self.assertRunOk("cat -A dos.txt | grep -Fq '^M$'") + + # Convert back DOS file to UNIX + self.assertRunOk("dos2unix -n dos.txt unix.txt") + + # "unix.txt" should be identical to "original.txt" + self.assertRunOk("cmp original.txt unix.txt") From 1a4e7da7e78ceaa89e93a5a93cb9631e1db7ee62 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Jun 2023 23:49:19 +0200 Subject: [PATCH 0955/2890] package/kodi-pvr-zattoo: bump version to 20.3.10-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index 1af86d4de052..9939c6f73b06 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c75ba4710d7e85cf516005ee3eca6d677e2fc018abaf490c881bc6552eb32929 kodi-pvr-zattoo-20.3.7-Nexus.tar.gz +sha256 68aa0a3af4f10396c866b0da225928033d0bbf980b8884c944dd1829e013435d kodi-pvr-zattoo-20.3.10-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index fa5e116fa0ff..53153f8f5939 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 20.3.7-Nexus +KODI_PVR_ZATTOO_VERSION = 20.3.10-Nexus KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md From 36c29522ae6840eb8815a4e0c037f4cd17b1f126 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Jun 2023 14:32:14 +0200 Subject: [PATCH 0956/2890] package/gkrellm: link with -latomic if needed Fixes: http://autobuild.buildroot.net/results/5df/5dffba341cfe5e4d41b3c88e58d92b0747318c07/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/gkrellm/gkrellm.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/gkrellm/gkrellm.mk b/package/gkrellm/gkrellm.mk index 2a687226630f..27a87be19051 100644 --- a/package/gkrellm/gkrellm.mk +++ b/package/gkrellm/gkrellm.mk @@ -12,7 +12,13 @@ GKRELLM_LICENSE_FILES = COPYING COPYRIGHT GKRELLM_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) GKRELLM_BUILD_OPTS = \ STRIP="" \ - SYS_LIBS=$(TARGET_NLS_LIBS) + SYS_LIBS="$(GKRELLM_SYS_LIBS)" + +GKRELLM_SYS_LIBS = $(TARGET_NLS_LIBS) + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +GKRELLM_SYS_LIBS += -latomic +endif ifeq ($(BR2_PACKAGE_LM_SENSORS),y) GKRELLM_DEPENDENCIES += lm-sensors From e70fefa3b89d445d2695109c02e7b65c6b3062c1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Jun 2023 20:31:04 +0200 Subject: [PATCH 0957/2890] package/pkg-meson.mk: disable staticpic on Coldfire Fixes build error in the upcoming libdisplay-info package: "Tried to convert PC relative branch to absolute jump" as described here: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101971#c11 Since this issue not only occurs with this package, see https://git.busybox.net/buildroot/commit/?id=2a48a6ee9d6b81c804182ff0ad6e0f7c850f6839 we add the configure option to pkg-meson.mk. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/pkg-meson.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 4aa6e44afa1e..65cabf23baed 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -156,6 +156,7 @@ define $(2)_CONFIGURE_CMDS --buildtype=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) \ --cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \ -Db_pie=false \ + -Db_staticpic=$(if $(BR2_m68k_cf),false,true) \ -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ -Dbuild.cmake_prefix_path=$$(HOST_DIR)/lib/cmake \ From af85e45afcd677ce240fc951a18de9afb0ec0015 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Jun 2023 20:31:05 +0200 Subject: [PATCH 0958/2890] package/libdisplay-info: new package Needed for upcoming Kodi version 21.0-Omega. Depends on the previous patch to fix build error on Coldfire. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...0001-displayid.c-Include-sys-types.h.patch | 36 +++++++++++++++++++ package/libdisplay-info/Config.in | 8 +++++ package/libdisplay-info/libdisplay-info.hash | 3 ++ package/libdisplay-info/libdisplay-info.mk | 18 ++++++++++ 6 files changed, 67 insertions(+) create mode 100644 package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch create mode 100644 package/libdisplay-info/Config.in create mode 100644 package/libdisplay-info/libdisplay-info.hash create mode 100644 package/libdisplay-info/libdisplay-info.mk diff --git a/DEVELOPERS b/DEVELOPERS index c1819954ae8b..3237c90c3956 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -362,6 +362,7 @@ F: package/libbroadvoice/ F: package/libcap/ F: package/libcdio/ F: package/libcec/ +F: package/libdisplay-info/ F: package/libcodec2/ F: package/libcrossguid/ F: package/libdeflate/ diff --git a/package/Config.in b/package/Config.in index 9cdbd677ff6a..c9d5c9ccaa5c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1679,6 +1679,7 @@ menu "Hardware handling" source "package/libatasmart/Config.in" source "package/libblockdev/Config.in" source "package/libcec/Config.in" + source "package/libdisplay-info/Config.in" source "package/libfreefare/Config.in" source "package/libftdi/Config.in" source "package/libftdi1/Config.in" diff --git a/package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch b/package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch new file mode 100644 index 000000000000..3fa57ee10d41 --- /dev/null +++ b/package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch @@ -0,0 +1,36 @@ +From 648c1cb66b571b037976b61363654f39448f5fac Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 7 May 2023 14:14:48 +0200 +Subject: [PATCH] displayid.c: Include sys/types.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build error +../displayid.c:377:10: error: ‘ssize_t’ undeclared (first use in this function); did you mean ‘size_t’? + +seen with: +arc-linux-gcc.br_real (Buildroot 2021.11-4428-g6b6741b) 10.2.0 + +Upstream: https://gitlab.freedesktop.org/emersion/libdisplay-info/-/commit/5c9801a75f2815790ad1ed5500cec2728a36c6ec + +Signed-off-by: Bernd Kuhls +--- + displayid.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/displayid.c b/displayid.c +index 398772b..f1749c6 100644 +--- a/displayid.c ++++ b/displayid.c +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + #include "bits.h" + #include "displayid.h" +-- +2.39.2 + diff --git a/package/libdisplay-info/Config.in b/package/libdisplay-info/Config.in new file mode 100644 index 000000000000..b8363ed61b43 --- /dev/null +++ b/package/libdisplay-info/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBDISPLAY_INFO + bool "libdisplay-info" + select BR2_PACKAGE_HWDATA + select BR2_PACKAGE_HWDATA_PNP_IDS + help + EDID and DisplayID library. + + https://gitlab.freedesktop.org/emersion/libdisplay-info diff --git a/package/libdisplay-info/libdisplay-info.hash b/package/libdisplay-info/libdisplay-info.hash new file mode 100644 index 000000000000..a0829479a89b --- /dev/null +++ b/package/libdisplay-info/libdisplay-info.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 51cdb0362882ca2af62532ab4d95e60d81e9890b339264719fd55f8e3945d695 libdisplay-info-0.1.1.tar.bz2 +sha256 15b396244e58830c5614b9394f4deccfe684970cd507f299383ab57ad339eedd LICENSE diff --git a/package/libdisplay-info/libdisplay-info.mk b/package/libdisplay-info/libdisplay-info.mk new file mode 100644 index 000000000000..26a6a9a4d90f --- /dev/null +++ b/package/libdisplay-info/libdisplay-info.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# libdisplay-info +# +################################################################################ + +LIBDISPLAY_INFO_VERSION = 0.1.1 +LIBDISPLAY_INFO_SOURCE = libdisplay-info-$(LIBDISPLAY_INFO_VERSION).tar.bz2 +LIBDISPLAY_INFO_SITE = https://gitlab.freedesktop.org/emersion/libdisplay-info/-/archive/$(LIBDISPLAY_INFO_VERSION) +LIBDISPLAY_INFO_LICENSE = MIT +LIBDISPLAY_INFO_LICENSE_FILES = LICENSE +LIBDISPLAY_INFO_INSTALL_STAGING = YES +LIBDISPLAY_INFO_DEPENDENCIES = hwdata + +# workaround for static_assert on uclibc-ng < 1.0.42 +LIBDISPLAY_INFO_CFLAGS += $(TARGET_CFLAGS) -Dstatic_assert=_Static_assert + +$(eval $(meson-package)) From 70ff5377f233ff936d31956b4c2747280d25d289 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Tue, 20 Jun 2023 10:09:22 -0700 Subject: [PATCH 0959/2890] package/freescale-imx/firmware-imx: ensure the linux firmware is installed first There was some imx SDMA firmware in the base linux-firmware package at one time, but the firmware-imx is updated with the latest versions from NXP releases. This just ensures a dependency is set so that the firmware-imx package will always come later in case an overlap occurs again. Signed-off-by: Charles Hardin Reviewed-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/firmware-imx/firmware-imx.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 99fe71a91c9c..4cceb670193d 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -14,6 +14,10 @@ FIRMWARE_IMX_REDISTRIBUTE = NO FIRMWARE_IMX_INSTALL_IMAGES = YES +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE),y) +FIRMWARE_IMX_DEPENDENCIES += linux-firmware +endif + define FIRMWARE_IMX_EXTRACT_CMDS $(call NXP_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef From 794b9e993273fbaa4e814f9a4b3e62c633d8d117 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Tue, 20 Jun 2023 10:19:43 -0700 Subject: [PATCH 0960/2890] package/freescale-imx/imx-seco: add the imx8dxl b0 revsision ahab image Update the selection of the ahab container images for the imx8dxl asics. The initial support assumed these were imx8 but this is actually the imx8x architecture as well. This was fixed when run on the first tests against the imx8dxl SoCs. Files from upstream: mx8dxla0-ahab-container.img mx8dxla1-ahab-container.img mx8dxlb0-ahab-container.img The B0 revision should be considered the latest Signed-off-by: Charles Hardin Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-seco/Config.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-seco/Config.in b/package/freescale-imx/imx-seco/Config.in index 867ffe1bb080..41f84446511f 100644 --- a/package/freescale-imx/imx-seco/Config.in +++ b/package/freescale-imx/imx-seco/Config.in @@ -22,11 +22,15 @@ choice config BR2_PACKAGE_IMX_SECO_MX8DXLA0 bool "imx-seco-mx8dxla0" - depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X config BR2_PACKAGE_IMX_SECO_MX8DXLA1 bool "imx-seco-mx8dxla1" - depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + +config BR2_PACKAGE_IMX_SECO_MX8DXLB0 + bool "imx-seco-mx8dxlb0" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X config BR2_PACKAGE_IMX_SECO_MX8QMB0 bool "imx-seco-mx8qmb0" @@ -46,6 +50,7 @@ config BR2_PACKAGE_IMX_SECO_AHAB_CONTAINER_IMAGE string default "mx8dxla0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8DXLA0 default "mx8dxla1-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8DXLA1 + default "mx8dxlb0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8DXLB0 default "mx8qmb0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8QMB0 default "mx8qxb0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8QXB0 default "mx8qxc0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8QXC0 From 168e5848addda21067d3b8791e9b781847daa30f Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Tue, 20 Jun 2023 10:23:05 -0700 Subject: [PATCH 0961/2890] package/unzip: configure with LARGE_FILE_SUPPORT by default Buildroot always enable largefile support in the toolchain, and thus the associated definitions are always on. This leads to a problem in unzip that on a 32-bit arch with these flags being passed in -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 but the LARGE_FILE_SUPPORT define not being set will cause a size mismatch on the comparison of the zipfiles: $ unzip test.zip Archive: test.zip error: invalid zip file with overlapped components (possible zip bomb) The simple solution is just enable LARGE_FILE_SUPPORT to enable large file support. In order to avoid redefinition warnings, we undefine _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE. Signed-off-by: Charles Hardin Tested-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/unzip/unzip.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk index 44cc2013fbcb..14ccedd48fd2 100644 --- a/package/unzip/unzip.mk +++ b/package/unzip/unzip.mk @@ -28,4 +28,18 @@ UNZIP_IGNORE_CVES = \ CVE-2022-0529 \ CVE-2022-0530 +# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when +# necessary, redefining it on the command line causes some warnings. +UNZIP_TARGET_CFLAGS = \ + $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) + +# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when +# necessary, redefining it on the command line causes some warnings. +UNZIP_TARGET_CXXFLAGS = \ + $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CXXFLAGS)) + +UNZIP_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(UNZIP_TARGET_CFLAGS) -DLARGE_FILE_SUPPORT" \ + -DCMAKE_CXX_FLAGS="$(UNZIP_TARGET_CXXFLAGS) -DLARGE_FILE_SUPPORT" + $(eval $(cmake-package)) From f8e000b1866fdc2dbb2c57fbfe66f62a80167f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacy=20Gaw=C4=99dzki?= Date: Wed, 5 Jul 2023 10:03:28 +0200 Subject: [PATCH 0962/2890] package/bpftool: enable support for arm/armeb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The local copy bpftool uses now compiles fine on both arm and armeb. Add these archs to BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS. Signed-off-by: Ignacy Gawędzki Signed-off-by: Thomas Petazzoni --- package/bpftool/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index 461be9e5b4f8..d131ec566ea2 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS bool # see libbpf/src/bpf.c default y if BR2_arc + default y if BR2_arm || BR2_armeb default y if BR2_aarch64 || BR2_aarch64_be default y if BR2_i386 || BR2_x86_64 default y if BR2_sparc || BR2_sparc64 From 84da7d929113881aad6a4f57ba1f21c54554b3e7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 14:31:07 +0200 Subject: [PATCH 0963/2890] package/python-pyicu: bump version to 2.11 Updated help text to follow upstream move to gitlab. This version bump introduces compatibility with icu 73-1: https://gitlab.pyicu.org/main/pyicu/-/commit/1ba50901161acfce691d41308be6c004a3956f4e Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pyicu/Config.in | 2 +- package/python-pyicu/python-pyicu.hash | 4 ++-- package/python-pyicu/python-pyicu.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyicu/Config.in b/package/python-pyicu/Config.in index 93eac533877c..cbd75c0119c2 100644 --- a/package/python-pyicu/Config.in +++ b/package/python-pyicu/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_PYTHON_PYICU help Python extension wrapping the ICU C++ API. - https://github.com/ovalhub/pyicu + https://gitlab.pyicu.org/main/pyicu comment "python-pyicu needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" depends on !BR2_BINFMT_FLAT diff --git a/package/python-pyicu/python-pyicu.hash b/package/python-pyicu/python-pyicu.hash index 009b2643365f..395d2fe47bc7 100644 --- a/package/python-pyicu/python-pyicu.hash +++ b/package/python-pyicu/python-pyicu.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyicu/json -md5 4090ebb98702338cac3dbed2d72c2fd7 PyICU-2.10.2.tar.gz -sha256 0c3309eea7fab6857507ace62403515b60fe096cbfb4f90d14f55ff75c5441c1 PyICU-2.10.2.tar.gz +md5 f13ffa91014efde6962c4c1ed6ee7a3c PyICU-2.11.tar.gz +sha256 3ab531264cfe9132b3d2ac5d708da9a4649d25f6e6813730ac88cf040a08a844 PyICU-2.11.tar.gz # Locally computed sha256 checksums sha256 00da5bf22f2386c4f6f07c734490e9b818c4dcf70e6ca49f594e9cec636b9c40 LICENSE diff --git a/package/python-pyicu/python-pyicu.mk b/package/python-pyicu/python-pyicu.mk index 53e4a15c4f5e..213c099d07f2 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYICU_VERSION = 2.10.2 +PYTHON_PYICU_VERSION = 2.11 PYTHON_PYICU_SOURCE = PyICU-$(PYTHON_PYICU_VERSION).tar.gz -PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/64/00/a531e119a97e54601f616f5061879ec2d4bb058d225014f9acf94b2970c3 +PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/03/1b/800fce0236be0b8a99b3ccbb797786dd178028960b3fd65544e2d8bad5ac PYTHON_PYICU_LICENSE = MIT PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu From 43d4947fc28de3a57e4bbf0220daa85241548f0e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 14:31:08 +0200 Subject: [PATCH 0964/2890] package/icu: bump version to 73-1 Updated license hash due to copyright year bump: https://github.com/unicode-org/icu/commit/9e16711b54d055cad10f7dc59f19d124ca6618be Release notes: https://icu.unicode.org/download/71 https://icu.unicode.org/download/72 https://icu.unicode.org/download/73 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/icu/icu.hash | 4 ++-- package/icu/icu.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/icu/icu.hash b/package/icu/icu.hash index 56a0a5dd53c9..77d5a9269c34 100644 --- a/package/icu/icu.hash +++ b/package/icu/icu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5 icu4c-70_1-src.tgz -sha256 861671f8c712aa046f8f5ac89239e6c33821636516c5d0cc8c4e1973085f27a6 LICENSE +sha256 a457431de164b4aa7eca00ed134d00dfbf88a77c6986a10ae7774fc076bb8c45 icu4c-73_1-src.tgz +sha256 f3005e195ff74d8812cc1f182a1c446fab678d70a10e3dada497585befee5416 LICENSE diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 8107796ae95d..96ac5cef6114 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -7,7 +7,7 @@ # Git tags (and therefore versions on release-monitoring.org) use the # XX-Y format, but the tarballs are named XX_Y and the containing # directories XX.Y. -ICU_VERSION = 70-1 +ICU_VERSION = 73-1 ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) From 7b774048be6292bb61f90759ad3b7b58a33a1650 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 10 Jul 2023 11:41:49 +0200 Subject: [PATCH 0965/2890] boot/arm-trusted-firmware: fix build issue with binutils 2.39+ The new version of binutils introduces a new warning when linking. The new warninng is enabled by default. To fix the issue this warning is disabled by adding the patches to the arm-trusted-firmware package v{2.2..2.8}. This is a backport of an upstream commit [1] Since there are too many defconfigs that use the arm-trusted-firmware package, it is not practical to create a global-patch-dir for all of them. Therefore the patches are only in the package directory. [1] https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4603996186 https://gitlab.com/buildroot.org/buildroot/-/jobs/4603996189 Cc: Yann E. MORIN Cc: Dario Binacchi Cc: Romain Naour Signed-off-by: Heiko Thiery Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [yann.morin.1998@free.fr: add proper Upstream: tags] Signed-off-by: Yann E. MORIN --- ...-add-support-for-new-binutils-versio.patch | 59 ++++++++++++++++++ ...dd-support-for-new-binutils-versions.patch | 61 +++++++++++++++++++ ...dd-support-for-new-binutils-versions.patch | 61 +++++++++++++++++++ ...dd-support-for-new-binutils-versions.patch | 61 +++++++++++++++++++ ...dd-support-for-new-binutils-versions.patch | 61 +++++++++++++++++++ ...dd-support-for-new-binutils-versions.patch | 61 +++++++++++++++++++ ...dd-support-for-new-binutils-versions.patch | 61 +++++++++++++++++++ 7 files changed, 425 insertions(+) create mode 100644 boot/arm-trusted-firmware/v2.2/0001-PATCH-feat-build-add-support-for-new-binutils-versio.patch create mode 100644 boot/arm-trusted-firmware/v2.3/0001-feat-build-add-support-for-new-binutils-versions.patch create mode 100644 boot/arm-trusted-firmware/v2.4/0001-feat-build-add-support-for-new-binutils-versions.patch create mode 100644 boot/arm-trusted-firmware/v2.5/0001-feat-build-add-support-for-new-binutils-versions.patch create mode 100644 boot/arm-trusted-firmware/v2.6/0001-feat-build-add-support-for-new-binutils-versions.patch create mode 100644 boot/arm-trusted-firmware/v2.7/0001-feat-build-add-support-for-new-binutils-versions.patch create mode 100644 boot/arm-trusted-firmware/v2.8/0001-feat-build-add-support-for-new-binutils-versions.patch diff --git a/boot/arm-trusted-firmware/v2.2/0001-PATCH-feat-build-add-support-for-new-binutils-versio.patch b/boot/arm-trusted-firmware/v2.2/0001-PATCH-feat-build-add-support-for-new-binutils-versio.patch new file mode 100644 index 000000000000..d4d2b068f375 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.2/0001-PATCH-feat-build-add-support-for-new-binutils-versio.patch @@ -0,0 +1,59 @@ +From 5e1beb793c06352e87c46eca1144ff1fe8555103 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jul 2023 10:43:03 +0200 +Subject: [PATCH] [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 + +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 721246d51..5893cf422 100644 +--- a/Makefile ++++ b/Makefile +@@ -297,11 +297,16 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 + TF_LDFLAGS += --remove --info=unused,unusedsymbols + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + endif + TF_LDFLAGS += $(TF_LDFLAGS_$(ARCH)) +-- +2.30.2 + diff --git a/boot/arm-trusted-firmware/v2.3/0001-feat-build-add-support-for-new-binutils-versions.patch b/boot/arm-trusted-firmware/v2.3/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 000000000000..335c18553ac3 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.3/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/boot/arm-trusted-firmware/v2.4/0001-feat-build-add-support-for-new-binutils-versions.patch b/boot/arm-trusted-firmware/v2.4/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 000000000000..335c18553ac3 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.4/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/boot/arm-trusted-firmware/v2.5/0001-feat-build-add-support-for-new-binutils-versions.patch b/boot/arm-trusted-firmware/v2.5/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 000000000000..335c18553ac3 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.5/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/boot/arm-trusted-firmware/v2.6/0001-feat-build-add-support-for-new-binutils-versions.patch b/boot/arm-trusted-firmware/v2.6/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 000000000000..335c18553ac3 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.6/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/boot/arm-trusted-firmware/v2.7/0001-feat-build-add-support-for-new-binutils-versions.patch b/boot/arm-trusted-firmware/v2.7/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 000000000000..335c18553ac3 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.7/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/boot/arm-trusted-firmware/v2.8/0001-feat-build-add-support-for-new-binutils-versions.patch b/boot/arm-trusted-firmware/v2.8/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 000000000000..335c18553ac3 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.8/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + From 10dbb664e50e75ce7df2732d3cb483817147ffbf Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 10 Jul 2023 15:26:53 -0600 Subject: [PATCH 0966/2890] DEVELOPERS: Remove Michael Rommel Removal requested via email: could you somehow please remove me as maintainer from this package. I am since many years not using builtroot anymore and have no longer systems with which I could do patch requests. I am going into retirement. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- DEVELOPERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 3237c90c3956..95f5305d6c96 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2079,11 +2079,6 @@ F: package/protobuf/ F: package/re2/ F: package/spdlog/ -N: Michael Rommel -F: package/knock/ -F: package/python-crc16/ -F: package/python-pyzmq/ - N: Michael Trimarchi F: board/bsh/ F: configs/imx8mn_bsh_smm_s2_defconfig From 6b23dff9e71786191797d3b41ce80afe659f0396 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 12 Oct 2022 21:05:34 +0200 Subject: [PATCH 0967/2890] package/qt5: bump packages to latest kde submodule versions Bump qt5 packages to latest submodule versions from: https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 Drop a qt5wayland patch which is now upstream. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/qt5/qt5.mk | 2 +- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/qt5/qt5charts/qt5charts.hash | 2 +- package/qt5/qt5charts/qt5charts.mk | 2 +- .../qt5/qt5declarative/qt5declarative.hash | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- .../qt5graphicaleffects.hash | 2 +- .../qt5graphicaleffects.mk | 2 +- .../qt5/qt5imageformats/qt5imageformats.hash | 2 +- .../qt5/qt5imageformats/qt5imageformats.mk | 2 +- package/qt5/qt5location/qt5location.hash | 2 +- package/qt5/qt5location/qt5location.mk | 2 +- package/qt5/qt5lottie/qt5lottie.hash | 2 +- package/qt5/qt5lottie/qt5lottie.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 2 +- package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 2 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 2 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- .../qt5quicktimeline/qt5quicktimeline.hash | 2 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 2 +- .../qt5remoteobjects/qt5remoteobjects.hash | 2 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 2 +- package/qt5/qt5script/qt5script.hash | 2 +- package/qt5/qt5script/qt5script.mk | 2 +- package/qt5/qt5scxml/qt5scxml.hash | 2 +- package/qt5/qt5scxml/qt5scxml.mk | 2 +- package/qt5/qt5sensors/qt5sensors.hash | 2 +- package/qt5/qt5sensors/qt5sensors.mk | 2 +- package/qt5/qt5serialbus/qt5serialbus.hash | 2 +- package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- package/qt5/qt5serialport/qt5serialport.hash | 2 +- package/qt5/qt5serialport/qt5serialport.mk | 2 +- package/qt5/qt5svg/qt5svg.hash | 2 +- package/qt5/qt5svg/qt5svg.mk | 2 +- package/qt5/qt5tools/qt5tools.hash | 2 +- package/qt5/qt5tools/qt5tools.mk | 2 +- .../qt5virtualkeyboard.hash | 2 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- .../0001-Add-missing-define-guards.patch | 35 ------------------- package/qt5/qt5wayland/qt5wayland.hash | 2 +- package/qt5/qt5wayland/qt5wayland.mk | 2 +- ...ro-don-t-link-statically-with-libstc.patch | 15 ++++---- package/qt5/qt5webengine/qt5webengine.hash | 2 +- package/qt5/qt5webview/qt5webview.mk | 2 +- package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- 50 files changed, 56 insertions(+), 90 deletions(-) delete mode 100644 package/qt5/qt5wayland/0001-Add-missing-define-guards.patch diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 0706c3548dc2..b55accacf1d8 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,7 +5,7 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).8 +QT5_VERSION = $(QT5_VERSION_MAJOR).10 QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 27d2b99c34c4..4efc8fa172de 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ecff8cf42af98c2294f7c99eb8c41564892f470382adaf8f4048c85252849808 qtbase-2ffb7ad8a1079a0444b9c72affe3d19b089b60de.tar.bz2 +sha256 5622a9053154af9a353b8e8be217104c6af068b5b5aba8b07ef4fea2dc79fded qtbase-e44097b63d17ba3178a637df7fac51ddc51cb48b.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index efa0e16e9a2e..028236d2ed60 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = 2ffb7ad8a1079a0444b9c72affe3d19b089b60de +QT5BASE_VERSION = e44097b63d17ba3178a637df7fac51ddc51cb48b QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index ba22e29996c5..0688f6461559 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 32119f7ac88c250b24835b91a71510bf673f1cede6e572fd1059debf8325d7ff qtcharts-16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5.tar.bz2 +sha256 9d2ad94a054bd7df08e5d11bc77b6422ccecbf99ea8dd6f06908bafc72ea869d qtcharts-841083c263f16f8acb81e4915bf24bbed0461c9a.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 0028c9f8cb68..fa69263be432 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5CHARTS_VERSION = 16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5 +QT5CHARTS_VERSION = 841083c263f16f8acb81e4915bf24bbed0461c9a QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 00c9a044324f..0e7978dc58fe 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0dd6b29bb19ad419d47d1fb612b39b1834d675fd1c58b80cd85c7d3da98b40bf qtdeclarative-51efb2ed2f071beda188270a23ac450fe4b318f7.tar.bz2 +sha256 dbe0cdf84767564a56abf9d0d867c9cfcc754827169357a0f8162309c11882b5 qtdeclarative-b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index cece8e476bb6..18c1608fcad0 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = 51efb2ed2f071beda188270a23ac450fe4b318f7 +QT5DECLARATIVE_VERSION = b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 5de13a176db9..95567b24767a 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 83ee3888473fb786c1615c4b98320a9b1eeeb66dbc1ef9743b8339718594e48e qtgraphicaleffects-4c6ec38635aa22cf0854df8e710733c529f4ec02.tar.bz2 +sha256 de41af344889d35252fec9a6b6c78e1f67b7a7be15a5d3986b2ec20e2fcafadc qtgraphicaleffects-e6e1e58ec28fd0f2e6426e6962cc4ccddb493349.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index e4c464b8c7a0..f829c67122d1 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = 4c6ec38635aa22cf0854df8e710733c529f4ec02 +QT5GRAPHICALEFFECTS_VERSION = e6e1e58ec28fd0f2e6426e6962cc4ccddb493349 QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 9b8a788cae09..9d821672b308 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4ce1982ccf3232d25187286ca4893bcf00b149cf9f6706f06f60d908fab480a0 qtimageformats-b43e31b9f31ec482ddea2066fda7ca9315512815.tar.bz2 +sha256 8bf646d4db7d0099dd49b7c049a64fb585a3e180d73fc2b6edf22a1384529d1d qtimageformats-9044695f4b1acdd7ec24e7b01f6a6ca61f982a75.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index 2cc8e0f17b10..0ce6e4ffb49b 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = b43e31b9f31ec482ddea2066fda7ca9315512815 +QT5IMAGEFORMATS_VERSION = 9044695f4b1acdd7ec24e7b01f6a6ca61f982a75 QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index e41b20fd9b2a..f73053f388f4 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 f9673cb1e5b88b4c43d663d7b9b666ff82d6843bf2b445805367cf537839a782 qt5location-db3b6bc6afed6477e6ab2d8465e41efee30fb6d5-br1.tar.gz +sha256 90b57a335d8c7311a86865a56b2b9cd944a8a1cafa6a7499de5b35a105c5b247 qt5location-ebdf5b38da6e3fe0a183702bcca395c589c459ed-br1.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index a61994fa5301..904d31a983b2 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOCATION_VERSION = db3b6bc6afed6477e6ab2d8465e41efee30fb6d5 +QT5LOCATION_VERSION = ebdf5b38da6e3fe0a183702bcca395c589c459ed QT5LOCATION_SITE = $(QT5_SITE)/qtlocation QT5LOCATION_SITE_METHOD = git QT5LOCATION_GIT_SUBMODULES = YES diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index c5c71ddf6c14..cbd94fd11190 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7e006b7a3608f0737f41682352819c404db4c1506d9ebe82eb4af7b1ae652d14 qtlottie-ccba2b00bd7f10558edb8664d6b9a95e9fafe6ac.tar.bz2 +sha256 82336dd063f8bedc28e9545cc8c0123053434d6c681e470434c80ad3908ca4b0 qtlottie-d40b67401afe7156b03c62c9a4d517b07555fe64.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index d02d693401b6..42a920582a10 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOTTIE_VERSION = ccba2b00bd7f10558edb8664d6b9a95e9fafe6ac +QT5LOTTIE_VERSION = d40b67401afe7156b03c62c9a4d517b07555fe64 QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 527e3948b860..4803ef9230df 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b6a17deafe7ea7ad44e2852a92ea73b0089beaf9f24cb3434d018db9b8170ee6 qtmultimedia-dc0ee181d4c56ff66c989bd3292dad7cc35e234b.tar.bz2 +sha256 842c5be64dafe7a68d2b120e24faffd14af6e4d9d8e9c0aa8bbf4330b3491aa3 qtmultimedia-76f84c545429a1b988b79f971734ef4bc3e6643f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index bf2126b285bc..0d0f5dd53d1c 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = dc0ee181d4c56ff66c989bd3292dad7cc35e234b +QT5MULTIMEDIA_VERSION = 76f84c545429a1b988b79f971734ef4bc3e6643f QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 45af81c99fc0..05a021e8b275 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c2ddcf9c524ef12a0786c410ac4b3c6d4be9aa17db71f2ea8c57ff615fda62dd qtquickcontrols-d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b.tar.bz2 +sha256 e2c7bc6346a8eb4c21510f8fbf7e752648f68a0c5af8525a784e64503570f72c qtquickcontrols-e62b8b6d2f45a79652238b33f4bbe23023004ae7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 5903e6d69c77..25c1a74f5c60 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b +QT5QUICKCONTROLS_VERSION = e62b8b6d2f45a79652238b33f4bbe23023004ae7 QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 7d81b6140739..88777a5cc3be 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0c4204257be906c13f863b9481bb20ad616c9a80a074b6f160f863ac046dad27 qtquickcontrols2-0d3d39e821ea7634c174a29910c18d7101bce6f7.tar.bz2 +sha256 53caea73e6bdf234cb445067be3bc4e07ed59af7da967638ac598188b719958e qtquickcontrols2-74e8db97fdb9b55c4b4614b83f4bf17e00df55e9.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index f847ec95ab37..1732921203f8 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = 0d3d39e821ea7634c174a29910c18d7101bce6f7 +QT5QUICKCONTROLS2_VERSION = 74e8db97fdb9b55c4b4614b83f4bf17e00df55e9 QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index e68f66edd8a6..a8acf3c5a2c9 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ab113ead993206de4025c78fd2babea69824f52ff88fa78451b6bbcb932a6ab6 qtquicktimeline-2ce816fa5822bcc1c47678447405b2e5dc1312c1.tar.bz2 +sha256 d22637609c4afcc7560d92c894eb55d4afa01706bb5c86499bf56f7c8723a605 qtquicktimeline-87ad61716a7cba5a070d8a7b1756c8b2b48d5d53.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index 70cca38ff45c..de94bd037573 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = 2ce816fa5822bcc1c47678447405b2e5dc1312c1 +QT5QUICKTIMELINE_VERSION = 87ad61716a7cba5a070d8a7b1756c8b2b48d5d53 QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 980101c7fb59..1b41ab675f3c 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 f51631a142ac47a03266496dae9d07c734f092a0afe8c4e18cd78b7cf9c17b38 qtremoteobjects-809412e1cc2151c21f843796ef67705600f6aafb.tar.bz2 +sha256 ef8e1f64911f7e03da6306693031fdf953af00d453ec154497178bb7ceab1aa2 qtremoteobjects-aa705010da0f658b78c1155babce7091ae44529a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index 984f392dda1c..3160d37ad718 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = 809412e1cc2151c21f843796ef67705600f6aafb +QT5REMOTEOBJECTS_VERSION = aa705010da0f658b78c1155babce7091ae44529a QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index b3e10491fd4d..d6572be818d2 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 fc625c1682d7ee5d1092255408cbaf08d5cac52eb45bacd3ab52937dc84d91f2 qtscript-5cec94b2c1503f106f4ef4778d016410ebb86211.tar.bz2 +sha256 7731d8c85636d039a2b35a9ee0de7b5ebb0c3900a9b4845676041ce91f56f01f qtscript-f237e324508dcf0dbabde9dd498eda9fa61c4ff0.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 313895f11b33..96cbbfbbadb8 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SCRIPT_VERSION = 5cec94b2c1503f106f4ef4778d016410ebb86211 +QT5SCRIPT_VERSION = f237e324508dcf0dbabde9dd498eda9fa61c4ff0 QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 1c11ae5853f3..f4d52b8a52c2 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5fc3e6166ab3588242864c5d8f18235a45f5c3396482ccfeb8590fe67d0cd549 qtscxml-dcbd73cf3e8a07dbfa249d7db2257caafa83781b.tar.bz2 +sha256 a0113f54d9df14ebae15dd85530f87f093a284372ee8237d1ccceb02e6a4607b qtscxml-631fd7bcc34802b7650c2b1dc73691463954d982.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index af18b84e9db6..f6ccb9298e56 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SCXML_VERSION = dcbd73cf3e8a07dbfa249d7db2257caafa83781b +QT5SCXML_VERSION = 631fd7bcc34802b7650c2b1dc73691463954d982 QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 559f02e7f6e3..d43fa8ba65c5 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 fa0ffba89fed2086d06dab84074cdd789acbfb89da6f64c40a64fc3bc067832e qtsensors-1ab8d6c7257f9ec060739b648704be1cf1c16b05.tar.bz2 +sha256 8325826a259189fc7dea66651df4022a92a73664e953f86bce5bf5946ebacdf5 qtsensors-35eb5ac7eaef4745a38958c3ca780d7baa2e4f30.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index 299fab3db02c..40bb72e038b9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SENSORS_VERSION = 1ab8d6c7257f9ec060739b648704be1cf1c16b05 +QT5SENSORS_VERSION = 35eb5ac7eaef4745a38958c3ca780d7baa2e4f30 QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index b8f96cf0c096..01ffd7c2152e 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 caaccfdabdf502c3aacf9fa842ed31ed7682cab6ada69b06be1ba49273fb1f1c qtserialbus-e34053fbda8d687e3dc294fbd5e3a88bf94a7a66.tar.bz2 +sha256 fe08415d2348797429dc09722478630ceee3d7477652a2712460e79127b7291b qtserialbus-f9f7eee60adac72fcf6617d164e3bf61222bb5c5.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 70f23ce407e8..c718414932b0 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALBUS_VERSION = e34053fbda8d687e3dc294fbd5e3a88bf94a7a66 +QT5SERIALBUS_VERSION = f9f7eee60adac72fcf6617d164e3bf61222bb5c5 QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index d25b2193e799..58461430c7ab 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 83abb0c5b9c435a031abf1a36d6d44f8e3f5e2fc16150bdc78c6d33b25386bb6 qtserialport-191e67e428522a0e2e1e8d2f3440607a9760d441.tar.bz2 +sha256 6d49d0da174632f51291b0190f6f1db2397a3b339cf293514252766f8a20c63b qtserialport-c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index cd96df200742..7d00bd2ab7d3 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALPORT_VERSION = 191e67e428522a0e2e1e8d2f3440607a9760d441 +QT5SERIALPORT_VERSION = c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694 QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 424891ac2c0d..4816206d6489 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 eeb4175f0b2c3299abf0ca9d751886612dad5ecd212c954f9801b28b4696f4f7 qtsvg-23b8cf7d833c335d7735855570c05e9e0893a9b7.tar.bz2 +sha256 063ee53515b934c00a65838fe8521142e4a9161b07c8e19b5bb0ea26a0ce9ab3 qtsvg-a9752b00a03438de8e5b080073816e12409404b7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index 3072fd7a187c..2a39ed18feef 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SVG_VERSION = 23b8cf7d833c335d7735855570c05e9e0893a9b7 +QT5SVG_VERSION = a9752b00a03438de8e5b080073816e12409404b7 QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index 58ed752b9bf8..d60359825715 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 76052a183a41fcddfd4446ffba6a99c3e77a21453fe629cf67379ffa617a0d53 qttools-53ee43a51b5a3de2877dafffc78e71ff55926708.tar.bz2 +sha256 b6eebbd61dcde981d63ce6de39b3c957bad8f11b0140585ba4d57d166c4dd79d qttools-32912a06aadfc3dcbc34e0a668ce2c78351eee6e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index e87c9b50a555..a01a336584f8 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5TOOLS_VERSION = 53ee43a51b5a3de2877dafffc78e71ff55926708 +QT5TOOLS_VERSION = 32912a06aadfc3dcbc34e0a668ce2c78351eee6e QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 1cdd8f0386b6..60d51fa5fe68 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6ef14ba8bb5eb287320b6c0d6e61c5c2916a94ef754bb8a2d89c123043485d67 qtvirtualkeyboard-e8ae4757dd32e8dbf69a7c57f2bc5c1e238416db.tar.bz2 +sha256 e1e356e81f3a3fb5da6f6739aa475c15aab15090e202de6704441a3bf41c335b qtvirtualkeyboard-9fbb837b55887bec5d73fad142c853ef68db35b3.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3fefdc874d0a..49ce71b75e41 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = e8ae4757dd32e8dbf69a7c57f2bc5c1e238416db +QT5VIRTUALKEYBOARD_VERSION = 9fbb837b55887bec5d73fad142c853ef68db35b3 QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg diff --git a/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch b/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch deleted file mode 100644 index adad3768b23c..000000000000 --- a/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 05658e127dedfff65789860415537c6920ec574d Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Thu, 22 Apr 2021 15:29:56 +0300 -Subject: [PATCH] Add missing define guards - -Ammend cca1b94190a094b5d1d7ce492b6533e2d330c5e8 to use m_composeState -only if xcbcommon is available. - -Pick-to: 5.15 -Change-Id: I48332b15def3282c5bda3e1c7c393ea7e9849cbe -Reviewed-by: Aleix Pol Gonzalez -[Backported from: 05658e127dedfff65789860415537c6920ec574d] -Signed-off-by: Quentin Schulz ---- - src/client/qwaylandinputcontext.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp -index 16e03ea1..cbf63cde 100644 ---- a/src/client/qwaylandinputcontext.cpp -+++ b/src/client/qwaylandinputcontext.cpp -@@ -408,8 +408,10 @@ bool QWaylandInputContext::isValid() const - void QWaylandInputContext::reset() - { - qCDebug(qLcQpaInputMethods) << Q_FUNC_INFO; -+#if QT_CONFIG(xkbcommon) - if (m_composeState) - xkb_compose_state_reset(m_composeState); -+#endif - - QPlatformInputContext::reset(); - --- -2.35.1 - diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 58935ceadcb1..c9d7f3434c35 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bfe9bce353c036356dc7bca04e634f03c7c924381062ce89627a88df0ae7484e qtwayland-36659e6130ed3fc2b3f0c91423408ef5ecb7b991.tar.bz2 +sha256 c881745403a7c3639ee928f64ac9e7252d7a941cb62ef682a7ee83ccf3ae0a60 qtwayland-8faf74a7966b520f0ac3eb4d88235f8ec63b31b8.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 63fa1f21c0b3..aeca1b03817b 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WAYLAND_VERSION = 36659e6130ed3fc2b3f0c91423408ef5ecb7b991 +QT5WAYLAND_VERSION = 8faf74a7966b520f0ac3eb4d88235f8ec63b31b8 QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland diff --git a/package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch b/package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch index dff3e6c84947..aeec4c58b171 100644 --- a/package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch +++ b/package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch @@ -28,24 +28,25 @@ linking statically by default. [1] https://github.com/qt/qtwebengine-chromium/commit/cfab9198a9917f42cf08b1caf84ab9b71aac1911#diff-905c8f054808213577c0a92d1b704615 Signed-off-by: Romain Naour +Signed-off-by: Giulio Benetti +[Giulio: rebased to qt5.15.10] --- src/buildtools/gn.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro -index 033202e6..5dd8e241 100644 +index f94694da0..19079a5b3 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -20,7 +20,8 @@ build_pass|!debug_and_release { - + gn_gen_args = --no-last-commit-position --out-path $$out_path \ --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ - --ld \"$$which($$QMAKE_LINK)\" + --ld \"$$which($$QMAKE_LINK)\" \ + --no-static-libstdc++ - - msvc:!clang_cl: gn_gen_args += --use-lto - --- -2.25.4 + !isEmpty(QMAKE_AR): gn_gen_args += --ar \"$$which($$first(QMAKE_AR))\" + msvc:!clang_cl: gn_gen_args += --use-lto +-- +2.34.1 diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 1d2b70c4f6d0..038446a9f498 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 fb7abcf88d4336d55565627e18b33df1855fefb0f12e24931b6a7decbe60913b qtwebengine-v5.15.8-lts.tar.bz2 +sha256 4a3456df42e1c1b859232b3ee1d58360e629d55daf6e5ad308871142c1b0c2fa qtwebengine-v5.15.10-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 54da733e7b73..a55fd8ae7491 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBVIEW_VERSION = 826d2a33929c69807917536d48b7861e7682001e +QT5WEBVIEW_VERSION = 87577dde04ed219bda776dabca86176149736331 QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index fb6650e84a1c..80c5498518a5 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = 51b0a5a2e3e35f4cb17da1e7cb4babef6294bfb4 +QT5X11EXTRAS_VERSION = 982f20eb585d77e5b5c721e05a466d7161f7f2d1 QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index a1dbb4015465..353dfc84859e 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6243e6334c0d1467e3e5bdecd981d7e673f4cc99cf2cee3b99597be4218a4bd2 qtxmlpatterns-dfcae10dec8c1c2c544ad0cd303cea113b0af51d.tar.bz2 +sha256 067b801049f6fada8e7ebcfbce0530db6217a1a94b8ed34c99c530be4129889d qtxmlpatterns-30e6c84fe2752cde8b53aff9d38c2095cd7c8761.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6711e9bf70af..803c36cf0493 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = dfcae10dec8c1c2c544ad0cd303cea113b0af51d +QT5XMLPATTERNS_VERSION = 30e6c84fe2752cde8b53aff9d38c2095cd7c8761 QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES From 89ffd9a47901b2361ca8581640b829bbbdad90e2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 11 Jul 2023 10:11:16 +0200 Subject: [PATCH 0968/2890] .checkpackageignore: remove qt5wayland patch This patch has been dropped in commit 6b23dff9e71786191797d3b41ce80afe659f0396, which forgot to update .checkpackageignore. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4629552432 Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index 3d8924c4e887..c75d0f80d265 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1303,7 +1303,6 @@ package/qt5/qt5enginio/0001-Do-not-use-deprecated-QLinkedList.patch Upstream package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch Upstream package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch Upstream package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch Upstream -package/qt5/qt5wayland/0001-Add-missing-define-guards.patch Upstream package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch Upstream package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch Upstream package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch Upstream From dd5c058a992dc5475daa69774caae06f62863135 Mon Sep 17 00:00:00 2001 From: Lothar Felten Date: Tue, 11 Jul 2023 11:45:23 +0200 Subject: [PATCH 0969/2890] configs/beaglebone: uboot needs OpenSSL Regression builds failed to build uboot due to missing OpenSSL library. Signed-off-by: Lothar Felten Signed-off-by: Yann E. MORIN --- configs/beaglebone_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 3e7ad8d4027d..7e006e7a8562 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -37,6 +37,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From adc566856e95990ede1174faa0a2ff031b15d356 Mon Sep 17 00:00:00 2001 From: Lothar Felten Date: Tue, 11 Jul 2023 11:44:48 +0200 Subject: [PATCH 0970/2890] configs/beaglebone_qt5_defconfig: build am335x-bonegreen-wireless Build the am335x-bonegreen-wireless.dtb device tree. The genimage script which is shared between beaglebone and beaglebone_qt5 was updated to support the bonegreen-wireless. Signed-off-by: Lothar Felten Signed-off-by: Yann E. MORIN --- configs/beaglebone_qt5_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index ff03a05a8eb3..0038acfcfdb6 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.7 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y From b17ed57763c4809f4541b4abe6a7a0e2349e6f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Mon, 10 Jul 2023 19:45:42 +0200 Subject: [PATCH 0971/2890] package/yavta: update _SITE URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It looks like the project moved to https://git.ideasonboard.org/yavta.git. Update YAVA_SITE URL accordingly. Signed-off-by: Sébastien Szymanski Signed-off-by: Yann E. MORIN --- package/yavta/yavta.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yavta/yavta.mk b/package/yavta/yavta.mk index d16bee69b117..db481b77b957 100644 --- a/package/yavta/yavta.mk +++ b/package/yavta/yavta.mk @@ -5,7 +5,7 @@ ################################################################################ YAVTA_VERSION = 583bedefc2a247d2cfd32d1b4a0abbe3e2015c70 -YAVTA_SITE = https://git.ideasonboard.org/git/yavta.git +YAVTA_SITE = https://git.ideasonboard.org/yavta.git YAVTA_SITE_METHOD = git YAVTA_LICENSE = GPL-2.0+ YAVTA_LICENSE_FILES = COPYING.GPL From f738d70bda9d9f57aa511c539bfc9ab1d9b43125 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 10 Jul 2023 23:15:19 +0200 Subject: [PATCH 0972/2890] package/mali-driver: bump version to 2023-07-10 This version fixes build failure with Linux 6.2 and 6.3 Fixes: http://autobuild.buildroot.net/results/0c043a6978fc5ea51b2c7a862de288223589926e/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/mali-driver/mali-driver.hash | 2 +- package/mali-driver/mali-driver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mali-driver/mali-driver.hash b/package/mali-driver/mali-driver.hash index de3b6e69f05b..f48450292d1e 100644 --- a/package/mali-driver/mali-driver.hash +++ b/package/mali-driver/mali-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 763d3cf76eb03584df6a13986a2877dc0ae5f310fc3d91e8a498fc5f89271dcc mali-driver-c90627f78d58567a2acb7cbf77d565e03a131294.tar.gz +sha256 ba30a5bae498462c4e967564b3fd6e5cbc5f4a7f71bfe9d13091ac6b0504d749 mali-driver-9baa7331c8e5ba6075e3fc42c530ae7f4c320cad.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mali-driver/mali-driver.mk b/package/mali-driver/mali-driver.mk index 8e059fe8bdab..3ab9b19f5f4b 100644 --- a/package/mali-driver/mali-driver.mk +++ b/package/mali-driver/mali-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -MALI_DRIVER_VERSION = c90627f78d58567a2acb7cbf77d565e03a131294 +MALI_DRIVER_VERSION = 9baa7331c8e5ba6075e3fc42c530ae7f4c320cad MALI_DRIVER_SITE = $(call github,bootlin,mali-driver,$(MALI_DRIVER_VERSION)) MALI_DRIVER_DEPENDENCIES = linux MALI_DRIVER_LICENSE = GPL-2.0 From fc3700ec9a51fc4d89728a363acf6408b0a35b8e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 11 Jul 2023 20:04:22 +0200 Subject: [PATCH 0973/2890] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 4 ++-- configs/olimex_a20_olinuxino_lime_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index a38f3a1c5ee7..d817e1dd1cfc 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.22" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.38" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -45,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 74b6a764cd3d..88967e70cb5d 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.22" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.38" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -45,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From cf132a137bb2a6b2ec5af38ff901795f16653cb8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 6 Jul 2023 21:00:59 +0200 Subject: [PATCH 0974/2890] support/testing/tests/package/test_compressor_base.py: new helper class This is a helper class providing a template for testing data compressor and decompressor programs such as gzip, bzip2, xz... Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../tests/package/test_compressor_base.py | 126 ++++++++++++++++++ 2 files changed, 127 insertions(+) create mode 100644 support/testing/tests/package/test_compressor_base.py diff --git a/DEVELOPERS b/DEVELOPERS index 95f5305d6c96..57c25c4cfdd2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1728,6 +1728,7 @@ F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_hwdata.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_compressor_base.py F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dos2unix.py diff --git a/support/testing/tests/package/test_compressor_base.py b/support/testing/tests/package/test_compressor_base.py new file mode 100644 index 000000000000..6555584c103c --- /dev/null +++ b/support/testing/tests/package/test_compressor_base.py @@ -0,0 +1,126 @@ +import os + +import infra.basetest + + +class TestCompressorBase(infra.basetest.BRTest): + """Common class to test a data compression/decompression package. + + Build an image containing the package enabled in config, start the + emulator, login to it. It prepares a test data file with some + redundancy to let compression program reduce the file size. + + Each test case that inherits from this class must have: + __test__ = True - to let nose2 know that it is a test case + config - defconfig fragment with the packages to run the test + compress_cmd - the compression program command (ex: "gzip") + it can also contain arguments (ex: "gzip -9") + It also can have: + decompress_cmd - the decompression program (ex: "gunzip") + if unset, the default value is "un" appended with the + value of "compress_cmd". + check_integrity_cmd + - the integrity check command (ex: "gzip -t") + in unset, the default value is "compress_cmd" appended + with " -t". + compressed_file_ext + - the file extention of compressed files created by the + compress command. (ex: ".gz") + if unset, the default value is a dot "." appended with + the value of "compress_cmd". + timeout - timeout to the compression command. Some compression + program can take more time than the default value + (set to 5 seconds). + """ + __test__ = False + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + compress_cmd = "compressor-unknown" + decompress_cmd = None + check_integrity_cmd = None + compressed_file_ext = None + timeout = 5 + + def __init__(self, names): + """Setup common test variables.""" + super(TestCompressorBase, self).__init__(names) + + if self.decompress_cmd is None: + self.decompress_cmd = "un" + self.compress_cmd + + if self.check_integrity_cmd is None: + self.check_integrity_cmd = self.compress_cmd + " -t" + + if self.compressed_file_ext is None: + self.compressed_file_ext = "." + self.compress_cmd + + self.ref_file = "reference.bin" + self.test_file = "test.bin" + self.comp_test_file = self.test_file + self.compressed_file_ext + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + def test_run(self): + self.login() + self.prepare_data() + self.compress_test() + self.check_integrity_test() + self.uncompress_test() + self.compare_test() + + def prepare_data(self): + # Create a data file composed of: 128kB of random data, then + # 128kB of zeroes, then a repetition of the 1st 128kB of + # random. + self.assertRunOk("dd if=/dev/urandom of=rand.bin bs=128k count=1") + self.assertRunOk("dd if=/dev/zero of=zeroes.bin bs=128k count=1") + self.assertRunOk(f"cat rand.bin zeroes.bin rand.bin > {self.ref_file}") + + # Keep a copy of the reference data since + # compressor/decompressor programs usually unlink source data + # file. + self.assertRunOk(f"cp {self.ref_file} {self.test_file}") + + def compress_test(self): + # Run the compression + self.assertRunOk(f"{self.compress_cmd} {self.test_file}", timeout=self.timeout) + + # Check that the compressed file was created with the expected name + self.assertRunOk(f"test -e {self.comp_test_file}") + + # Remove the input test file. Some compressors (like gzip) are + # removing it automatically by default. Some others (like lz4) + # are keeping those by default. We always remove it to make + # sure a new file will be recreated by the decompression. + self.assertRunOk(f"rm -f {self.test_file}") + + # Check the compressed file is smaller than the input. + # The "ls -l" command is for simplifying debugging + self.assertRunOk(f"ls -l {self.ref_file} {self.comp_test_file}") + ref_sz_cmd = f"wc -c < {self.ref_file}" + comp_sz_cmd = f"wc -c < {self.comp_test_file}" + self.assertRunOk(f"test $({ref_sz_cmd}) -gt $({comp_sz_cmd})") + + def check_integrity_test(self): + # Check the compressed file integrity + self.assertRunOk(f"{self.check_integrity_cmd} {self.comp_test_file}") + + def uncompress_test(self): + # Run the decompression + self.assertRunOk(f"{self.decompress_cmd} {self.comp_test_file}") + + # Check the decompressed file was created with the correct name + self.assertRunOk(f"test -e {self.test_file}") + + def compare_test(self): + # Check the decompressed file is exactly the same as the + # reference created at the beginning + self.assertRunOk(f"cmp {self.test_file} {self.ref_file}") From a1e2d0496b10dab4bd4c66535915af1c6ceb4691 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 6 Jul 2023 21:01:00 +0200 Subject: [PATCH 0975/2890] support/testing/tests/package/test_gzip.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_gzip.py | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 support/testing/tests/package/test_gzip.py diff --git a/DEVELOPERS b/DEVELOPERS index 57c25c4cfdd2..2cf343f9bcd6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1733,6 +1733,7 @@ F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dos2unix.py F: support/testing/tests/package/test_gnupg2.py +F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iperf3.py diff --git a/support/testing/tests/package/test_gzip.py b/support/testing/tests/package/test_gzip.py new file mode 100644 index 000000000000..1d5f37485396 --- /dev/null +++ b/support/testing/tests/package/test_gzip.py @@ -0,0 +1,13 @@ +from tests.package.test_compressor_base import TestCompressorBase + + +class TestGzip(TestCompressorBase): + __test__ = True + config = TestCompressorBase.config + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_GZIP=y + """ + compress_cmd = "gzip" + decompress_cmd = "gunzip" + compressed_file_ext = ".gz" From 1fcc0dcb00f7beea417b29614b61cae413a20767 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 6 Jul 2023 21:01:01 +0200 Subject: [PATCH 0976/2890] support/testing/tests/package/test_bzip2.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_bzip2.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 support/testing/tests/package/test_bzip2.py diff --git a/DEVELOPERS b/DEVELOPERS index 2cf343f9bcd6..9b73b725b6ec 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1728,6 +1728,7 @@ F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_hwdata.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_bzip2.py F: support/testing/tests/package/test_compressor_base.py F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ diff --git a/support/testing/tests/package/test_bzip2.py b/support/testing/tests/package/test_bzip2.py new file mode 100644 index 000000000000..4b7ae8180faf --- /dev/null +++ b/support/testing/tests/package/test_bzip2.py @@ -0,0 +1,12 @@ +from tests.package.test_compressor_base import TestCompressorBase + + +class TestBzip2(TestCompressorBase): + __test__ = True + config = TestCompressorBase.config + \ + """ + BR2_PACKAGE_BZIP2=y + """ + compress_cmd = "bzip2" + decompress_cmd = "bunzip2" + compressed_file_ext = ".bz2" From 665303586a1eddd08f44bfce2239a68e0c593810 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 6 Jul 2023 21:01:02 +0200 Subject: [PATCH 0977/2890] support/testing/tests/package/test_xz.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_xz.py | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 support/testing/tests/package/test_xz.py diff --git a/DEVELOPERS b/DEVELOPERS index 9b73b725b6ec..0918e9f7217a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1759,6 +1759,7 @@ F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_stress_ng.py +F: support/testing/tests/package/test_xz.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ diff --git a/support/testing/tests/package/test_xz.py b/support/testing/tests/package/test_xz.py new file mode 100644 index 000000000000..7776c1608fab --- /dev/null +++ b/support/testing/tests/package/test_xz.py @@ -0,0 +1,10 @@ +from tests.package.test_compressor_base import TestCompressorBase + + +class TestXz(TestCompressorBase): + __test__ = True + config = TestCompressorBase.config + \ + """ + BR2_PACKAGE_XZ=y + """ + compress_cmd = "xz" From c2d37c58f274ae25b963fec53aa2d5a057527af5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 5 Jul 2023 18:10:42 +0200 Subject: [PATCH 0978/2890] package/ffmpeg: mmal is not available on aarch64 Fixes: http://autobuild.buildroot.net/results/aa5/aa589b38e1591a0ec4d400891bf86f5138cf4542/ For details see: https://lists.buildroot.org/pipermail/buildroot/2023-July/669839.html https://github.com/raspberrypi/userland/issues/688 Reported-by: Guillermo G Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 59e13b503e82..9d9209706a3b 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -282,9 +282,14 @@ FFMPEG_CONF_OPTS += --disable-vdpau endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \ +FFMPEG_CONF_OPTS += --enable-omx --enable-omx-rpi \ --extra-cflags=-I$(STAGING_DIR)/usr/include/IL FFMPEG_DEPENDENCIES += rpi-userland +ifeq ($(BR2_arm),y) +FFMPEG_CONF_OPTS += --enable-mmal +else +FFMPEG_CONF_OPTS += --disable-mmal +endif else FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi endif From c8cc28b5ced34677a39de8e7bcc9a96d6e8df9fe Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 5 Jul 2023 18:20:11 +0200 Subject: [PATCH 0979/2890] package/ffmpeg: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccw5V2Ti.s: Assembler messages: /tmp/ccw5V2Ti.s:2013: Error: selected processor does not support `itt gt' in Thumb mode /tmp/ccw5V2Ti.s:2014: Error: Thumb does not support conditional execution /tmp/ccw5V2Ti.s:2015: Error: Thumb does not support conditional execution /tmp/ccw5V2Ti.s:2017: Error: selected processor does not support `it le' in Thumb mode /tmp/ccw5V2Ti.s:2018: Error: Thumb does not support conditional execution /tmp/ccw5V2Ti.s:2020: Error: selected processor does not support `it gt' in Thumb mode /tmp/ccw5V2Ti.s:2021: Error: Thumb does not support conditional execution Fixes: http://autobuild.buildroot.net/results/3fc/3fc68f756cf1661673941c411c4a2477e901e361/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 9d9209706a3b..ce285bcc60ff 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -554,6 +554,10 @@ FFMPEG_CONF_OPTS += --disable-optimizations FFMPEG_CFLAGS += -O0 endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +FFMPEG_CFLAGS += -marm +endif + FFMPEG_CONF_ENV += CFLAGS="$(FFMPEG_CFLAGS)" FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF)) From 18a6d6db685e939cb42cb66755668e8f91bc6340 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 8 Jul 2023 17:03:22 +0200 Subject: [PATCH 0980/2890] package/igh-ethercat: bump to latest Git commit Removed_POST_PATCH_HOOKS, not needed anymore due to upstream commit https://gitlab.com/etherlab.org/ethercat/-/commit/3bc8703f5cf021d21730cd3ac3da839973b914e9 This bump will only fix kernel 6.3-related build errors by upstream commit https://gitlab.com/etherlab.org/ethercat/-/commit/e35f35b25c43b9f6fa967b2ae92462034a14bc8d Fixes: http://autobuild.buildroot.net/results/ffc/ffc00cc9f949bfc692edc287867ca1e3c86edea1/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/igh-ethercat/igh-ethercat.hash | 2 +- package/igh-ethercat/igh-ethercat.mk | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package/igh-ethercat/igh-ethercat.hash b/package/igh-ethercat/igh-ethercat.hash index 88548bf23ea5..67a152c6ae83 100644 --- a/package/igh-ethercat/igh-ethercat.hash +++ b/package/igh-ethercat/igh-ethercat.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 eb13a0f7f073ad54589c4f41829d9e995b37b26fbc7fcd05e3adb5e201e6feb4 igh-ethercat-2e2cef6131895336f87c57c18fe78ae01a90d3de.tar.gz +sha256 7e4d8f3497c0bc0b64a151c0d074349fe7614767563642d6fedb19567eafa1e1 igh-ethercat-f5dc109176400f540a8682a2c9ee20d411d14d61.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk index 1041ba0758a5..5b618ab54a6a 100644 --- a/package/igh-ethercat/igh-ethercat.mk +++ b/package/igh-ethercat/igh-ethercat.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGH_ETHERCAT_VERSION = 2e2cef6131895336f87c57c18fe78ae01a90d3de +IGH_ETHERCAT_VERSION = f5dc109176400f540a8682a2c9ee20d411d14d61 IGH_ETHERCAT_SITE = $(call gitlab,etherlab.org,ethercat,$(IGH_ETHERCAT_VERSION)) IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPL-2.1 (libraries) IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER @@ -22,11 +22,5 @@ IGH_ETHERCAT_CONF_OPTS = \ $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000E),--enable-e1000e,--disable-e1000e) \ $(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169) -# Needed to make autoreconf happy -define IGH_ETHERCAT_CREATE_CHANGELOG - touch $(@D)/ChangeLog -endef -IGH_ETHERCAT_POST_PATCH_HOOKS += IGH_ETHERCAT_CREATE_CHANGELOG - $(eval $(kernel-module)) $(eval $(autotools-package)) From 8d2a51dc8de7fc1072e1f7b1923d45d4f4694175 Mon Sep 17 00:00:00 2001 From: Alexander Sverdlin Date: Fri, 7 Jul 2023 00:26:07 +0200 Subject: [PATCH 0981/2890] linux: add support for vendor dirs for appended DTBs Take the basename of the appended DTBs to workaround the following problem: (cd .../arch/arm/boot; for dtb in cirrus/ep93xx-edb9302 do if test -e ${dtb}.dtb ; then dtbpath=${dtb}.dtb else dtbpath=dts/${dtb}.dtb ; fi cat zImage ${dtbpath} > zImage.${dtb} || exit 1; done) /bin/sh: line 1: zImage.cirrus/ep93xx-edb9302: No such file or directory Necessary to support ARM Linux starting from commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories"), i.e. Linux v6.4+. Signed-off-by: Alexander Sverdlin Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 1c4fe45ac945..1db5c6046d49 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -468,7 +468,7 @@ define LINUX_APPEND_DTB else \ dtbpath=dts/$${dtb}.dtb ; \ fi ; \ - cat zImage $${dtbpath} > zImage.$${dtb} || exit 1; \ + cat zImage $${dtbpath} > zImage.$$(basename $${dtb}) || exit 1; \ done) endef ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y) From 8ebfce3c70df968fb5c3b9f5c1f9ba5f904cf630 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Jul 2023 22:46:10 +0200 Subject: [PATCH 0982/2890] package/ocf-linux: remove package Fixes: http://autobuild.buildroot.net/results/88b/88b5d14b315af1669fff04f8c11c321cc4c107c7/ The package seems to be unmaintainted, asking for support of kernels >= 5.6 a year ago was unanswered: https://sourceforge.net/p/ocf-linux/mailman/message/37662698/ This patch follow Thomas' suggestion to remove the package: https://lists.buildroot.org/pipermail/buildroot/2022-November/654688.html Remove the virtual package cryptodev which is not needed anymore. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 +++ package/Config.in | 2 +- package/cryptodev-linux/Config.in | 14 ++++++ package/cryptodev-linux/cryptodev-linux.mk | 2 - package/cryptodev/Config.in | 50 ---------------------- package/cryptodev/cryptodev.mk | 7 --- package/libopenssl/libopenssl.mk | 6 +-- package/ocf-linux/ocf-linux.hash | 2 - package/ocf-linux/ocf-linux.mk | 26 ----------- package/openswan/openswan.mk | 3 -- 10 files changed, 24 insertions(+), 94 deletions(-) create mode 100644 package/cryptodev-linux/Config.in delete mode 100644 package/cryptodev/Config.in delete mode 100644 package/cryptodev/cryptodev.mk delete mode 100644 package/ocf-linux/ocf-linux.hash delete mode 100644 package/ocf-linux/ocf-linux.mk diff --git a/Config.in.legacy b/Config.in.legacy index 7184d0a8b9c3..9cf138f42950 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -152,6 +152,12 @@ config BR2_PACKAGE_LIBASPLIB help libasplib is no longer needed. +config BR2_PACKAGE_OCF_LINUX + bool "ocf-linux has been removed" + select BR2_LEGACY + help + ocf-linux is incompatible with newer kernels. + config BR2_BINUTILS_VERSION_2_37_X bool "binutils 2.37.x has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index c9d5c9ccaa5c..e6ed56a8112d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1473,7 +1473,7 @@ menu "Crypto" source "package/beecrypt/Config.in" source "package/botan/Config.in" source "package/ca-certificates/Config.in" - source "package/cryptodev/Config.in" + source "package/cryptodev-linux/Config.in" source "package/cryptopp/Config.in" source "package/gcr/Config.in" source "package/gnutls/Config.in" diff --git a/package/cryptodev-linux/Config.in b/package/cryptodev-linux/Config.in new file mode 100644 index 000000000000..89964ab0587c --- /dev/null +++ b/package/cryptodev-linux/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_CRYPTODEV_LINUX + bool "cryptodev-linux" + depends on !BR2_microblaze + depends on BR2_LINUX_KERNEL + help + Cryptodev-linux is a device that allows access to Linux kernel + cryptographic drivers; thus allowing userspace applications + to take advantage of hardware accelerators. + + http://cryptodev-linux.org/index.html + +comment "cryptodev-linux needs a Linux kernel to be built" + depends on !BR2_microblaze + depends on !BR2_LINUX_KERNEL diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk index d0c3bc5218e4..5a9e6ad233ee 100644 --- a/package/cryptodev-linux/cryptodev-linux.mk +++ b/package/cryptodev-linux/cryptodev-linux.mk @@ -11,8 +11,6 @@ CRYPTODEV_LINUX_LICENSE = GPL-2.0+ CRYPTODEV_LINUX_LICENSE_FILES = COPYING CRYPTODEV_LINUX_CPE_ID_VENDOR = cryptodev-linux -CRYPTODEV_LINUX_PROVIDES = cryptodev - define CRYPTODEV_LINUX_MODULE_GEN_VERSION_H $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) version.h endef diff --git a/package/cryptodev/Config.in b/package/cryptodev/Config.in deleted file mode 100644 index d1e64498a848..000000000000 --- a/package/cryptodev/Config.in +++ /dev/null @@ -1,50 +0,0 @@ -comment "cryptodev needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_CRYPTODEV - bool "cryptodev" - depends on BR2_LINUX_KERNEL - help - Select the desired cryptodev implementation. - -if BR2_PACKAGE_CRYPTODEV - -choice - prompt "cryptodev variant" - default BR2_PACKAGE_CRYPTODEV_LINUX if !BR2_microblaze - help - Select the cryptodev implementation. - -config BR2_PACKAGE_CRYPTODEV_LINUX - bool "cryptodev-linux" - depends on !BR2_microblaze - select BR2_PACKAGE_HAS_CRYPTODEV - help - Cryptodev-linux is a device that allows access to Linux kernel - cryptographic drivers; thus allowing userspace applications - to take advantage of hardware accelerators. - - http://cryptodev-linux.org/index.html - -config BR2_PACKAGE_OCF_LINUX - bool "ocf-linux" - select BR2_PACKAGE_HAS_CRYPTODEV - help - OCF-Linux is a Linux port of the OpenBSD/FreeBSD Cryptographic - Framework (OCF). This port aims to bring full asynchronous - HW/SW crypto acceleration to the Linux kernel and applications - running under Linux. - - http://ocf-linux.sourceforge.net/ - -endchoice - -config BR2_PACKAGE_HAS_CRYPTODEV - bool - -config BR2_PACKAGE_PROVIDES_CRYPTODEV - string - default "cryptodev-linux" if BR2_PACKAGE_CRYPTODEV_LINUX - default "ocf-linux" if BR2_PACKAGE_OCF_LINUX - -endif diff --git a/package/cryptodev/cryptodev.mk b/package/cryptodev/cryptodev.mk deleted file mode 100644 index 969d1bd17a9c..000000000000 --- a/package/cryptodev/cryptodev.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# cryptodev -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 178979f43b1f..cd3ba3df3085 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -29,8 +29,8 @@ ifeq ($(BR2_USE_MMU),) LIBOPENSSL_CFLAGS += -DHAVE_FORK=0 -DOPENSSL_NO_MADVISE endif -ifeq ($(BR2_PACKAGE_HAS_CRYPTODEV),y) -LIBOPENSSL_DEPENDENCIES += cryptodev +ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) +LIBOPENSSL_DEPENDENCIES += cryptodev-linux endif # fixes the following build failures: @@ -76,7 +76,7 @@ define LIBOPENSSL_CONFIGURE_CMDS $(if $(BR2_TOOLCHAIN_HAS_LIBATOMIC),-latomic) \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \ $(if $(BR2_STATIC_LIBS),no-shared,shared) \ - $(if $(BR2_PACKAGE_HAS_CRYPTODEV),enable-devcryptoeng) \ + $(if $(BR2_PACKAGE_CRYPTODEV_LINUX),enable-devcryptoeng) \ no-rc5 \ enable-camellia \ no-tests \ diff --git a/package/ocf-linux/ocf-linux.hash b/package/ocf-linux/ocf-linux.hash deleted file mode 100644 index 747bbcab56cf..000000000000 --- a/package/ocf-linux/ocf-linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 3d7984754d58ced5695889744caf1e18a53f5d2e35ed40cc04d3595e59b7431f ocf-linux-20171122.tar.gz diff --git a/package/ocf-linux/ocf-linux.mk b/package/ocf-linux/ocf-linux.mk deleted file mode 100644 index 52169eda4ffa..000000000000 --- a/package/ocf-linux/ocf-linux.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# ocf-linux -# -################################################################################ - -OCF_LINUX_VERSION = 20171122 -OCF_LINUX_SITE = http://downloads.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION) -OCF_LINUX_INSTALL_STAGING = YES - -OCF_LINUX_PROVIDES = cryptodev - -OCF_LINUX_MODULE_SUBDIRS = ocf -OCF_LINUX_MODULE_MAKE_OPTS = \ - CONFIG_OCF_OCF=m \ - CONFIG_OCF_CRYPTOSOFT=m \ - CONFIG_OCF_BENCH=m \ - CONFIG_OCF_OCFNULL=m - -define OCF_LINUX_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 644 $(@D)/ocf/cryptodev.h \ - $(STAGING_DIR)/usr/include/crypto/cryptodev.h -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index bb56e4516c76..4c6a779f0da5 100644 --- a/package/openswan/openswan.mk +++ b/package/openswan/openswan.mk @@ -25,9 +25,6 @@ endif ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENSWAN_DEPENDENCIES += openssl OPENSWAN_MAKE_OPTS += HAVE_OPENSSL=true -ifeq ($(BR2_PACKAGE_OCF_LINUX),y) -OPENSWAN_MAKE_OPTS += HAVE_OCF=true -endif endif define OPENSWAN_BUILD_CMDS From 947cf4125e87eaa193de37d3a3fc5fcb885ad531 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Jul 2023 22:46:11 +0200 Subject: [PATCH 0983/2890] package/cryptodev-linux: bump version to 1.13 Changelog: https://github.com/cryptodev-linux/cryptodev-linux/blob/master/NEWS "* Fix compilation issues against Linux kernel 6.3" Fixes: http://autobuild.buildroot.net/results/9b9/9b9ad744d8a37fc46726461551a2dcb3c26a1341/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/cryptodev-linux/cryptodev-linux.hash | 2 +- package/cryptodev-linux/cryptodev-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptodev-linux/cryptodev-linux.hash b/package/cryptodev-linux/cryptodev-linux.hash index d649e8934ae1..300aa3bcd423 100644 --- a/package/cryptodev-linux/cryptodev-linux.hash +++ b/package/cryptodev-linux/cryptodev-linux.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f51c2254749233b1b1d7ec9445158bd709f124f88e1c650fe2faac83c3a81938 cryptodev-linux-1.12.tar.gz +sha256 33b7915c46eb39a37110e88c681423c0dd0df25d784b6e1475ac3196367f0db5 cryptodev-linux-1.13.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk index 5a9e6ad233ee..580ea89520fa 100644 --- a/package/cryptodev-linux/cryptodev-linux.mk +++ b/package/cryptodev-linux/cryptodev-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTODEV_LINUX_VERSION = 1.12 +CRYPTODEV_LINUX_VERSION = 1.13 CRYPTODEV_LINUX_SITE = $(call github,cryptodev-linux,cryptodev-linux,cryptodev-linux-$(CRYPTODEV_LINUX_VERSION)) CRYPTODEV_LINUX_INSTALL_STAGING = YES CRYPTODEV_LINUX_LICENSE = GPL-2.0+ From 7690f005e0540f888fa4333c2b93fee8f8ad2654 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 11 Jul 2023 23:31:24 +0200 Subject: [PATCH 0984/2890] package/rtl8189es: bump version to 2023-07-08 This version fixes a wrong patching for Linux 6.1 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8189es/rtl8189es.hash | 2 +- package/rtl8189es/rtl8189es.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash index 64f6158654f7..4668c3832caf 100644 --- a/package/rtl8189es/rtl8189es.hash +++ b/package/rtl8189es/rtl8189es.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 05d839c9b7820008bf7975c2f4a3dde6265dbae0c5dc48cefcee3a79492dc377 rtl8189es-ae7b31e55526ca0e01d2a3310118530bff4f1055.tar.gz +sha256 0d59e75977a43e614c87e783d7af9d89b84063d8d0d1926820af427eacd01837 rtl8189es-05996691a5f3a61968a83f8b368454fd2c6885ca.tar.gz diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk index a40f656d3ea9..e7bc915c7991 100644 --- a/package/rtl8189es/rtl8189es.mk +++ b/package/rtl8189es/rtl8189es.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189ES_VERSION = ae7b31e55526ca0e01d2a3310118530bff4f1055 +RTL8189ES_VERSION = 05996691a5f3a61968a83f8b368454fd2c6885ca RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION)) RTL8189ES_LICENSE = GPL-2.0 From ee2f9c920ab33d23e07e439f440d549eb1bb4e09 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 11 Jul 2023 23:31:25 +0200 Subject: [PATCH 0985/2890] package/rtl8189fs: bump version to 2023-07-08 This version fixes a wrong patching for Linux 6.1 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index 95a031b6f298..377812fba810 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5d8aad48b8d124a313e5b8182c5dba2b94ecdbac2a9f1861a50c081b9034a543 rtl8189fs-c223a25b1000d64432eca4201a8f012414dfc7ce.tar.gz +sha256 9ff7aa9ee8cd7a8f386531d3b009e7bcbce1ff71bb676c187c40e538755eb8b5 rtl8189fs-75a566a830037c7d1309c5a9fe411562772a1cf2.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index dd35a166e539..ca8ea15c035a 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = c223a25b1000d64432eca4201a8f012414dfc7ce +RTL8189FS_VERSION = 75a566a830037c7d1309c5a9fe411562772a1cf2 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 From 21764235cb7f7fb767ea4b5d825e39c711aee235 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 11:30:42 +0200 Subject: [PATCH 0986/2890] package/{libuv, uvw}: bump to versions 1.45.0, 3.1.0_libuv_v1.45 Updated license hashes due to upstream commits: - various cleanups, parts of old license file was moved to LICENSE-extra https://github.com/libuv/libuv/commits/v1.x/LICENSE - copyright year bump https://github.com/skypjack/uvw/commit/68803053f42bb3b0e139a984837a5539e5da7fe6 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libuv/libuv.hash | 5 +++-- package/libuv/libuv.mk | 4 ++-- package/uvw/uvw.hash | 4 ++-- package/uvw/uvw.mk | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index b0fa0ff5be27..3ca184feaf9f 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da libuv-1.44.2.tar.gz -sha256 95b8b163c60d17cfce3cef61a2d8a9cf70137502c8fb5f3d93cd2fc529fa98c8 LICENSE +sha256 458e34d5ef7f3c0394a2bfd8c39d757cb1553baa5959b9b4b45df63aa027a228 libuv-1.45.0.tar.gz +sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE +sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index c169b76a6a26..640c5bb1cee7 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,13 +6,13 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.44.2 +LIBUV_VERSION = 1.45.0 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES LIBUV_AUTORECONF = YES LIBUV_LICENSE = BSD-2-Clause, BSD-3-Clause, ISC, MIT -LIBUV_LICENSE_FILES = LICENSE +LIBUV_LICENSE_FILES = LICENSE LICENSE-extra LIBUV_CPE_ID_VENDOR = libuv # Upstream needs tests to be run sequentially. This is the default in diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index a0c74bbe052d..8e54ea7d60a1 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3460842778e91e7d2fae4201e49e4521e9d94fbbf3891ae6c52d3c9fc0673598 uvw-2.12.1_libuv_v1.44.tar.gz -sha256 1e3b8fb895c0396aaa2138ff82c02968524e220645b21b0a4ac765858a898732 LICENSE +sha256 0a612bd243150fbbe1365cdaf48203d32061c1d14f93825a31876b183922f93b uvw-3.1.0_libuv_v1.45.tar.gz +sha256 e2a4062818ab05e2a0908737ad49b7c01202247364e900167ac81105de8713f3 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index b6c2135d6f0e..364a2eded481 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.12.1_libuv_v1.44 +UVW_VERSION = 3.1.0_libuv_v1.45 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO From 314f62eda347ba02b4688ac94c6bab55b4a4d6c9 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 10 Jun 2023 05:08:17 -0700 Subject: [PATCH 0987/2890] package/docker-engine: bump version to v24.0.2 v24.0.0 release notes: https://github.com/moby/moby/releases/tag/v24.0.0 https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A24.0.0 v24.0.1 patch release notes: https://github.com/moby/moby/releases/tag/v24.0.1 https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A24.0.1 v24.0.2 patch release notes: https://github.com/moby/moby/releases/tag/v24.0.2 https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A24.0.2 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 092ec989cf5c..b6729ab6602a 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f502eba135828ae52cefb12f1c74092c8865e39cb94f5daed0f3f6717a8d50a3 docker-engine-23.0.5.tar.gz +sha256 f4bc7d7cc2ee3671371ae80fd624e61f0598e614b5c235012581f8ec1d593aa0 docker-engine-24.0.2.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index f904793aa2f6..8127689e9e28 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 23.0.5 +DOCKER_ENGINE_VERSION = 24.0.2 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From b6742f533ab0de72854cf2063a6bbd79e598ef2c Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 10 Jun 2023 05:08:18 -0700 Subject: [PATCH 0988/2890] package/docker-cli: bump version to v24.0.1 v24.0.0 release notes: https://github.com/moby/moby/releases/tag/v24.0.0 https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A24.0.0 v24.0.1 patch release notes: https://github.com/moby/moby/releases/tag/v24.0.1 https://github.com/docker/cli/releases/tag/v24.0.1 https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A24.0.1 v24.0.2 patch release notes: https://github.com/moby/moby/releases/tag/v24.0.2 https://github.com/docker/cli/releases/tag/v24.0.2 https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A24.0.2 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index e9e9a18cb1ce..dd5d59827855 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2d6599783d447ac56d4caa482e9d8f09ad9e6f91ba2be6707bc107be04f89ddd docker-cli-23.0.5.tar.gz +sha256 632357aa58d7f5e16ce87dbd73641c5f65c25b6501e3917ac4f0ce553a01e0bc docker-cli-24.0.2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 522971ac9879..ddd3e7bf91f9 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 23.0.5 +DOCKER_CLI_VERSION = 24.0.2 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From e3d97f52bf589815e97bb397b7e8f0ff9f6585ed Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 5 Jul 2023 16:30:23 +0200 Subject: [PATCH 0989/2890] support/testing: test_edk2: bump ATF version to 2.9 for binutils 2.39+ support Following the toolchain-external-arm-aarch64 bump to version 12.2-rel1 by commit [1], binutils 2.39 is now provided by the toolchain. This new binutils version break the ATF build due to new linker warnings as reported by the EDK2 test: ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions From [2] "Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces of a new warning when linking the bl*.elf in the form: ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions These new warnings are enbaled by default to secure elf binaries: - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 " Bump the ATF custom version to 2.9 for binutils 2.39+ support. [1] 90404e84c1c9d65b4f38cc3ebc30ef6a4da314cb [2] https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4581325484 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/boot/test_edk2.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py index 623e77e99252..16fa10f8c903 100644 --- a/support/testing/tests/boot/test_edk2.py +++ b/support/testing/tests/boot/test_edk2.py @@ -24,6 +24,8 @@ class TestEdk2(infra.basetest.BRTest): BR2_TARGET_GRUB2=y BR2_TARGET_GRUB2_ARM64_EFI=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_PACKAGE_HOST_GENIMAGE=y From bb3273ba9bec6b45f94edab9a83646f1363444b4 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 11 Jun 2023 13:57:47 +0200 Subject: [PATCH 0990/2890] support/testing: TestGlxinfo: bump kernel version to 6.1.x The kernel 6.1.x is the latest LTS version. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_glxinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py index 79be596635b8..c7d62a690bee 100644 --- a/support/testing/tests/package/test_glxinfo.py +++ b/support/testing/tests/package/test_glxinfo.py @@ -20,7 +20,7 @@ class TestGlxinfo(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" BR2_PACKAGE_MESA3D_DEMOS=y From 876ad67ac07be4b7900a4ea6464e7459e2b40604 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 11 Jun 2023 13:57:48 +0200 Subject: [PATCH 0991/2890] support/testing: TestGlxinfo: bump the toolchain to x86 core2 Bootlin toolchain stable 2022.08-1 This new Bootlin toolchain stable 2022.08-1 is based on gcc 11.3.0, linux headers 4.9.327, glibc 2.35 and binutils 2.38. Nowadays Bootlin toolchains are packaged in Buildroot and we can directly select them from BASIC_TOOLCHAIN_CONFIG and avoid setting the toolchain parameters (BR2_TOOLCHAIN_EXTERNAL_CUSTOM...). Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_glxinfo.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py index c7d62a690bee..6bedee52983a 100644 --- a/support/testing/tests/package/test_glxinfo.py +++ b/support/testing/tests/package/test_glxinfo.py @@ -10,14 +10,8 @@ class TestGlxinfo(infra.basetest.BRTest): """ BR2_x86_core2=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y - BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y - BR2_TOOLCHAIN_EXTERNAL_URL="http://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2018.11-1.tar.bz2" - BR2_TOOLCHAIN_EXTERNAL_GCC_8=y - BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y - BR2_TOOLCHAIN_EXTERNAL_CXX=y - BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y - BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" From d7f3b78979308d1ec8776a20ba2654da566e922d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 12 Jul 2023 19:13:42 +0200 Subject: [PATCH 0992/2890] package/mesa3d-demos: fix glx-detection without glvnd Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4621046326 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...eson-fix-glx-detection-without-glvnd.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/mesa3d-demos/0002-meson-fix-glx-detection-without-glvnd.patch diff --git a/package/mesa3d-demos/0002-meson-fix-glx-detection-without-glvnd.patch b/package/mesa3d-demos/0002-meson-fix-glx-detection-without-glvnd.patch new file mode 100644 index 000000000000..37a60efdd726 --- /dev/null +++ b/package/mesa3d-demos/0002-meson-fix-glx-detection-without-glvnd.patch @@ -0,0 +1,47 @@ +From e16117fc92688d76a042ad2c590c77d5a987a4ac Mon Sep 17 00:00:00 2001 +From: Erik Faye-Lund +Date: Fri, 24 Mar 2023 13:31:58 +0100 +Subject: [PATCH] meson: fix glx-detection without glvnd + +When build without GLVND, Mesa provides GLX as a part of libGL, just +like XQuartz does on MacOS. There's nothing really macOS specific about +this fallback, so let's drop the condition. + +And just for good measure, let's add in dep_gl as a dependency for +the header-check here, in case some one decides to install libGL outside +of the default include directory. + +Fixes: 34300551 ("meson: explicitly check for glx dependency") +Closes: https://gitlab.freedesktop.org/mesa/demos/-/issues/36 +Reviewed-by: Hoe Hao Cheng + +Upstream: https://gitlab.freedesktop.org/mesa/demos/-/commit/e16117fc92688d76a042ad2c590c77d5a987a4ac + +Signed-off-by: Bernd Kuhls +--- + meson.build | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index c1853f94..bc3278e1 100644 +--- a/meson.build ++++ b/meson.build +@@ -99,10 +99,11 @@ if not dep_glu.found() and host_machine.system() != 'darwin' + endif + + dep_glx = dependency('glx', required: false, disabler : true) +-if not dep_glx.found() and host_machine.system() == 'darwin' +- # xquartz doesn't have a glx.pc, but it does have the header. And all the +- # symbols reside in libGL, so let's just use that. +- if cc.check_header('GL/glx.h', dependencies: dep_x11) ++if not dep_glx.found() ++ # Both Mesa build without GLVND and XQuartz lacks a glx.pc, but does ++ # provide the header. And all the symbols reside in libGL, so let's ++ # just use that. ++ if cc.check_header('GL/glx.h', dependencies: [dep_x11, dep_gl]) + dep_glx = dep_gl + endif + endif +-- +GitLab + From 08eb63dfdf45885830a0bcedf94c4e1d40231a25 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 12 Jul 2023 19:46:54 +0200 Subject: [PATCH 0993/2890] configs/olimex_stmp157: bump Linux and U-Boot Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- configs/olimex_stmp157_olinuxino_lime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index 3b56fefeca1c..dc726359a0d1 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -17,8 +17,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/OLIMEX/linux-olimex.git" -# branch release-20230217-v5.10.105 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c5a31724bdfaac894553b51c5a0fb92c1f10f3db" +# branch release-20230622-v5.10.180 +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fc74113e14d76aea9482264ff42e07397b94553d" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/stmp1_olinuxino/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -35,8 +35,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" -# release-20230110, based on 2021.04 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="9a49a20f71c698f538defbb69a6c6cb657d4315f" +# release-20230515, based on 2021.04 +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="efadf793a0a5924e2c96362dc1df3e56622ebb97" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y From 13cdadb317c8b489b3dfd6c75aa0018f033c29bf Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 9 Jun 2023 18:20:11 +0200 Subject: [PATCH 0994/2890] package/perl-data-optlist: bump to version 0.114 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-data-optlist/perl-data-optlist.hash | 6 +++--- package/perl-data-optlist/perl-data-optlist.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-data-optlist/perl-data-optlist.hash b/package/perl-data-optlist/perl-data-optlist.hash index ccc05ae4d6d3..6d55d6388d4f 100644 --- a/package/perl-data-optlist/perl-data-optlist.hash +++ b/package/perl-data-optlist/perl-data-optlist.hash @@ -1,6 +1,6 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 cda08370c4058ba56e40c2f21d94d233 Data-OptList-0.113.tar.gz -sha256 36aebc5817b7d4686b649434c2ee41f45c8bf97d4ca5a99f607cc40f695a4285 Data-OptList-0.113.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 d63ec5d446eff1aaa5ba92bc13a52b77 Data-OptList-0.114.tar.gz +sha256 9fd1093b917a21fb79ae1607db53d113b4e0ad8fe0ae776cb077a7e50044fdf3 Data-OptList-0.114.tar.gz # computed by scancpan sha256 712f3e40537810ba3046533fd71d877f69ab446d5e8e8a1135771804494b8b42 LICENSE diff --git a/package/perl-data-optlist/perl-data-optlist.mk b/package/perl-data-optlist/perl-data-optlist.mk index 1a9aa05cc99e..8c22cfe78836 100644 --- a/package/perl-data-optlist/perl-data-optlist.mk +++ b/package/perl-data-optlist/perl-data-optlist.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATA_OPTLIST_VERSION = 0.113 +PERL_DATA_OPTLIST_VERSION = 0.114 PERL_DATA_OPTLIST_SOURCE = Data-OptList-$(PERL_DATA_OPTLIST_VERSION).tar.gz PERL_DATA_OPTLIST_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS PERL_DATA_OPTLIST_LICENSE = Artistic or GPL-1.0+ From f2b5dc42abe5da70c09c8bdcb6cf2d5809d569a9 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 9 Jun 2023 18:20:12 +0200 Subject: [PATCH 0995/2890] package/perl-date-manip: bump to version 6.92 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-date-manip/perl-date-manip.hash | 6 +++--- package/perl-date-manip/perl-date-manip.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-date-manip/perl-date-manip.hash b/package/perl-date-manip/perl-date-manip.hash index 9762e7bc6c23..72741e413d12 100644 --- a/package/perl-date-manip/perl-date-manip.hash +++ b/package/perl-date-manip/perl-date-manip.hash @@ -1,6 +1,6 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 f9fe372c7abaf90e9da2ee7c3a4d32ff Date-Manip-6.89.tar.gz -sha256 5caaa9cd1e2b0a1b84124c373e02e89b17c89fdb8fc5bc5f75ac41d304a37617 Date-Manip-6.89.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 3ac4e55802837c396a30860492f33e67 Date-Manip-6.92.tar.gz +sha256 ab962bd39ca09ec6fcfe7e5a6912af71b0c1f6f03e4ed2bef6e4471c9d367a13 Date-Manip-6.92.tar.gz # computed by scancpan sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE diff --git a/package/perl-date-manip/perl-date-manip.mk b/package/perl-date-manip/perl-date-manip.mk index 6eab7790cfa1..8739caefd43b 100644 --- a/package/perl-date-manip/perl-date-manip.mk +++ b/package/perl-date-manip/perl-date-manip.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATE_MANIP_VERSION = 6.89 +PERL_DATE_MANIP_VERSION = 6.92 PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ From 392f88becd87f12c5faf7fe4e3232ba60f50ad1a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 9 Jun 2023 18:20:13 +0200 Subject: [PATCH 0996/2890] package/perl-gd: bump to version 2.77 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-gd/Config.in | 2 +- package/perl-gd/perl-gd.hash | 6 +++--- package/perl-gd/perl-gd.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/perl-gd/Config.in b/package/perl-gd/Config.in index 044e60102137..bff6244d9864 100644 --- a/package/perl-gd/Config.in +++ b/package/perl-gd/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_PERL_GD select BR2_PACKAGE_ZLIB select BR2_PACKAGE_GD help - Perl interface to the gd2 graphics library. + Perl interface to the libgd graphics library. https://metacpan.org/release/GD diff --git a/package/perl-gd/perl-gd.hash b/package/perl-gd/perl-gd.hash index 97f1da821ae0..fd9321be604c 100644 --- a/package/perl-gd/perl-gd.hash +++ b/package/perl-gd/perl-gd.hash @@ -1,6 +1,6 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 fb4bacab10ed4f28d52c2aabdaf866bb GD-2.76.tar.gz -sha256 693d9e3d709e9188a682cb9090a77b70aac12a04e84128677577b94e4331775b GD-2.76.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 da3f969367ea2e6d217ec05d3b98bc6f GD-2.77.tar.gz +sha256 b56c88b8ef3be016ce29bb62dd1f1b6f6b5fbcaa57fea59e9468af6901016fb5 GD-2.77.tar.gz # computed by scancpan sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index cd32c7fb8f84..17c24bc9713a 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_GD_VERSION = 2.76 +PERL_GD_VERSION = 2.77 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd From 199a4d1dd1556878f6d0868ef638baa1607ad3d0 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 9 Jun 2023 18:20:16 +0200 Subject: [PATCH 0997/2890] package/perl-mojolicious: bump to version 9.32 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-mojolicious/perl-mojolicious.hash | 6 +++--- package/perl-mojolicious/perl-mojolicious.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-mojolicious/perl-mojolicious.hash b/package/perl-mojolicious/perl-mojolicious.hash index 989eaf3419d7..6d8f500150e1 100644 --- a/package/perl-mojolicious/perl-mojolicious.hash +++ b/package/perl-mojolicious/perl-mojolicious.hash @@ -1,6 +1,6 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 523193316a839ff56a447f0f0c2e5b36 Mojolicious-9.31.tar.gz -sha256 cb96ccd7a5319321ec6f57633c88bf17193d45169f4d7846da254bb6f9ed8312 Mojolicious-9.31.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 e06ce611dd2444f2ca5b74f3a910b679 Mojolicious-9.32.tar.gz +sha256 bc04c552ee24eaecc45feb8709d49c2901bc26fb82b4a1a8e17574e1cca083dc Mojolicious-9.32.tar.gz # computed by scancpan sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE diff --git a/package/perl-mojolicious/perl-mojolicious.mk b/package/perl-mojolicious/perl-mojolicious.mk index 618327d09d1d..63b02a518169 100644 --- a/package/perl-mojolicious/perl-mojolicious.mk +++ b/package/perl-mojolicious/perl-mojolicious.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_VERSION = 9.31 +PERL_MOJOLICIOUS_VERSION = 9.32 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI PERL_MOJOLICIOUS_LICENSE = Artistic-2.0 From 170c218e4403944eae58bb80cc5cf1d198883a7c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 10 Jun 2023 18:58:12 +0200 Subject: [PATCH 0998/2890] package/perftest: bump to version 23.04.0-0.23 For release note, see: https://github.com/linux-rdma/perftest/releases/tag/23.04.0-0.23 Note: the version scheme changed since the previous version, from "v4.5-0.20" to "23.04.0-0.23" (the "v" was removed). Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/perftest/perftest.hash | 2 +- package/perftest/perftest.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perftest/perftest.hash b/package/perftest/perftest.hash index 4333231c44fc..a9ea10ef4443 100644 --- a/package/perftest/perftest.hash +++ b/package/perftest/perftest.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 32e667dac1c0dd41a3951c5a54b961a8e28db5d9478caea2dfc268a312968c99 perftest-4.5-0.20.tar.gz +sha256 c76f0fd5524a3486c335897357c596d0a6d4f82680f93fc1bc7120670fabd5f9 perftest-23.04.0-0.23.tar.gz sha256 763adb7d5094f2127b026adea8701f042d28d4b1f6fb8b6e828989227a9cf7f5 COPYING diff --git a/package/perftest/perftest.mk b/package/perftest/perftest.mk index 7ad20d0974bb..7101e318aabb 100644 --- a/package/perftest/perftest.mk +++ b/package/perftest/perftest.mk @@ -4,8 +4,8 @@ # ################################################################################ -PERFTEST_VERSION = 4.5-0.20 -PERFTEST_SITE = $(call github,linux-rdma,perftest,v$(PERFTEST_VERSION)) +PERFTEST_VERSION = 23.04.0-0.23 +PERFTEST_SITE = $(call github,linux-rdma,perftest,$(PERFTEST_VERSION)) PERFTEST_LICENSE = GPL-2.0 or BSD-2-Clause PERFTEST_LICENSE_FILES = COPYING PERFTEST_DEPENDENCIES = pciutils rdma-core From 1b52f1e0b0cdd7b54acb63354e12c0e61d1b122f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 10 Jun 2023 18:58:13 +0200 Subject: [PATCH 0999/2890] support/testing: test_perftest: update test kernel to 6.1.33 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_perftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_perftest.py b/support/testing/tests/package/test_perftest.py index 680b70d7841d..08089456c273 100644 --- a/support/testing/tests/package/test_perftest.py +++ b/support/testing/tests/package/test_perftest.py @@ -12,7 +12,7 @@ class TestPerftest(infra.basetest.BRTest): BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.91" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.33" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" From 61d2fd40082b5d4176ade9528e19d03080ab4d19 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 19:08:36 +0200 Subject: [PATCH 1000/2890] package/ntp: bump version to 4.2.8p17 Changelog: https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/NEWS Removed patch 0003, upstream updated autogen to 5.18.16, see Changelog. Removed patch 0004, fixed upstream: https://bugs.ntp.org/show_bug.cgi?id=3741 Use sha256 hash provided by upstream. Updated license hash due to upstream additions to the license text (https://bugs.ntp.org/show_bug.cgi?id=3725) which do not affect the license terms: copyright year updates, list of authors, etc. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 -- package/ntp/0003-override-shell.patch | 20 ----------- ...o-not-use-PTHREAD_STACK_MIN-on-glibc.patch | 33 ------------------- package/ntp/ntp.hash | 9 +++-- package/ntp/ntp.mk | 2 +- 5 files changed, 5 insertions(+), 61 deletions(-) delete mode 100644 package/ntp/0003-override-shell.patch delete mode 100644 package/ntp/0004-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch diff --git a/.checkpackageignore b/.checkpackageignore index c75d0f80d265..52d748fa45c0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1066,8 +1066,6 @@ package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch Upstream package/nss-pam-ldapd/S45nslcd EmptyLastLine Indent Shellcheck Variables package/ntp/0001-nano.patch Upstream package/ntp/0002-ntp-syscalls-fallback.patch Upstream -package/ntp/0003-override-shell.patch Upstream -package/ntp/0004-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch Upstream package/ntp/S49ntp.in Variables package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch Upstream package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch Upstream diff --git a/package/ntp/0003-override-shell.patch b/package/ntp/0003-override-shell.patch deleted file mode 100644 index 0161e6520a0a..000000000000 --- a/package/ntp/0003-override-shell.patch +++ /dev/null @@ -1,20 +0,0 @@ -sntp/libopts/m4/libopts.m4: allow override shell with POSIX_SHELL - -Pull in fix from upstream AutoGen [1] to accept POSIX_SHELL from the -environment during the configure step. - -[1] http://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a252f3ef3d8db25411ea0edb0ff8ea758 - -Signed-off-by: James Byrne - -diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4 ---- a/sntp/libopts/m4/libopts.m4 -+++ b/sntp/libopts/m4/libopts.m4 -@@ -114,6 +114,7 @@ - AC_PROG_SED - [while : - do -+ test -x "$POSIX_SHELL" && break - POSIX_SHELL=`which bash` - test -x "$POSIX_SHELL" && break - POSIX_SHELL=`which dash` diff --git a/package/ntp/0004-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch b/package/ntp/0004-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch deleted file mode 100644 index da03ad4aacce..000000000000 --- a/package/ntp/0004-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 31 Jul 2021 10:51:41 -0700 -Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc - -In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which -could mean different stack sizes at runtime on different architectures -and it also causes compile failure. Default glibc thread stack size -or 64Kb set by ntp should be good in glibc these days. - -Signed-off-by: Khem Raj -[Copied from https://github.com/openembedded/meta-openembedded/blob/master/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch] -Signed-off-by: Alexey Brodkin ---- - libntp/work_thread.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libntp/work_thread.c b/libntp/work_thread.c -index 03a5647..3ddd751 100644 ---- a/libntp/work_thread.c -+++ b/libntp/work_thread.c -@@ -41,7 +41,7 @@ - #ifndef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE (64U * 1024) - #endif --#ifndef __sun -+#if !defined(__sun) && !defined(__GLIBC__) - #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN - # undef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN --- -2.32.0 - diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash index 3c2f6a95a798..96e21bf2df76 100644 --- a/package/ntp/ntp.hash +++ b/package/ntp/ntp.hash @@ -1,5 +1,4 @@ -# From http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p15.tar.gz.md5 -md5 e1e6b23d2fc75cced41801dbcd6c2561 ntp-4.2.8p15.tar.gz -# Calculated based on the hash above -sha256 f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19 ntp-4.2.8p15.tar.gz -sha256 957e6a13445cc61ab1ca3dc80d8c269cf9b0a6d9eaec20f9f39639b0b3e66ee8 COPYRIGHT +# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2.8p17.tar.gz.sha256 +sha256 103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866 ntp-4.2.8p17.tar.gz +# Locally computed +sha256 06246b8c15ccc1a1873c78525c810f0802e68f383e79ee041e06d1ab9cbf80a4 COPYRIGHT diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 96b099d5b18e..e64f6308ecea 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -6,7 +6,7 @@ NTP_VERSION_MAJOR = 4.2 NTP_VERSION_MINOR = 8 -NTP_VERSION_POINT = 15 +NTP_VERSION_POINT = 17 NTP_VERSION = $(NTP_VERSION_MAJOR).$(NTP_VERSION_MINOR)p$(NTP_VERSION_POINT) NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent From 3c337d25c05951b9bc8858b568203078e008d882 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 19:11:24 +0200 Subject: [PATCH 1001/2890] package/opus: bump version to 1.4 Release notes: https://opus-codec.org/release/stable/2023/04/20/libopus-1_4.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/opus/opus.hash | 2 +- package/opus/opus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opus/opus.hash b/package/opus/opus.hash index 2365e47c7d91..7569ee08d1fc 100644 --- a/package/opus/opus.hash +++ b/package/opus/opus.hash @@ -1,5 +1,5 @@ # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt -sha256 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz +sha256 c9b32b4253be5ae63d1ff16eea06b94b5f0f2951b7a02aceef58e3a3ce49c51f opus-1.4.tar.gz # Hash for license file sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 COPYING diff --git a/package/opus/opus.mk b/package/opus/opus.mk index d8e0623e153a..15531b521af8 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPUS_VERSION = 1.3.1 +OPUS_VERSION = 1.4 OPUS_SITE = https://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3-Clause OPUS_LICENSE_FILES = COPYING From fb4cf1cbe8f83df4811b71fb9c5ff567b5c68924 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 12 Jul 2023 01:03:35 -0600 Subject: [PATCH 1002/2890] package/icu: bump to version 73-2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/icu/icu.hash | 2 +- package/icu/icu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/icu/icu.hash b/package/icu/icu.hash index 77d5a9269c34..0948bf495e9c 100644 --- a/package/icu/icu.hash +++ b/package/icu/icu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a457431de164b4aa7eca00ed134d00dfbf88a77c6986a10ae7774fc076bb8c45 icu4c-73_1-src.tgz +sha256 818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1 icu4c-73_2-src.tgz sha256 f3005e195ff74d8812cc1f182a1c446fab678d70a10e3dada497585befee5416 LICENSE diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 96ac5cef6114..d4be2e4e8f3c 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -7,7 +7,7 @@ # Git tags (and therefore versions on release-monitoring.org) use the # XX-Y format, but the tarballs are named XX_Y and the containing # directories XX.Y. -ICU_VERSION = 73-1 +ICU_VERSION = 73-2 ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) From a3bb5d03060e2a818d8ee7c32490c09a38d41e29 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 12 Jul 2023 00:45:57 -0600 Subject: [PATCH 1003/2890] package/zxing-cpp: bump to version 2.1.0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/zxing-cpp/zxing-cpp.hash | 2 +- package/zxing-cpp/zxing-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zxing-cpp/zxing-cpp.hash b/package/zxing-cpp/zxing-cpp.hash index 4018e95fde32..6c6917ed8650 100644 --- a/package/zxing-cpp/zxing-cpp.hash +++ b/package/zxing-cpp/zxing-cpp.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76 zxing-cpp-2.0.0.tar.gz +sha256 6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe zxing-cpp-2.1.0.tar.gz # License files sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index b11814d114cb..8256b1a25456 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZXING_CPP_VERSION = 2.0.0 +ZXING_CPP_VERSION = 2.1.0 ZXING_CPP_SITE = $(call github,zxing-cpp,zxing-cpp,v$(ZXING_CPP_VERSION)) ZXING_CPP_LICENSE = Apache-2.0 ZXING_CPP_LICENSE_FILES = LICENSE From fc957ece11e585f1980c51764aafc56fde5b0e15 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 11 Jul 2023 15:14:56 -0700 Subject: [PATCH 1004/2890] package/go: security bump to version 1.19.11 go1.19.11 (released 2023-07-11) includes a security fix to the net/http package, as well as bug fixes to cgo, the cover tool, the go command, the runtime, and the go/printer package. CVE-2023-29406 and Go issue https://go.dev/issue/60374 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 874737ea2d3d..6d4c718a405b 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 13755bcce529747d5f2930dee034730c86d02bd3e521ab3e2bbede548d3b953f go1.19.10.src.tar.gz +sha256 e25c9ab72d811142b7f41ff6da5165fec2d1be5feec3ef2c66bc0bdecb431489 go1.19.11.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 545d2117b7d9..22b8161e052f 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.10 +GO_VERSION = 1.19.11 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 95204c41b47cb1757569df99363adc3b55d3b8ed Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 11 Jul 2023 15:43:31 -0700 Subject: [PATCH 1005/2890] package/docker-engine: bump version to v24.0.4 https://github.com/moby/moby/releases/tag/v24.0.4 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index b6729ab6602a..3f1b9bd459dd 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f4bc7d7cc2ee3671371ae80fd624e61f0598e614b5c235012581f8ec1d593aa0 docker-engine-24.0.2.tar.gz +sha256 84f6196fc58ae263376a4ce25b5136d567a93aa82e723504a29f0415bd1fa4f4 docker-engine-24.0.4.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 8127689e9e28..7c19e0dc5291 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 24.0.2 +DOCKER_ENGINE_VERSION = 24.0.4 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From d3fa605fc63c0cc3d3afe342a727e436e67d7978 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 11 Jul 2023 15:43:32 -0700 Subject: [PATCH 1006/2890] package/docker-cli: bump version to v24.0.4 https://github.com/moby/moby/releases/tag/v24.0.4 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index dd5d59827855..2ccf1d98b954 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 632357aa58d7f5e16ce87dbd73641c5f65c25b6501e3917ac4f0ce553a01e0bc docker-cli-24.0.2.tar.gz +sha256 dc1d025fd16b113a1a7e2a5d34c30409613d9c4ec313937f17bf34991caf597f docker-cli-24.0.4.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index ddd3e7bf91f9..9b657093cb05 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 24.0.2 +DOCKER_CLI_VERSION = 24.0.4 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From 490882ada94cf98da145feb4e7e47302aa31104f Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 11 Jul 2023 15:44:49 -0700 Subject: [PATCH 1007/2890] package/docker-compose: bump to version v2.20.0 https://github.com/docker/compose/releases/tag/v2.20.0 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 4fe6d7313933..fce34772574d 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3a777f6442db77447919cc7006d8b9439c95cc61c04acad4039e0120a8e591ea docker-compose-2.17.3.tar.gz +sha256 2051ea80097f3c9e74e3a8565609e704e76035fa9ba04183950d3431bd123ea5 docker-compose-2.20.0.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 09f611e18522..b2d3e99988e9 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.17.3 +DOCKER_COMPOSE_VERSION = 2.20.0 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From 800c7de810f943ad6fd6ee404c92e6fac01c693a Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 12 Jun 2023 01:36:16 +0200 Subject: [PATCH 1008/2890] package/python-hiredis: bump to version 2.2.3 The existing patch is removed as it has been applied upstream in commit https://github.com/redis/hiredis-py/commit/d4d701a06560ce76a4eaba3ac309ff70e37b3190. The license file has changed, it is now named LICENSE, and the contents are not the same even though it still contains the BSD-3-Clause license. Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...0001-setup.py-fix-build-with-gcc-4.8.patch | 43 ------------------- package/python-hiredis/python-hiredis.hash | 6 +-- package/python-hiredis/python-hiredis.mk | 6 +-- 4 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 package/python-hiredis/0001-setup.py-fix-build-with-gcc-4.8.patch diff --git a/.checkpackageignore b/.checkpackageignore index 52d748fa45c0..23b01717926c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1239,7 +1239,6 @@ package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.pat package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch Upstream package/python-daphne/0001-remove-pytest-runner-requirement.patch Upstream package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch Upstream -package/python-hiredis/0001-setup.py-fix-build-with-gcc-4.8.patch Upstream package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch Upstream package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch Upstream package/python-pylibftdi/0001-do-not-use-find-library.patch Upstream diff --git a/package/python-hiredis/0001-setup.py-fix-build-with-gcc-4.8.patch b/package/python-hiredis/0001-setup.py-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 93f9440a749c..000000000000 --- a/package/python-hiredis/0001-setup.py-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 204898e28c7650089bf664eea8adfc16a22ba4f4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 6 Apr 2021 10:37:49 +0200 -Subject: [PATCH] setup.py: fix build with gcc 4.8 - -Fix the following build failure on gcc 4.8 which is raised since version -2.0.0 and -https://github.com/redis/hiredis-py/commit/9084152f624e8e593b4e86ddf8bd13329fdfc043: - -vendor/hiredis/read.c: In function 'redisReaderFree': -vendor/hiredis/read.c:646:9: error: 'for' loop initial declarations are only allowed in C99 mode - for (int i = 0; i < r->tasks; i++) { - ^ -vendor/hiredis/read.c:646:9: note: use option -std=c99 or -std=gnu99 to compile your code - -This build failure is raised because hiredis source code is built -without C99: -https://github.com/redis/hiredis/commit/13a35bdb64615e381c5e1151cdd4e78bba71a6db - -Fixes: - - http://autobuild.buildroot.org/results/04cbcddf6d83ebad8c98400754f9445375e9e489 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/redis/hiredis-py/pull/110] ---- - setup.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setup.py b/setup.py -index d83153b..1f623c9 100755 ---- a/setup.py -+++ b/setup.py -@@ -13,6 +13,7 @@ def version(): - ext = Extension("hiredis.hiredis", - sources=sorted(glob.glob("src/*.c") + - ["vendor/hiredis/%s.c" % src for src in ("alloc", "read", "sds")]), -+ extra_compile_args=["-std=c99"], - include_dirs=["vendor"]) - - setup( --- -2.30.2 - diff --git a/package/python-hiredis/python-hiredis.hash b/package/python-hiredis/python-hiredis.hash index 2e73d2f37bf2..372f2f50aec8 100644 --- a/package/python-hiredis/python-hiredis.hash +++ b/package/python-hiredis/python-hiredis.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/hiredis/json -md5 0ab76a8b29deb737c9bfc7f631969e38 hiredis-2.0.0.tar.gz -sha256 81d6d8e39695f2c37954d1011c0480ef7cf444d4e3ae24bc5e89ee5de360139a hiredis-2.0.0.tar.gz +md5 670a932c2972cbd88f910c2b29f85c3c hiredis-2.2.3.tar.gz +sha256 e75163773a309e56a9b58165cf5a50e0f84b755f6ff863b2c01a38918fe92daa hiredis-2.2.3.tar.gz # Locally computed sha256 checksums -sha256 70edfa6d3e11f9d7497c2c2f298d06f33b11d10f37f76605102c5ab3b1f28262 COPYING +sha256 65d467915fa36249f60e6942c9d44dfe54d75882e6b66e94fc6c3971fcde1722 LICENSE sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb vendor/hiredis/COPYING diff --git a/package/python-hiredis/python-hiredis.mk b/package/python-hiredis/python-hiredis.mk index 55f9a09f55e7..5aceb15ae1f6 100644 --- a/package/python-hiredis/python-hiredis.mk +++ b/package/python-hiredis/python-hiredis.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_HIREDIS_VERSION = 2.0.0 +PYTHON_HIREDIS_VERSION = 2.2.3 PYTHON_HIREDIS_SOURCE = hiredis-$(PYTHON_HIREDIS_VERSION).tar.gz -PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/0c/39/eae11344d69ba435ec13d6bcc1a9eea3d2278324506fcd0e52d1ed8958c8 +PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/b0/04/dab6792584fc548803ffa50b5bb2b99f01d3ab04d7c7f64e85f1a22fb847 PYTHON_HIREDIS_SETUP_TYPE = setuptools PYTHON_HIREDIS_LICENSE = BSD-3-Clause -PYTHON_HIREDIS_LICENSE_FILES = COPYING vendor/hiredis/COPYING +PYTHON_HIREDIS_LICENSE_FILES = LICENSE vendor/hiredis/COPYING $(eval $(python-package)) From 53ab50bb39ba9a6b1f287a2e6ee8aa98b5aa32be Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 12 Jun 2023 01:36:17 +0200 Subject: [PATCH 1009/2890] package/python-pyjwt: bump to version 2.7.0 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/python-pyjwt/python-pyjwt.hash | 4 ++-- package/python-pyjwt/python-pyjwt.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash index cc64be6ccac5..249f0e478e40 100644 --- a/package/python-pyjwt/python-pyjwt.hash +++ b/package/python-pyjwt/python-pyjwt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyJWT/json -md5 aeed6d3a581ae383b2288a2079fa562d PyJWT-2.6.0.tar.gz -sha256 69285c7e31fc44f68a1feb309e948e0df53259d579295e6cfe2b1792329f05fd PyJWT-2.6.0.tar.gz +md5 228adbf1f9d2bcd42bbfb6d3b43dc48a PyJWT-2.7.0.tar.gz +sha256 bd6ca4a3c4285c1a2d4349e5a035fdf8fb94e04ccd0fcbe6ba289dae9cc3e074 PyJWT-2.7.0.tar.gz # Locally computed sha256 checksums sha256 797a7a20231d4c433e9f1911db1731d06b5828b98f499819a034f7c0f56f5ce5 LICENSE diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk index fe4eeff38a28..982bc758df70 100644 --- a/package/python-pyjwt/python-pyjwt.mk +++ b/package/python-pyjwt/python-pyjwt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYJWT_VERSION = 2.6.0 +PYTHON_PYJWT_VERSION = 2.7.0 PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz -PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/75/65/db64904a7f23e12dbf0565b53de01db04d848a497c6c9b87e102f74c9304 +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/e0/f0/9804c72e9a314360c135f42c434eb42eaabb5e7ebad760cbd8fc7023be38 PYTHON_PYJWT_SETUP_TYPE = setuptools PYTHON_PYJWT_LICENSE = MIT PYTHON_PYJWT_LICENSE_FILES = LICENSE From 7aa9c8f8c0f99d29581d1e3f691afe0471de858e Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 12 Jun 2023 01:36:18 +0200 Subject: [PATCH 1010/2890] package/python-redis: bump to version 4.5.5 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/python-redis/python-redis.hash | 4 ++-- package/python-redis/python-redis.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index 209ff35b78ab..e27f87bd50d9 100644 --- a/package/python-redis/python-redis.hash +++ b/package/python-redis/python-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/redis/json -md5 4ab691af57ac346c2e630ce2787a424f redis-4.4.0.tar.gz -sha256 7b8c87d19c45d3f1271b124858d2a5c13160c4e74d4835e28273400fa34d5228 redis-4.4.0.tar.gz +md5 ad365234df634680d15294ddc87c42de redis-4.5.5.tar.gz +sha256 dc87a0bdef6c8bfe1ef1e1c40be7034390c2ae02d92dcd0c7ca1729443899880 redis-4.5.5.tar.gz # Locally computed sha256 checksums sha256 7801a39e3a1aec58a7ea7c9f4dc1238cf0922c36a1fc8eff0bb7d684ff6dd354 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index bbbd6f1df236..186702dc83e3 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 4.4.0 +PYTHON_REDIS_VERSION = 4.5.5 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/7a/05/671367bb466b3301bc4543fdad6ac107214ca327c8d97165b30246d87e88 +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/53/30/128c5599bc3fa61488866be0228326b3e486be34480126f70e572043adf8 PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE From bbf3454f8f760e323ebcc0fffeafb6606692c5c3 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:43 +0200 Subject: [PATCH 1011/2890] package/python-iptables: fix _find_library() While the commit [1] already fixed some runtime issue with uClibc toolchain, the same test TestPythonPy3Iptables fail with Glibc toolchain. xtables_version = 12 if xtables_version: _searchlib = "libxtables.so.%s" % (xtables_version,) else: _searchlib = "xtables" _lib_xtables, xtables_version = find_library(_searchlib) _lib_xtables and xtables_version are null with glibc The implementation of find_library() rely on the custom _find_library() that try to use the IPTABLES_LIBDIR environment variable (that does not exist in the context of Buildroot). Within the scope of buildroot we can determine what IPTABLES_LIBDIR should be at build time and replace the calls to os.environ.get('IPTABLES_LIBDIR', None) with the correct value. [1] d341ec035067120b456f669a826e26eb594c0237 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/python-iptables/python-iptables.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-iptables/python-iptables.mk b/package/python-iptables/python-iptables.mk index 0ccf064217db..9cb4285ec342 100644 --- a/package/python-iptables/python-iptables.mk +++ b/package/python-iptables/python-iptables.mk @@ -15,6 +15,7 @@ define PYTHON_IPTABLES_SET_XTABLES_ENV_VARS XTABLES_VERSION=`awk '/XTABLES_VERSION_CODE/ {print $$NF}' $(STAGING_DIR)/usr/include/xtables-version.h`; \ sed -i "s%os.getenv(\"PYTHON_IPTABLES_XTABLES_VERSION\")%$$XTABLES_VERSION%" $(@D)/iptc/xtables.py sed -i "s%os.getenv(\"XTABLES_LIBDIR\")%\"/usr/lib/xtables\"%" $(@D)/iptc/xtables.py + sed -i "s%os.environ.get('IPTABLES_LIBDIR', None)%\"/usr/lib\"%" $(@D)/iptc/util.py endef PYTHON_IPTABLES_PRE_BUILD_HOOKS += PYTHON_IPTABLES_SET_XTABLES_ENV_VARS From a00d82f9e7a3d94bf54aadda7fc81d2599be226c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:44 +0200 Subject: [PATCH 1012/2890] support/testing: TestPythonPy3S3transfer: increase ext2 size to 250M We are going to update the toolchain used by the Buildroot testsuite and this update will increase the size of the rootfs over 120M. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_s3transfer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_python_s3transfer.py b/support/testing/tests/package/test_python_s3transfer.py index d81560aeb174..1578f3aa74bb 100644 --- a/support/testing/tests/package/test_python_s3transfer.py +++ b/support/testing/tests/package/test_python_s3transfer.py @@ -9,7 +9,7 @@ class TestPythonPy3S3transfer(TestPythonPackageBase): BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_S3TRANSFER=y BR2_TARGET_ROOTFS_EXT2=y - BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + BR2_TARGET_ROOTFS_EXT2_SIZE="250M" """ sample_scripts = ["tests/package/sample_python_s3transfer.py"] timeout = 10 From c2ba654925585f1579c1bd65185c04eef4e4cc74 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:45 +0200 Subject: [PATCH 1013/2890] support/testing: TestPythonPy3Boto3: increase ext2 size to 250M We are going to update the toolchain used by the Buildroot testsuite and this update will increase the size of the rootfs over 120M. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_boto3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_python_boto3.py b/support/testing/tests/package/test_python_boto3.py index 126ddae63a97..02a1f69d407b 100644 --- a/support/testing/tests/package/test_python_boto3.py +++ b/support/testing/tests/package/test_python_boto3.py @@ -9,7 +9,7 @@ class TestPythonPy3Boto3(TestPythonPackageBase): BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_BOTO3=y BR2_TARGET_ROOTFS_EXT2=y - BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + BR2_TARGET_ROOTFS_EXT2_SIZE="250M" """ sample_scripts = ["tests/package/sample_python_boto3.py"] timeout = 10 From dd4ba068b33f6631c523898faff7d7819cc7312f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:46 +0200 Subject: [PATCH 1014/2890] support/testing: TestPythonPy3Botocore: increase ext2 size to 250M We are going to update the toolchain used by the Buildroot testsuite and this update will increase the size of the rootfs over 120M. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_botocore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_python_botocore.py b/support/testing/tests/package/test_python_botocore.py index f123993c08d8..0f3dc93a37a7 100644 --- a/support/testing/tests/package/test_python_botocore.py +++ b/support/testing/tests/package/test_python_botocore.py @@ -9,7 +9,7 @@ class TestPythonPy3Botocore(TestPythonPackageBase): BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_BOTOCORE=y BR2_TARGET_ROOTFS_EXT2=y - BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + BR2_TARGET_ROOTFS_EXT2_SIZE="250M" """ sample_scripts = ["tests/package/sample_python_botocore.py"] timeout = 30 From 60b84fb7ce4612b2b14a675e28331111468e1f2b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:47 +0200 Subject: [PATCH 1015/2890] support/testing: TestSELinuxSystemd: kernel bump 6.1.26 We are going to update the toolchain used by the Buildroot testsuite and this update will break the kernel build with the Bootlin stable toolchain due to an latent issue. Fixes: arch/x86/entry/thunk_64.o: warning: objtool: missing symbol table make[4]: *** [scripts/Makefile.build:361: arch/x86/entry/thunk_64.o] Error 1 make[4]: *** Deleting file 'arch/x86/entry/thunk_64.o' make[4]: *** Waiting for unfinished jobs.... [fixed since kernel 6.0] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=de979c83574abf6e78f3fa65b716515c91b2613d Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/init/test_systemd_selinux.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/init/test_systemd_selinux.py b/support/testing/tests/init/test_systemd_selinux.py index 73604cfc32e4..5f91243f37e5 100644 --- a/support/testing/tests/init/test_systemd_selinux.py +++ b/support/testing/tests/init/test_systemd_selinux.py @@ -12,7 +12,7 @@ class TestSELinuxSystemd(infra.basetest.BRTest): BR2_INIT_SYSTEMD=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.12" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_PACKAGE_LIBSELINUX=y From f89f52168fcb667a3e8e43f6f44d5b1ca3961a8c Mon Sep 17 00:00:00 2001 From: Sebastian Weyer Date: Fri, 9 Jun 2023 01:28:48 +0200 Subject: [PATCH 1016/2890] support/testing/infra/basetest.py: use Bootlin toolchain stable 2022.08-1 This patch updates the default toolchain used for runtime tests. The last time this toolchain was updated was in commit 0207a65323fc73fe9570f3d7e03bbfed4ab6d477 3 years ago. Since then, multiple things have changed: Firstly, it used uclibc-ng as the libc whereas since commit 4057e36ca9665edd5248512e4edba2c243b8f4be, glibc is used as the default library. And secondly, since commit 531b2a10cda6bae78ecc141c9fe48f2024f71dbc, buildroot dropped the support for gcc 8 and it cannot be built internally anymore. So the testsuite was executed using a toolchain that can't be built by the Buildroot internal toolchain backend anymore. This new Bootlin toolchain stable 2022.08-1 is based on gcc 11.3.0, linux headers 4.9.327, glibc 2.35 and binutils 2.38. The previous toolchain bleeding edge 2018.11-1 is based on gcc 8.2.0, linux headers 4.14.80, uclibc 1.0.30 and binutils 2.31.1 Nowadays Bootlin toolchains are packaged in Buildroot and we can directly select them from BASIC_TOOLCHAIN_CONFIG and avoid setting the toolchain parameters (BR2_TOOLCHAIN_EXTERNAL_CUSTOM...). The switch to Glibc requires to update some tests for the following reasons: - TestPython3Py, TestPython3Pyc and TestPython3PyPyc has been updated since they use the libc binary file name in their test (uClibc: libc.so.1 vs Glibc: libc.so.6). - TestTmux needs at least one locale to pass (as stated in tmux help text "tmux needs a working UTF-8 locale"), so use "C.UTF-8". - TestOpenSsh needs a toolchain >= 5.x due to a openssh issue (Similar to: https://bugs.busybox.net/show_bug.cgi?id=13671) Use the Bootlin toolchain bleeding-edge 2022.08-1 rhat provide kernel headers 5.4 - TestShadow needs a toolchain >= 4.14 Use the Bootlin toolchain bleeding-edge 2022.08-1 rhat provide kernel headers 5.4 Runtime tested on the gcc farm server. Signed-off-by: Sebastian Weyer Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/infra/basetest.py | 10 ++-------- support/testing/tests/package/test_openssh.py | 8 +++++++- support/testing/tests/package/test_python.py | 2 +- support/testing/tests/package/test_shadow.py | 7 ++++++- support/testing/tests/package/test_tmux.py | 1 + 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 670c7213d6ed..12d96415dac9 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -9,14 +9,8 @@ """ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y - BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y - BR2_TOOLCHAIN_EXTERNAL_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2018.11-1.tar.bz2" - BR2_TOOLCHAIN_EXTERNAL_GCC_8=y - BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y - BR2_TOOLCHAIN_EXTERNAL_LOCALE=y - BR2_TOOLCHAIN_HAS_THREADS_DEBUG=y - BR2_TOOLCHAIN_EXTERNAL_CXX=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y """ MINIMAL_CONFIG = \ diff --git a/support/testing/tests/package/test_openssh.py b/support/testing/tests/package/test_openssh.py index 4b48059573c5..a28c28f79761 100644 --- a/support/testing/tests/package/test_openssh.py +++ b/support/testing/tests/package/test_openssh.py @@ -32,9 +32,13 @@ def openssh_test(self): class TestOpenSshuClibc(TestOpensshBase): - config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + config = \ TestOpensshBase.opensshconfig + \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y BR2_TARGET_ROOTFS_CPIO=y """ @@ -43,12 +47,14 @@ def test_run(self): class TestOpenSshGlibc(TestOpensshBase): + config = \ TestOpensshBase.opensshconfig + \ """ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE=y BR2_PACKAGE_RNG_TOOLS=y BR2_TARGET_ROOTFS_CPIO=y """ diff --git a/support/testing/tests/package/test_python.py b/support/testing/tests/package/test_python.py index d6f69a83c769..c9ecf9acda6c 100644 --- a/support/testing/tests/package/test_python.py +++ b/support/testing/tests/package/test_python.py @@ -29,7 +29,7 @@ def math_floor_test(self, timeout=-1): def libc_time_test(self, timeout=-1): cmd = self.interpreter + " -c '" cmd += "import ctypes;" - cmd += "libc = ctypes.cdll.LoadLibrary(\"libc.so.1\");" + cmd += "libc = ctypes.cdll.LoadLibrary(\"libc.so.6\");" cmd += "print(libc.time(None))'" self.assertRunOk(cmd, timeout) diff --git a/support/testing/tests/package/test_shadow.py b/support/testing/tests/package/test_shadow.py index 09b580de5974..3352d454a586 100644 --- a/support/testing/tests/package/test_shadow.py +++ b/support/testing/tests/package/test_shadow.py @@ -5,9 +5,14 @@ class TestShadow(BRTest): username = 'user_test' - config = BASIC_TOOLCHAIN_CONFIG + \ + # Need to use a different toolchain than the default due to + # shadow package requiring a toolchain w/ headers >= 4.14 + config = \ """ BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE=y BR2_PACKAGE_SHADOW=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/support/testing/tests/package/test_tmux.py b/support/testing/tests/package/test_tmux.py index 7a10b7a2b044..f2c620d5caca 100644 --- a/support/testing/tests/package/test_tmux.py +++ b/support/testing/tests/package/test_tmux.py @@ -9,6 +9,7 @@ class TestTmux(infra.basetest.BRTest): BR2_PACKAGE_TMUX=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set + BR2_GENERATE_LOCALE="C.UTF-8" """ def test_run(self): From 5ec2df9fcc770c8d0ec91faa7e048d59b03ef3f1 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:49 +0200 Subject: [PATCH 1017/2890] support/testing: TestMtools: use base configuration The base configuration now provide a glibc toolchain, we can safely switch to it. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_mtools.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_mtools.py b/support/testing/tests/package/test_mtools.py index 51e5138481b5..4a232bc92680 100644 --- a/support/testing/tests/package/test_mtools.py +++ b/support/testing/tests/package/test_mtools.py @@ -4,14 +4,8 @@ class TestMtools(infra.basetest.BRTest): - # We use a glibc toolchain to have iconv conversion working for - # codepage 850. - config = \ + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_MTOOLS=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set From a9ad8ae22a904a58eb7dea85148a6992284d2723 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:50 +0200 Subject: [PATCH 1018/2890] support/testing: TestZ3: use base configuration The base configuration now provide a glibc toolchain, we can safely switch to it. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_z3.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_z3.py b/support/testing/tests/package/test_z3.py index 71b074a587a2..30794a250b58 100644 --- a/support/testing/tests/package/test_z3.py +++ b/support/testing/tests/package/test_z3.py @@ -4,14 +4,8 @@ class TestZ3(infra.basetest.BRTest): - # Need to use a different toolchain than the default due to - # z3 requiring fenv.h not provided by uclibc. - config = \ + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_Z3=y BR2_PACKAGE_Z3_PYTHON=y From 51c53ef92edf64dac7479bf03c6c5d826dd133a0 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:51 +0200 Subject: [PATCH 1019/2890] support/testing: Test{No, All, NonDefaultLimited}Timezone: use base configuration While at it remove Glibc from the test name since all Timezone now use a Glibc toolchain. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/core/test_timezone.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/support/testing/tests/core/test_timezone.py b/support/testing/tests/core/test_timezone.py index f661519196e9..0e5009494d01 100644 --- a/support/testing/tests/core/test_timezone.py +++ b/support/testing/tests/core/test_timezone.py @@ -26,11 +26,9 @@ def test_run(self): self.assertEqual(tz[0].strip(), "UTC") -class TestGlibcAllTimezone(infra.basetest.BRTest): - config = \ +class TestAllTimezone(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_TZ_INFO=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set @@ -48,11 +46,9 @@ def test_run(self): self.assertEqual(tz[0].strip(), "CET") -class TestGlibcNonDefaultLimitedTimezone(infra.basetest.BRTest): - config = \ +class TestNonDefaultLimitedTimezone(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_TZ_INFO=y BR2_TARGET_TZ_ZONELIST="northamerica" BR2_TARGET_LOCALTIME="America/New_York" From d9c24a6fb07aa0eff29a5d082b58d4d04a67581f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:52 +0200 Subject: [PATCH 1020/2890] support/testing: TestPythonPy3SciPy: use python base configuration The base configuration now provide a glibc toolchain, we can safely switch to it. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_scipy.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_python_scipy.py b/support/testing/tests/package/test_python_scipy.py index 007bc9ffa5b0..06297763c3f2 100644 --- a/support/testing/tests/package/test_python_scipy.py +++ b/support/testing/tests/package/test_python_scipy.py @@ -5,14 +5,8 @@ class TestPythonPy3SciPy(TestPythonPackageBase): __test__ = True - # We can't use the base configuration, as we need a glibc - # toolchain for scipy - config = \ + config = TestPythonPackageBase.config + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_SCIPY=y BR2_TARGET_ROOTFS_EXT2=y From 8bf6175d91207f6df15999903332cd7307f20765 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:53 +0200 Subject: [PATCH 1021/2890] support/testing: TestPythonPy3Autobahn: use python base configuration The base configuration now provide a glibc toolchain, we can safely switch to it. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_autobahn.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_python_autobahn.py b/support/testing/tests/package/test_python_autobahn.py index 6c1678a6152f..f785b1af975e 100644 --- a/support/testing/tests/package/test_python_autobahn.py +++ b/support/testing/tests/package/test_python_autobahn.py @@ -3,14 +3,8 @@ class TestPythonPy3Autobahn(TestPythonPackageBase): __test__ = True - # Need to use a different toolchain than the default due to - # python-cryptography using Rust (not available with uclibc) - config = \ + config = TestPythonPackageBase.config + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_AUTOBAHN=y BR2_TARGET_ROOTFS_CPIO=y From 1dd1a8c5cc0dd537b4c29a18e11e73e136e1895f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:54 +0200 Subject: [PATCH 1022/2890] support/testing: TestPythonPy3Crossbar: use python base configuration The base configuration now provide a glibc toolchain, we can safely switch to it. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_crossbar.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_python_crossbar.py b/support/testing/tests/package/test_python_crossbar.py index 178b16be8291..e67ab9ff6e82 100644 --- a/support/testing/tests/package/test_python_crossbar.py +++ b/support/testing/tests/package/test_python_crossbar.py @@ -4,14 +4,8 @@ class TestPythonPy3Crossbar(TestPythonPackageBase): __test__ = True - # Need to use a different toolchain than the default due to - # python-cryptography using Rust (not available with uclibc) - config = \ + config = TestPythonPackageBase.config + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CROSSBAR=y BR2_TARGET_ROOTFS_EXT2=y From f2652461c6f3b997ecd4e13c5637e23a34f38ce8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:55 +0200 Subject: [PATCH 1023/2890] support/testing: TestPythonPy3Cryptography: use python base configuration The base configuration now provide a glibc toolchain, we can safely switch to it. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_cryptography.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_python_cryptography.py b/support/testing/tests/package/test_python_cryptography.py index bf11c02e5c09..ee8e75f88536 100644 --- a/support/testing/tests/package/test_python_cryptography.py +++ b/support/testing/tests/package/test_python_cryptography.py @@ -3,14 +3,8 @@ class TestPythonPy3Cryptography(TestPythonPackageBase): __test__ = True - # Need to use a different toolchain than the default due to - # python-cryptography using Rust (not available with uclibc) - config = \ + config = TestPythonPackageBase.config + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y BR2_TARGET_ROOTFS_CPIO=y From 5fdb241dff9edca749d49697ae9dbce0fa18daa0 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:56 +0200 Subject: [PATCH 1024/2890] support/testing: TestPythonPy3MagicWormhole: use python base configuration The base configuration now provide a glibc toolchain, we can safely switch to it. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../testing/tests/package/test_python_magic_wormhole.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_python_magic_wormhole.py b/support/testing/tests/package/test_python_magic_wormhole.py index d6541a248011..abd34bca50e6 100644 --- a/support/testing/tests/package/test_python_magic_wormhole.py +++ b/support/testing/tests/package/test_python_magic_wormhole.py @@ -5,14 +5,8 @@ class TestPythonPy3MagicWormhole(TestPythonPackageBase): __test__ = True - # Need to use a different toolchain than the default due to - # python-cryptography using Rust (not available with uclibc) - config = \ + config = TestPythonPackageBase.config + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE=y BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER=y From e0e2bd62331898341fd846e330f7e1b8ce918545 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:57 +0200 Subject: [PATCH 1025/2890] support/testing: TestPythonPy3ServiceIdentity: use python base configuration The base configuration now provide a glibc toolchain, we can safely switch to it. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../testing/tests/package/test_python_service_identity.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_python_service_identity.py b/support/testing/tests/package/test_python_service_identity.py index dbad5f931f83..16ea943d41f9 100644 --- a/support/testing/tests/package/test_python_service_identity.py +++ b/support/testing/tests/package/test_python_service_identity.py @@ -3,14 +3,8 @@ class TestPythonPy3ServiceIdentity(TestPythonPackageBase): __test__ = True - # Need to use a different toolchain than the default due to - # python-cryptography using Rust (not available with uclibc) - config = \ + config = TestPythonPackageBase.config + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_SERVICE_IDENTITY=y BR2_TARGET_ROOTFS_CPIO=y From 0760784d1e8383fff18d6dac31eae27f3b2b8177 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:58 +0200 Subject: [PATCH 1026/2890] support/testing: TestPythonPy3Treq: use python base configuration The base configuration now provide a glibc toolchain, we can safely switch to it. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_treq.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_python_treq.py b/support/testing/tests/package/test_python_treq.py index 515f1ea304ef..bd472d3b39b7 100644 --- a/support/testing/tests/package/test_python_treq.py +++ b/support/testing/tests/package/test_python_treq.py @@ -14,14 +14,8 @@ def run_sample_scripts(self): class TestPythonPy3Treq(TestPythonTreq): __test__ = True - # Need to use a different toolchain than the default due to - # python-cryptography using Rust (not available with uclibc) - config = \ + config = TestPythonPackageBase.config + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TREQ=y BR2_TARGET_ROOTFS_CPIO=y From 109f22283c3048d425fb4f0443c2191aabec2079 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:59 +0200 Subject: [PATCH 1027/2890] support/testing: TestPythonPy3Txtorcon: use python base configuration The base configuration now provide a glibc toolchain, we can safely switch to it. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_txtorcon.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_python_txtorcon.py b/support/testing/tests/package/test_python_txtorcon.py index 6f0c4ca1edbc..107f53c6a322 100644 --- a/support/testing/tests/package/test_python_txtorcon.py +++ b/support/testing/tests/package/test_python_txtorcon.py @@ -3,14 +3,8 @@ class TestPythonPy3Txtorcon(TestPythonPackageBase): __test__ = True - # Need to use a different toolchain than the default due to - # python-cryptography using Rust (not available with uclibc) - config = \ + config = TestPythonPackageBase.config + \ """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TXTORCON=y BR2_TARGET_ROOTFS_CPIO=y From 61bfe280d1dd2a822310796456041329bfa0596e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 18:15:22 +0200 Subject: [PATCH 1028/2890] package/kodi-pvr-waipu: bump version to 20.9.0-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index cdcaeeff9d35..ed447ce61f28 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5dfe9f891edefd5334c7a45593651634b43e1fdbea5a1b396131a45f5928f4aa kodi-pvr-waipu-20.8.1-Nexus.tar.gz +sha256 3a0a1dffe1bb8711dd6747b02a51aee6a0bce40ca6822cc2ab7f04b4b5acb82f kodi-pvr-waipu-20.9.0-Nexus.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index 41f9e8281486..b098e10929f6 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 20.8.1-Nexus +KODI_PVR_WAIPU_VERSION = 20.9.0-Nexus KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt From da2a418ff980dd8deffd8e73050d2333ae4ecfd0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 21:54:11 +0200 Subject: [PATCH 1029/2890] package/eudev: bump version to 3.2.12 Release notes: https://github.com/eudev-project/eudev/releases/tag/v3.2.12 Removed patch 0001, a different fix was applied in 2015: https://github.com/eudev-project/eudev/commit/c7badd37d3ac5b06b1fb170b7dfc8ed7c00ce64b Removed patch 0002 which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...-pragma-for-ignoring-diagnostics-if-.patch | 39 ---------------- ...mpile-time-issue-on-very-old-kernels.patch | 44 ------------------- package/eudev/eudev.hash | 2 +- package/eudev/eudev.mk | 2 +- 5 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch delete mode 100644 package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch diff --git a/.checkpackageignore b/.checkpackageignore index 23b01717926c..b88ad4ce9006 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -418,7 +418,6 @@ package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch Upstream package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch Upstream package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch Upstream package/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch Upstream -package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch Upstream package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables package/evemu/0001-Include-limits.h-for-PATH_MAX.patch Upstream package/evemu/0002-evemu-Update-struct-input_event.patch Upstream diff --git a/package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch b/package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch deleted file mode 100644 index 3046ba528b6d..000000000000 --- a/package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From dc8aa43b7b6d0cead7d8a0c1a151d289a5233a10 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Wed, 2 Apr 2014 12:36:52 +0200 -Subject: [PATCH] libudev: Only use #pragma for ignoring diagnostics if GCC - version supports it. - -[Peter: update for 2.1.1, fix shared_assert issue] -Signed-off-by: Eric Le Bihan ---- - src/shared/macro.h | 8 +++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/shared/macro.h b/src/shared/macro.h ---- a/src/shared/macro.h -+++ b/src/shared/macro.h -@@ -38,6 +38,7 @@ - #define _cleanup_(x) __attribute__((cleanup(x))) - - /* Temporarily disable some warnings */ -+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) - #define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT \ - _Pragma("GCC diagnostic push"); \ - _Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") -@@ -48,6 +49,13 @@ - - #define REENABLE_WARNING \ - _Pragma("GCC diagnostic pop") -+#else -+#define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT -+#define DISABLE_WARNING_FORMAT_NONLITERAL -+#define REENABLE_WARNING -+/* glibc unconditionally defines this, but it needs GCC 4.6+ */ -+#undef static_assert -+#endif - - #define XCONCATENATE(x, y) x ## y - #define CONCATENATE(x, y) XCONCATENATE(x, y) --- -1.7.9.5 diff --git a/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch b/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch deleted file mode 100644 index 46961cc9d103..000000000000 --- a/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 09b536e0b9d0964674936901ab9d2954f935c8b4 Mon Sep 17 00:00:00 2001 -From: Stefan Ott -Date: Wed, 5 Apr 2023 18:20:37 +0200 -Subject: [PATCH] Fix compile-time issue on very old kernels - -Kernel versions prior to 3.4 did not have V4L2_CAP_DEVICE_CAPS and -compiling against such a kernel will fail. - -This patch introduces a version check and makes eudev fall back to -v2cap.capabilities on these kernels. - -Upstream: https://github.com/eudev-project/eudev/commit/09b536e0b9d0964674936901ab9d2954f935c8b4 -Signed-off-by: Stefan Ott ---- - src/v4l_id/v4l_id.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c -index 6bf45effe..702d5b687 100644 ---- a/src/v4l_id/v4l_id.c -+++ b/src/v4l_id/v4l_id.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - - #include "util.h" -@@ -71,9 +72,11 @@ int main(int argc, char *argv[]) { - printf("ID_V4L_VERSION=2\n"); - printf("ID_V4L_PRODUCT=%s\n", v2cap.card); - printf("ID_V4L_CAPABILITIES=:"); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) - if (v2cap.capabilities & V4L2_CAP_DEVICE_CAPS) - capabilities = v2cap.device_caps; - else -+#endif - capabilities = v2cap.capabilities; - if ((capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0 || - (capabilities & V4L2_CAP_VIDEO_CAPTURE_MPLANE) > 0) --- -2.40.0 - diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash index fe6c7ef00842..d91bc761c9d8 100644 --- a/package/eudev/eudev.hash +++ b/package/eudev/eudev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b eudev-3.2.11.tar.gz +sha256 ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5eacb9ad8 eudev-3.2.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index feb55052893a..235a71967ef5 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -4,7 +4,7 @@ # ################################################################################ -EUDEV_VERSION = 3.2.11 +EUDEV_VERSION = 3.2.12 EUDEV_SITE = https://github.com/eudev-project/eudev/releases/download/v$(EUDEV_VERSION) EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING From 5444dd5e0f0a672d164f9d7362a949c103620a6d Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Wed, 24 May 2023 10:31:38 -0300 Subject: [PATCH 1030/2890] package/qemu: install keyboard maps only if necessary They are required only for system emulation, so pull a patch already reviewed upstream that makes the installation conditional: https://patchwork.kernel.org/project/qemu-devel/patch/20230327172147.196607-1-casantos@redhat.com/ Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- ...tall-keyboard-maps-only-if-necessary.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch diff --git a/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch b/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch new file mode 100644 index 000000000000..8ba7f3cf1516 --- /dev/null +++ b/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch @@ -0,0 +1,38 @@ +From 9d9b74f806f5dbca53df6630c1a0591eaedd4500 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sun, 1 Jan 2023 21:00:57 -0300 +Subject: [PATCH] meson: install keyboard maps only if necessary + +They are required only for system emulation (i.e. have_system is true). + +Upstream: https://patchwork.kernel.org/project/qemu-devel/patch/20230327172147.196607-1-casantos@redhat.com/ +Signed-off-by: Carlos Santos +Signed-off-by: Carlos Santos +--- + pc-bios/keymaps/meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build +index 158a3b410c..bff3083313 100644 +--- a/pc-bios/keymaps/meson.build ++++ b/pc-bios/keymaps/meson.build +@@ -47,7 +47,7 @@ if native_qemu_keymap.found() + build_by_default: true, + output: km, + command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()], +- install: true, ++ install: have_system, + install_dir: qemu_datadir / 'keymaps') + endforeach + +@@ -56,4 +56,6 @@ else + install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps') + endif + +-install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps') ++if have_system ++ install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps') ++endif +-- +2.31.1 + From 587d392df7d1f5251ca4cfdb6f37888c55f18376 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 13 Jul 2023 00:14:34 +0200 Subject: [PATCH 1031/2890] support/testing/tests/package/test_shadow: fix flake8 warning Fixes: support/testing/tests/package/test_shadow.py:3:1: F401 'infra.basetest.BASIC_TOOLCHAIN_CONFIG' imported but unused Reported by https://gitlab.com/buildroot.org/buildroot/-/jobs/4643484762. Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_shadow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_shadow.py b/support/testing/tests/package/test_shadow.py index 3352d454a586..9991a57d1d82 100644 --- a/support/testing/tests/package/test_shadow.py +++ b/support/testing/tests/package/test_shadow.py @@ -1,6 +1,6 @@ import os -from infra.basetest import BRTest, BASIC_TOOLCHAIN_CONFIG +from infra.basetest import BRTest class TestShadow(BRTest): From 6a91dbc5bcee6952a9481879ba70a6953f5810cd Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 30 May 2023 22:07:26 +0200 Subject: [PATCH 1032/2890] boot/edk2: bump to version edk2-stable202305 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For change log since version edk2-stable202208, see: - https://github.com/tianocore/edk2/releases/tag/edk2-stable202211 - https://github.com/tianocore/edk2/releases/tag/edk2-stable202302 - https://github.com/tianocore/edk2/releases/tag/edk2-stable202305 The main motivation of this bump is the RISC-V QEMU Virt support introduced in edk2-stable202302 (not yet supported in Buildroot). Cc: Dick Olsson Cc: Vincent Stehlé Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- boot/edk2/edk2.hash | 2 +- boot/edk2/edk2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash index 94ee22ddc4e9..34d4b10e2992 100644 --- a/boot/edk2/edk2.hash +++ b/boot/edk2/edk2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c10520f269557d566e35fe8104141aa2865f9085ad2b3a30aae8a7e78a3ca5aa edk2-edk2-stable202208-br1.tar.gz +sha256 ca55351913e6258ebd8c08106f369ac71073d9cfaa80427fc5f131b06d808940 edk2-edk2-stable202305-br1.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index fb6b9a32808c..399bd346eff2 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDK2_VERSION = edk2-stable202208 +EDK2_VERSION = edk2-stable202305 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git EDK2_LICENSE = BSD-2-Clause-Patent From d08e83f8f8ff9a4007f74e7cffefe05939d898d1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 30 May 2023 22:07:27 +0200 Subject: [PATCH 1033/2890] package/edk2-platforms: bump in sync with edk2-stable202305 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump the edk2-platforms commit to the one corresponding to version edk2-stable202305 of edk2, based on the timestamps. Cc: Dick Olsson Cc: Vincent Stehlé Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/edk2-platforms/edk2-platforms.hash | 2 +- package/edk2-platforms/edk2-platforms.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash index 405a09241cd2..ae88b672a631 100644 --- a/package/edk2-platforms/edk2-platforms.hash +++ b/package/edk2-platforms/edk2-platforms.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1ed3f369a2743cc5a5fa4804d0af154e37b578f4e68c2e7f69734701a9b874db edk2-platforms-3c3b1168017073c2bb2d97336c5929ebae805be1.tar.gz +sha256 31257160ac51a4a5f63db92d26482d6a005286ed040dafe89d01f0ee906b111e edk2-platforms-b71f2bda9e4fc183068eef5d1d90a631181a2506.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk index 20a058baff7b..9e8ff9415642 100644 --- a/package/edk2-platforms/edk2-platforms.mk +++ b/package/edk2-platforms/edk2-platforms.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_PLATFORMS_VERSION = 3c3b1168017073c2bb2d97336c5929ebae805be1 +EDK2_PLATFORMS_VERSION = b71f2bda9e4fc183068eef5d1d90a631181a2506 EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent EDK2_PLATFORMS_LICENSE_FILES = License.txt From 40f245152965c1f298ec76a1d8d24858daecc8f5 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 30 May 2023 22:07:28 +0200 Subject: [PATCH 1034/2890] package/edk2-non-osi: bump in sync with edk2-stable202305 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump the edk2-non-osi commit to the one corresponding to version edk2-stable202305 of edk2, based on the timestamps. Cc: Dick Olsson Cc: Vincent Stehlé Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/edk2-non-osi/edk2-non-osi.hash | 2 +- package/edk2-non-osi/edk2-non-osi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/edk2-non-osi/edk2-non-osi.hash b/package/edk2-non-osi/edk2-non-osi.hash index 7941df1f2fc0..2593324bc117 100644 --- a/package/edk2-non-osi/edk2-non-osi.hash +++ b/package/edk2-non-osi/edk2-non-osi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7d27b1e6d90a26f3585ab58a2e051da69eae1b97754d3e2d80a5372879ae2501 edk2-non-osi-61662e8596dd9a64e3372f9a3ba6622d2628607c.tar.gz +sha256 c048101d6532d9bb4f6450095e0b50812d9a831f7e3c119db48e5caf2bf020a6 edk2-non-osi-41876073afb7c7309018223baa1a6f8108bf23f0.tar.gz sha256 38d73db2f9dfb32e1666d898cb9d7c1ccd78302dd9922d5fac4a9cf61fa872d9 Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf diff --git a/package/edk2-non-osi/edk2-non-osi.mk b/package/edk2-non-osi/edk2-non-osi.mk index 0abb3770c7d9..110377276817 100644 --- a/package/edk2-non-osi/edk2-non-osi.mk +++ b/package/edk2-non-osi/edk2-non-osi.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_NON_OSI_VERSION = 61662e8596dd9a64e3372f9a3ba6622d2628607c +EDK2_NON_OSI_VERSION = 41876073afb7c7309018223baa1a6f8108bf23f0 EDK2_NON_OSI_SITE = $(call github,tianocore,edk2-non-osi,$(EDK2_NON_OSI_VERSION)) EDK2_NON_OSI_INSTALL_TARGET = NO EDK2_NON_OSI_INSTALL_STAGING = YES From 66f91a79422dcdcaa8693bc3599d780f64f9e84d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 13 Jul 2023 09:38:46 +0200 Subject: [PATCH 1035/2890] package/python-click: bump version to 8.1.4 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/python-click/python-click.hash | 4 ++-- package/python-click/python-click.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-click/python-click.hash b/package/python-click/python-click.hash index 81d19c419ea4..9b2f8ed83349 100644 --- a/package/python-click/python-click.hash +++ b/package/python-click/python-click.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/click/json -md5 a804b085de7a3ff96968e38e0f6f2e05 click-8.1.3.tar.gz -sha256 7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e click-8.1.3.tar.gz +md5 d19686712c4a599bc8bf1f6f3ea7947d click-8.1.4.tar.gz +sha256 b97d0c74955da062a7d4ef92fadb583806a585b2ea81958a81bd72726cbb8e37 click-8.1.4.tar.gz # Locally computed sha256 checksums sha256 9a8ad106a394e853bfe21f42f4e72d592819a22805d991b5f3275029292b658d LICENSE.rst diff --git a/package/python-click/python-click.mk b/package/python-click/python-click.mk index 6444d0148e2f..a6f2c3773cf6 100644 --- a/package/python-click/python-click.mk +++ b/package/python-click/python-click.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CLICK_VERSION = 8.1.3 +PYTHON_CLICK_VERSION = 8.1.4 PYTHON_CLICK_SOURCE = click-$(PYTHON_CLICK_VERSION).tar.gz -PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/59/87/84326af34517fca8c58418d148f2403df25303e02736832403587318e9e8 +PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/77/88/b0cc5fe95c31c301e9823ea9b028f669c0dcfa205ff71111037a5ed4892c PYTHON_CLICK_LICENSE = BSD-3-Clause PYTHON_CLICK_LICENSE_FILES = LICENSE.rst PYTHON_CLICK_SETUP_TYPE = setuptools From b324c880426a3126767d43bd3018431eef5fe7e6 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 13 Jul 2023 09:38:47 +0200 Subject: [PATCH 1036/2890] package/python-markupsafe: bump version to 2.1.3 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/python-markupsafe/python-markupsafe.hash | 4 ++-- package/python-markupsafe/python-markupsafe.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-markupsafe/python-markupsafe.hash b/package/python-markupsafe/python-markupsafe.hash index 2d1d81c62e01..ec357a83ce0c 100644 --- a/package/python-markupsafe/python-markupsafe.hash +++ b/package/python-markupsafe/python-markupsafe.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markupsafe/json -md5 9809f9fdd98bc835b0c21aa8f79cbf30 MarkupSafe-2.1.1.tar.gz -sha256 7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b MarkupSafe-2.1.1.tar.gz +md5 ca33f119bd0551ce15837f58bb180214 MarkupSafe-2.1.3.tar.gz +sha256 af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad MarkupSafe-2.1.3.tar.gz # Locally computed sha256 checksums sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk index 49bfc0b840e1..0dca997f87e5 100644 --- a/package/python-markupsafe/python-markupsafe.mk +++ b/package/python-markupsafe/python-markupsafe.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKUPSAFE_VERSION = 2.1.1 +PYTHON_MARKUPSAFE_VERSION = 2.1.3 PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz -PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/1d/97/2288fe498044284f39ab8950703e88abbac2abbdf65524d576157af70556 +PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/6d/7c/59a3248f411813f8ccba92a55feaac4bf360d29e2ff05ee7d8e1ef2d7dbf PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst From 764664285872ef62999b9e70736a2468195321d2 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 13 Jul 2023 09:38:48 +0200 Subject: [PATCH 1037/2890] package/python-pytz: bump version to 2023.3 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/python-pytz/python-pytz.hash | 4 ++-- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index 6d6e1b606c1f..861f9d6f35a0 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 3b9356e4dcd441df922cc01e8eb15983 pytz-2022.7.tar.gz -sha256 7ccfae7b4b2c067464a6733c6261673fdb8fd1be905460396b97a073e9fa683a pytz-2022.7.tar.gz +md5 fe54c8f8a1544b4e78b523b264ab071b pytz-2023.3.tar.gz +sha256 1d8ce29db189191fb55338ee6d0387d82ab59f3d00eac103412d64e0ebd0c588 pytz-2023.3.tar.gz # Locally computed sha256 checksums sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 057a3ef17378..4754efe41a62 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2022.7 +PYTHON_PYTZ_VERSION = 2023.3 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/6d/37/54f2d7c147e42dc85ffbc6910862bb4f141fb3fc14d9a88efaa1a76c7df2 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/5e/32/12032aa8c673ee16707a9b6cdda2b09c0089131f35af55d443b6a9c69c1d PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From 3d07ba0f28c3668b20ca92406951b0bf92dd542e Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 13 Jul 2023 09:38:49 +0200 Subject: [PATCH 1038/2890] package/python-werkzeug: bump version to 2.3.6 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/python-werkzeug/python-werkzeug.hash | 4 ++-- package/python-werkzeug/python-werkzeug.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index 0b60a4006690..07b6f2f40d9a 100644 --- a/package/python-werkzeug/python-werkzeug.hash +++ b/package/python-werkzeug/python-werkzeug.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/werkzeug/json -md5 28c3ec6a4b1ce8f06c85612c1dfa351a Werkzeug-2.2.3.tar.gz -sha256 2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe Werkzeug-2.2.3.tar.gz +md5 de26f240d6f95689a8d15170c2d958b6 Werkzeug-2.3.6.tar.gz +sha256 98c774df2f91b05550078891dee5f0eb0cb797a522c757a2452b9cee5b202330 Werkzeug-2.2.3.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk index 0dd27d145fea..3b7c6634375a 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 2.2.3 +PYTHON_WERKZEUG_VERSION = 2.3.6 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/02/3c/baaebf3235c87d61d6593467056d5a8fba7c75ac838b8d100a5e64eba7a0 +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/d1/7e/c35cea5749237d40effc50ed1a1c7518d9f2e768fcf30b4e9ea119e74975 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst From fc2031e635c83a60c3f51c1cd264c52c80ca9f3d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 13 Jul 2023 09:38:50 +0200 Subject: [PATCH 1039/2890] package/python-blinker: new package Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-blinker/Config.in | 6 ++++++ package/python-blinker/python-blinker.hash | 5 +++++ package/python-blinker/python-blinker.mk | 14 ++++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 package/python-blinker/Config.in create mode 100644 package/python-blinker/python-blinker.hash create mode 100644 package/python-blinker/python-blinker.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0918e9f7217a..c3c5a7022d4d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2336,6 +2336,7 @@ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer F: package/dotconf/ +F: package/python-blinker/ F: package/qt5/qt5speech/ F: package/speechd/ diff --git a/package/Config.in b/package/Config.in index e6ed56a8112d..c8ed49d77384 100644 --- a/package/Config.in +++ b/package/Config.in @@ -984,6 +984,7 @@ menu "External python modules" source "package/python-bidict/Config.in" source "package/python-bitstring/Config.in" source "package/python-bleak/Config.in" + source "package/python-blinker/Config.in" source "package/python-bluezero/Config.in" source "package/python-boto3/Config.in" source "package/python-botocore/Config.in" diff --git a/package/python-blinker/Config.in b/package/python-blinker/Config.in new file mode 100644 index 000000000000..3540ca745239 --- /dev/null +++ b/package/python-blinker/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_BLINKER + bool "python-blinker" + help + Fast, simple object-to-object and broadcast signaling. + + https://blinker.readthedocs.io diff --git a/package/python-blinker/python-blinker.hash b/package/python-blinker/python-blinker.hash new file mode 100644 index 000000000000..28416d9fe25e --- /dev/null +++ b/package/python-blinker/python-blinker.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/blinker/json +md5 1c7375d100a67ba368d9cde0ab2d8cfa blinker-1.6.2.tar.gz +sha256 4afd3de66ef3a9f8067559fb7a1cbe555c17dcbe15971b05d1b625c3e7abe213 blinker-1.6.2.tar.gz +# Locally computed sha256 checksums +sha256 9eb73a1f38597a4aa17025d2ae1be3839624c795e985d4f0e9769ce29faca467 LICENSE.rst diff --git a/package/python-blinker/python-blinker.mk b/package/python-blinker/python-blinker.mk new file mode 100644 index 000000000000..6af0f811cba0 --- /dev/null +++ b/package/python-blinker/python-blinker.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-blinker +# +################################################################################ + +PYTHON_BLINKER_VERSION = 1.6.2 +PYTHON_BLINKER_SOURCE = blinker-$(PYTHON_BLINKER_VERSION).tar.gz +PYTHON_BLINKER_SITE = https://files.pythonhosted.org/packages/e8/f9/a05287f3d5c54d20f51a235ace01f50620984bc7ca5ceee781dc645211c5 +PYTHON_BLINKER_SETUP_TYPE = setuptools +PYTHON_BLINKER_LICENSE = MIT +PYTHON_BLINKER_LICENSE_FILES = LICENSE.rst + +$(eval $(python-package)) From 634e9c1a47bad741479761ed4d81e1f12c0559a8 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 13 Jul 2023 09:38:51 +0200 Subject: [PATCH 1040/2890] package/python-flask: bump version to 2.3.2 - update docs/license.rst hash (removed duplicated BSD-3-Clause and reference to LICENSE.rst, removed Artwork and reference to artwork/LICENSE.rst) - add new runtime dependency on python-blinker Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/python-flask/Config.in | 1 + package/python-flask/python-flask.hash | 6 +++--- package/python-flask/python-flask.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in index 8a44bf2db4a5..19b2f0ae7b69 100644 --- a/package/python-flask/Config.in +++ b/package/python-flask/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_FLASK bool "python-flask" + select BR2_PACKAGE_PYTHON_BLINKER # runtime select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime select BR2_PACKAGE_PYTHON_WERKZEUG # runtime diff --git a/package/python-flask/python-flask.hash b/package/python-flask/python-flask.hash index 9b6391750aa5..37ff0d70a539 100644 --- a/package/python-flask/python-flask.hash +++ b/package/python-flask/python-flask.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/flask/json -md5 c0d2276cb7d59a06d62c915da9c77ba6 Flask-2.2.2.tar.gz -sha256 642c450d19c4ad482f96729bd2a8f6d32554aa1e231f4f6b4e7e5264b16cca2b Flask-2.2.2.tar.gz +md5 a5d5fe05dff5c6e0d28ece3fb03ef5cd Flask-2.3.2.tar.gz +sha256 8c2f9abd47a9e8df7f0c3f091ce9497d011dc3b31effcf4c85a6e2b50f4114ef Flask-2.3.2.tar.gz # Locally computed sha256 checksums sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst -sha256 7535eac513edd12fb8e33f203c6a403549629e34b363418cdbd6c6ea5464515d docs/license.rst +sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/package/python-flask/python-flask.mk b/package/python-flask/python-flask.mk index 1b1ffdf03458..b0a38488f867 100644 --- a/package/python-flask/python-flask.mk +++ b/package/python-flask/python-flask.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_VERSION = 2.2.2 +PYTHON_FLASK_VERSION = 2.3.2 PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz -PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/69/b6/53cfa30eed5aa7343daff36622843688ba8c6fe9829bb2b92e193ab1163f +PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/4d/00/ef81c18da32fdfcde6381c315f4b11597fb6691180a330418848efee0ae7 PYTHON_FLASK_SETUP_TYPE = setuptools PYTHON_FLASK_LICENSE = BSD-3-Clause PYTHON_FLASK_LICENSE_FILES = LICENSE.rst docs/license.rst From 94f36bdfec08e3f52ea0bff27bdc2c6c0cfa1d33 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 13 Jul 2023 09:38:52 +0200 Subject: [PATCH 1041/2890] package/python-flask-babel: bump version to 3.1.0 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/python-flask-babel/python-flask-babel.hash | 6 +++--- package/python-flask-babel/python-flask-babel.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-flask-babel/python-flask-babel.hash b/package/python-flask-babel/python-flask-babel.hash index 484af86179d5..eae77ff51deb 100644 --- a/package/python-flask-babel/python-flask-babel.hash +++ b/package/python-flask-babel/python-flask-babel.hash @@ -1,6 +1,6 @@ -# From: https://pypi.org/project/Flask-Babel/#copy-hash-modal-80f92a70-1c66-4cce-bb3d-8d6f98287e3f -md5 50d5e92d96ef58787bf85b5a1b0a5567 Flask-Babel-2.0.0.tar.gz -sha256 f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d Flask-Babel-2.0.0.tar.gz +# From: https://pypi.org/project/flask-babel/#copy-hash-modal-02f7b566-78ef-46b7-be0e-da35593e2dc2 +md5 ad0a1b69044dde430ad9319d3a2f7b47 flask_babel-3.1.0.tar.gz +sha256 be015772c5d7f046f3b99c508dcf618636eb93d21b713b356db79f3e79f69f39 flask_babel-3.1.0.tar.gz # License files sha256 a526100a7047237360a394ba4f70ae801b50ff9b8c9b9e73e7795480a59f6b7e LICENSE diff --git a/package/python-flask-babel/python-flask-babel.mk b/package/python-flask-babel/python-flask-babel.mk index 35241e78db0d..34c9559d1cbe 100644 --- a/package/python-flask-babel/python-flask-babel.mk +++ b/package/python-flask-babel/python-flask-babel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_BABEL_VERSION = 2.0.0 -PYTHON_FLASK_BABEL_SOURCE = Flask-Babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz -PYTHON_FLASK_BABEL_SITE = https://files.pythonhosted.org/packages/d7/fe/655e6a5a99ceb815fe839f0698956a9d6c7d5bcc06ca1ee7c6eb6dac154b +PYTHON_FLASK_BABEL_VERSION = 3.1.0 +PYTHON_FLASK_BABEL_SOURCE = flask_babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz +PYTHON_FLASK_BABEL_SITE = https://files.pythonhosted.org/packages/35/83/f31a4ff688168f9c8a73d80ebfc785dcd7703474a0802b25a78d54edd07c PYTHON_FLASK_BABEL_LICENSE = BSD-3-Clause PYTHON_FLASK_BABEL_SETUP_TYPE = setuptools PYTHON_FLASK_BABEL_LICENSE_FILES = LICENSE From 13a59c31822a4efdb55079db4bce4d4c71c05721 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 13 Jul 2023 09:38:53 +0200 Subject: [PATCH 1042/2890] package/python-flask-wtf: bump version to 1.1.1 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/python-flask-wtf/python-flask-wtf.hash | 4 ++-- package/python-flask-wtf/python-flask-wtf.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-flask-wtf/python-flask-wtf.hash b/package/python-flask-wtf/python-flask-wtf.hash index 01e4290950b5..9d21ffab2fb6 100644 --- a/package/python-flask-wtf/python-flask-wtf.hash +++ b/package/python-flask-wtf/python-flask-wtf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-wtf/json -md5 d86dbc0befe30fd577a623a51689b900 Flask-WTF-1.0.1.tar.gz -sha256 34fe5c6fee0f69b50e30f81a3b7ea16aa1492a771fe9ad0974d164610c09a6c9 Flask-WTF-1.0.1.tar.gz +md5 007c1ff973c63096dec0fa805412d8ad Flask-WTF-1.1.1.tar.gz +sha256 41c4244e9ae626d63bed42ae4785b90667b885b1535d5a4095e1f63060d12aa9 Flask-WTF-1.1.1.tar.gz # Locally computed sha256 checksums sha256 d5f19036451578cb36eeef04c99ebf7d7ca2e70dcf043636519bc420e15a7c62 LICENSE.rst diff --git a/package/python-flask-wtf/python-flask-wtf.mk b/package/python-flask-wtf/python-flask-wtf.mk index 97291e1b26e4..7b4d37ef5691 100644 --- a/package/python-flask-wtf/python-flask-wtf.mk +++ b/package/python-flask-wtf/python-flask-wtf.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_WTF_VERSION = 1.0.1 +PYTHON_FLASK_WTF_VERSION = 1.1.1 PYTHON_FLASK_WTF_SOURCE = Flask-WTF-$(PYTHON_FLASK_WTF_VERSION).tar.gz -PYTHON_FLASK_WTF_SITE = https://files.pythonhosted.org/packages/d9/38/d4798dd05be711d666e1befb08b1d3db57bd146d1a14d15657f60c88b446 +PYTHON_FLASK_WTF_SITE = https://files.pythonhosted.org/packages/80/55/5114035eb8f6200fbe838a4b9828409ac831408c4591bf7875aed299d5f8 PYTHON_FLASK_WTF_LICENSE = BSD-3-Clause PYTHON_FLASK_WTF_LICENSE_FILES = LICENSE.rst PYTHON_FLASK_WTF_SETUP_TYPE = setuptools From f77320b1072d81f9b69e31341d319d0ec906abf6 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 13 Jul 2023 09:38:54 +0200 Subject: [PATCH 1043/2890] package/python-jinja2: update project URL - update project URL (where the old one re-directs to) Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/python-jinja2/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in index 84a46bd26474..5623d4723cef 100644 --- a/package/python-jinja2/Config.in +++ b/package/python-jinja2/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_PYTHON_JINJA2 provides a Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. - http://jinja.pocoo.org/ + https://jinja.palletsprojects.com From 636264541fa14640989f308b0a5d2490c3c26e29 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 13 Jul 2023 12:23:20 +0200 Subject: [PATCH 1044/2890] package/sunxi-mali-utgard-driver: bump to version 2023-07-13 With this patch Linux 6.3 is supported. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash | 2 +- package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash index fd874f1f0a19..be27a85970c5 100644 --- a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4b66f20272c63ce8ea769bf1c95f9923ed6facabe0c14a8c7644b302b9f23b58 sunxi-mali-utgard-driver-73a80d550f2f181b5fc7fc2d859e15d077d845e4.tar.gz +sha256 f2e5e671575d9488fd19b821d70e59952b6dbbb5b2036ea5462f811eec819370 sunxi-mali-utgard-driver-c4bc3e229c0e5f30c24c20ff1fb8db0e4a450c0f.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk index 15d660e49dde..72fade58ed6f 100644 --- a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_MALI_UTGARD_DRIVER_VERSION = 73a80d550f2f181b5fc7fc2d859e15d077d845e4 +SUNXI_MALI_UTGARD_DRIVER_VERSION = c4bc3e229c0e5f30c24c20ff1fb8db0e4a450c0f SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,giuliobenetti,sunxi-mali,$(SUNXI_MALI_UTGARD_DRIVER_VERSION)) SUNXI_MALI_UTGARD_DRIVER_DEPENDENCIES = linux SUNXI_MALI_UTGARD_DRIVER_LICENSE = GPL-2.0 From d3534eca22827e69872f2cb7280bb6b0ccd0962d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 13 Jul 2023 22:18:08 +0200 Subject: [PATCH 1045/2890] support/testing/tests/package/test_acpica.py: run runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/package/test_acpica.py | 91 +++++++++++++++++++ .../test_acpica/rootfs-overlay/root/dsdt.asl | 9 ++ 3 files changed, 102 insertions(+) create mode 100644 support/testing/tests/package/test_acpica.py create mode 100644 support/testing/tests/package/test_acpica/rootfs-overlay/root/dsdt.asl diff --git a/DEVELOPERS b/DEVELOPERS index c3c5a7022d4d..476f092a1685 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1728,6 +1728,8 @@ F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_hwdata.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_acpica.py +F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_bzip2.py F: support/testing/tests/package/test_compressor_base.py F: support/testing/tests/package/test_ddrescue.py diff --git a/support/testing/tests/package/test_acpica.py b/support/testing/tests/package/test_acpica.py new file mode 100644 index 000000000000..f7dd64d7f01c --- /dev/null +++ b/support/testing/tests/package/test_acpica.py @@ -0,0 +1,91 @@ +import os + +import infra.basetest + + +class TestAcpica(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ACPICA=y + BR2_ROOTFS_OVERLAY="{}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """.format( + # overlay to add an ASL source file + infra.filepath("tests/package/test_acpica/rootfs-overlay")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check a program can execute + self.assertRunOk("iasl -v") + + # Check "acpiexamples" demo is running + self.assertRunOk("acpiexamples") + + # Check "acpihelp" convert error code 0x1 to AE_ERROR + self.assertRunOk("acpihelp -e 1 | grep -F AE_ERROR") + + # Check "acpihelp" convert 0xA3 opcode to NoOpOp + self.assertRunOk("acpihelp -o 0xA3 | grep -F NoOpOp") + + # Compile a simple ASL file + # The output file is automatically set to "dsdt.aml" + self.assertRunOk("iasl dsdt.asl") + + # Evaluate the AML with acpiexec + # STR0 is expected to be "Hello Buildroot!" + cmd = "acpiexec -b 'evaluate STR0' dsdt.aml" + cmd += " | grep -F '\"Hello Buildroot!\"'" + self.assertRunOk(cmd) + + # INT1 is exepcted to be 12345678 + cmd = "acpiexec -b 'evaluate INT1' dsdt.aml" + cmd += " | grep -F 12345678" + self.assertRunOk(cmd) + + # Evalute the TEST method which prints its argument + cmd = "acpiexec -b 'evaluate TST2 \"Hello World\"' dsdt.aml" + cmd += " | grep -F 'Arg0=Hello World'" + self.assertRunOk(cmd) + + # dump aml to text + self.assertRunOk("acpidump -f dsdt.aml -o dsdt.dump") + + # Rebuild dump to binary with acpixtract + # Output is implicitly into the dsdt.dat file + self.assertRunOk("acpixtract -a dsdt.dump") + + # Compare with acpibin + # The rebuilt dsdt.dat is expected to be the same + cmd = "acpibin -a dsdt.aml dsdt.dat" + cmd += " | grep -F 'Files compare exactly'" + self.assertRunOk(cmd) + + # Compare with cmp, to check acpibin + self.assertRunOk("cmp dsdt.aml dsdt.dat") + + # Disassemble the compiled ASL + # Output file is implicitly "dsdt.dsl", we rename it to + # "disa.dsl" to make sure it will not clash with the original + # file, when recompiling. + self.assertRunOk("iasl dsdt.aml && mv -v dsdt.dsl disa.dsl") + + # Disassembled output should contain our string + self.assertRunOk("grep STR0 disa.dsl | grep '\"Hello Buildroot!\"'") + + # Recompile the disassembled file + self.assertRunOk("iasl disa.dsl") + + # Compare the first compiled file with the one recompiled from + # the disassembly. There are expected to be identical. + cmd = "acpibin -a dsdt.aml disa.aml" + cmd += " | grep -F 'Files compare exactly'" + self.assertRunOk(cmd) + + # Also compare with "cmp" + self.assertRunOk("cmp dsdt.aml disa.aml") diff --git a/support/testing/tests/package/test_acpica/rootfs-overlay/root/dsdt.asl b/support/testing/tests/package/test_acpica/rootfs-overlay/root/dsdt.asl new file mode 100644 index 000000000000..24f51565bea9 --- /dev/null +++ b/support/testing/tests/package/test_acpica/rootfs-overlay/root/dsdt.asl @@ -0,0 +1,9 @@ +DefinitionBlock ("", "DSDT", 2, "", "", 0x0) +{ + Name (STR0, "Hello Buildroot!") + Name (INT1, 0x12345678) + Method (TST2, 1) + { + printf ("Arg0=%o", Arg0) + } +} From effe9f895e6642a2a92df1f283f5afc609d774fb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 13 Jul 2023 22:20:24 +0200 Subject: [PATCH 1046/2890] package/ghostscript: security bump version to 10.01.2 Fixes CVE-2023-36664: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-36664 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ghostscript/ghostscript.hash | 4 ++-- package/ghostscript/ghostscript.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 30c45a5a74a7..2e4b6ac75044 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10011/SHA512SUMS -sha512 d944be9e8aef68d1176d64c40db6fa86d55d0c9e30047f2147c02806ab61cfe9ac2cb00d4e5b218ff3c51cc6ed47ceffe1bac4dd9d4cc1760b7974f30c6c2735 ghostscript-10.01.1.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10012/SHA512SUMS +sha512 ee20f0e12f553a3d04578e71a0d45defebc71117ce4dc2c14043985bfe7348ad7f8b2fe98fc9b4f5b935ecb32e50dc340be67d6ef58190542ec6d0f9da1de380 ghostscript-10.01.2.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index d215afccd29b..8a39d4b69532 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 10.01.1 +GHOSTSCRIPT_VERSION = 10.01.2 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 From d45bf987b89e49f23435a460f1c7821cd369e654 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 21:02:34 +0200 Subject: [PATCH 1047/2890] package/libfribidi: bump to version 1.0.13 Release notes: https://github.com/fribidi/fribidi/releases/tag/v1.0.13 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libfribidi/libfribidi.hash | 2 +- package/libfribidi/libfribidi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index 7e5df9811279..9187112cee86 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0cd233f97fc8c67bb3ac27ce8440def5d3ffacf516765b91c2cc654498293495 fribidi-1.0.12.tar.xz +sha256 7fa16c80c81bd622f7b198d31356da139cc318a63fc7761217af4130903f54a2 fribidi-1.0.13.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index ec86f468a428..ba0859c93d4e 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.12 +LIBFRIBIDI_VERSION = 1.0.13 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ From fe7d5e9695f057ad0e0fa9ff2a45c3150591665b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 21:13:01 +0200 Subject: [PATCH 1048/2890] package/linux-firmware: bump version to 20230515 Updated license hashes due to upstream commits: - copyright year bumps https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/LICENSE.amdgpu?id=d0598c3b82f24f3ed811f5505f4090924c4da626 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/LICENCE.qat_firmware?id=24c9df9b942518717dd53966712df69ac35c8b90 - other changes https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/LICENCE.qat_firmware?id=588dd07134daf4b0f6f74698f24eeb74ebe90012 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/WHENCE Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.hash | 8 ++++---- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 6bbc2f9c7729..55178ba8f864 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,9 +1,9 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331 linux-firmware-20221214.tar.xz +sha256 8b1acfa16f1ee94732a6acb50d9d6c835cf53af11068bd89ed207bbe04a1e951 linux-firmware-20230515.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis -sha256 a6c0ec4338bc89480da52812bea7f9e4b52bc7118e3e352141f99d779c397c53 LICENSE.amdgpu +sha256 33c0ba2ed43918f2602cfb7274757ff62a6c743082aeeec78ad636ff74200faf LICENSE.amdgpu sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt @@ -19,7 +19,7 @@ sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENC sha256 16d5040c7cf851fc693b7542e20870935b99802533ea1bfd231c377a2305e5c5 LICENCE.iwlwifi_firmware sha256 0fc67bd715b3395f3f2af464781910e9e69c4ba23da304352229b42dc9e986c3 LICENCE.microchip sha256 59ae206c89108905ebdc9ad4c9336526bd2c0d50fbf988c21e8c2a82719d42a4 LICENCE.moxa -sha256 2051d5bf0755a0668f8c3d9a0d1c41d4b8cc411aba70f720fda71ae9e3b4d25c LICENCE.qat_firmware +sha256 0bd9f7cae3cf72b12a63359a725ccbb76ddbd6831372695a9162144329800dd0 LICENCE.qat_firmware sha256 4071a11d878dbc0ac6d9e71203d03b151638f9d7a8bc47a54c3cb964100d5822 LICENCE.qla2xxx sha256 d7bec70668ddd4aae8fb4aa32870e54b49fcdb0b9b007aa9f54b53a1ac7461bd LICENCE.ralink-firmware.txt sha256 8568352b57f3574f9d5b2753cdb7c6e5eb2b79e82fbb9c9ba6566947467ef508 LICENCE.ralink_a_mediatek_company_firmware @@ -35,6 +35,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 744babd4eae138ccfb5bd343b1589912b9839274f8a794af0b6c9b451df73579 WHENCE +sha256 d41a4f4e4230e27d9dfd83b49d2ec839792d80cc559b0bb2b1112adbb0916e6b WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 9d9d12bd5f91..393f82774dc0 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20221214 +LINUX_FIRMWARE_VERSION = 20230515 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES From 320cba89512b36b26c7e9447e0f726cc9add8fb3 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 28 Feb 2023 08:44:40 +0100 Subject: [PATCH 1049/2890] package/linux-firmware: Add Broadcom BNX2 firmware Signed-off-by: Stefan Agner Signed-off-by: Thomas Petazzoni --- package/linux-firmware/Config.in | 7 ++++++- package/linux-firmware/linux-firmware.mk | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 4b415a7da2e4..72a5bcddcdbf 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -449,8 +449,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3 Firmware files for Broadcom Tigon3 ethernet cards (tigon) -config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X +config BR2_PACKAGE_LINUX_FIRMWARE_BNX2 bool "Broadcom NetXtremeII" + help + Firmware files for Broadcom NetXtreme ethernet cards (bnx2) + +config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X + bool "Broadcom NetXtremeII 10Gb" help Firmware files for Broadcom NetXtreme 10Gb ethernet cards (bnx2x) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 393f82774dc0..1819ae71f0fc 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -527,6 +527,12 @@ LINUX_FIRMWARE_FILES += tigon/* # which is installed unconditionally endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2),y) +LINUX_FIRMWARE_FILES += bnx2/* +# No license file; the license is in the file WHENCE +# which is installed unconditionally +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y) LINUX_FIRMWARE_FILES += bnx2x/* # No license file; the license is in the file WHENCE From 83f11700fe7743aee243ced057873e105889b36a Mon Sep 17 00:00:00 2001 From: Kris Bahnsen Date: Thu, 11 May 2023 10:34:51 -0700 Subject: [PATCH 1050/2890] package/linux-firmware: add QCA9377 BT firmware Deploy firmware files as well. Signed-off-by: Kris Bahnsen Signed-off-by: Kris Bahnsen Signed-off-by: Kris Bahnsen Signed-off-by: Thomas Petazzoni --- package/linux-firmware/Config.in | 5 +++++ package/linux-firmware/linux-firmware.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 72a5bcddcdbf..3ae72564ccaf 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -69,6 +69,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT help Firmware files for QCA Rome 6174A bluetooth support. +config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_9377_BT + bool "Qualcomm Atheros QCA9377 Bluetooth" + help + Firmware files for QCA9377 bluetooth support. + config BR2_PACKAGE_LINUX_FIRMWARE_AR3011 bool "Qualcomm Atheros 3011" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 1819ae71f0fc..9383b20c156d 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -65,6 +65,12 @@ LINUX_FIRMWARE_FILES += qca/rampatch_usb_00000302.bin qca/nvm_usb_00000302.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom endif +# Qualcomm Atheros QCA9377 Bluetooth +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_9377_BT),y) +LINUX_FIRMWARE_FILES += qca/rampatch_00230302.bin qca/nvm_00230302.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom +endif + # Realtek 87xx Bluetooth ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT),y) LINUX_FIRMWARE_FILES += \ From d5ff6b96735217228e9962a02b0aaca94cb0f589 Mon Sep 17 00:00:00 2001 From: Vyacheslav Date: Fri, 25 Nov 2022 13:26:50 +0300 Subject: [PATCH 1051/2890] package/rtl8822cs: new package This package adds the rtl88822cs WiFi driver. repo: https://github.com/jethome-ru/rtl88x2cs.git branch: tune_for_jethub Driver is known to support Realtek RTL8822CS SDIO WiFi/BT chip. Signed-off-by: Viacheslav Bocharov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/rtl8822cs/Config.in | 13 +++++++++++++ package/rtl8822cs/rtl8822cs.hash | 2 ++ package/rtl8822cs/rtl8822cs.mk | 25 +++++++++++++++++++++++++ 5 files changed, 44 insertions(+) create mode 100644 package/rtl8822cs/Config.in create mode 100644 package/rtl8822cs/rtl8822cs.hash create mode 100644 package/rtl8822cs/rtl8822cs.mk diff --git a/DEVELOPERS b/DEVELOPERS index 476f092a1685..3638e4f99c77 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2950,6 +2950,9 @@ F: package/llvm/ N: Vanya Sergeev F: package/lua-periphery/ +N: Viacheslav Bocharov +F: package/rtl8822cs/ + N: Victor Huesca F: support/testing/tests/core/test_root_password.py diff --git a/package/Config.in b/package/Config.in index c8ed49d77384..3125fdf63288 100644 --- a/package/Config.in +++ b/package/Config.in @@ -594,6 +594,7 @@ endmenu source "package/rtl8812au-aircrack-ng/Config.in" source "package/rtl8821au/Config.in" source "package/rtl8821cu/Config.in" + source "package/rtl8822cs/Config.in" source "package/sane-backends/Config.in" source "package/sdparm/Config.in" source "package/sedutil/Config.in" diff --git a/package/rtl8822cs/Config.in b/package/rtl8822cs/Config.in new file mode 100644 index 000000000000..ee5f09928d72 --- /dev/null +++ b/package/rtl8822cs/Config.in @@ -0,0 +1,13 @@ +comment "rl8822cs needs a Linux kernel to be built" + depends on !BR2_s390x + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_RTL8822CS + bool "rtl8822cs" + depends on !BR2_s390x + depends on BR2_LINUX_KERNEL + help + Realtek RTL8822CS Wi-Fi driver as a kernel module (JetHome + repository) + + https://github.com/jethome-ru/rtl88x2cs/ diff --git a/package/rtl8822cs/rtl8822cs.hash b/package/rtl8822cs/rtl8822cs.hash new file mode 100644 index 000000000000..c1ff470b2718 --- /dev/null +++ b/package/rtl8822cs/rtl8822cs.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 8ac5bc4d3fcec98eb06276552ffab020dd799a58bce6629cf55127c2ee1a89e6 rtl8822cs-b51ab22fffdbe4a8cbb88fcc04b00aa2ca87d0f3.tar.gz diff --git a/package/rtl8822cs/rtl8822cs.mk b/package/rtl8822cs/rtl8822cs.mk new file mode 100644 index 000000000000..8c6c34ccbc57 --- /dev/null +++ b/package/rtl8822cs/rtl8822cs.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# rtl8822cs +# +################################################################################ + +RTL8822CS_VERSION = b51ab22fffdbe4a8cbb88fcc04b00aa2ca87d0f3 +RTL8822CS_SITE = $(call github,jethome-ru,rtl88x2cs,$(RTL8822CS_VERSION)) +RTL8822CS_LICENSE = GPL-2.0 + +RTL8822CS_MODULE_MAKE_OPTS = \ + CONFIG_RTL8822CS=m \ + KVER=$(LINUX_VERSION_PROBED) \ + KSRC=$(LINUX_DIR) + +define RTL8822CS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_MAC80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_MMC) +endef + +$(eval $(kernel-module)) +$(eval $(generic-package)) From c46df9de21e718a9ed6a2df2bb945c386695d3bf Mon Sep 17 00:00:00 2001 From: Prabhu Sannachi Date: Fri, 7 Oct 2022 16:19:32 -0500 Subject: [PATCH 1052/2890] package/redis-plus-plus: new package Redis client written in C++ This is a C++ client library for Redis. It's based on hiredis, and is compatible with C++ 17, C++ 14, and C++ 11. https://github.com/sewenew/redis-plus-plus Signed-off-by: Prabhu Sannachi Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/redis-plus-plus/Config.in | 15 +++++++++++ package/redis-plus-plus/redis-plus-plus.hash | 3 +++ package/redis-plus-plus/redis-plus-plus.mk | 27 ++++++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 package/redis-plus-plus/Config.in create mode 100644 package/redis-plus-plus/redis-plus-plus.hash create mode 100644 package/redis-plus-plus/redis-plus-plus.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3638e4f99c77..abea0bbb8693 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2420,6 +2420,9 @@ F: package/libdvbpsi/ F: package/mraa/ F: package/synergy/ +N: Prabhu Sannachi +F: package/redis-plus-plus/ + N: Rafal Susz F: board/avnet/s6lx9_microboard/ F: configs/s6lx9_microboard_defconfig diff --git a/package/Config.in b/package/Config.in index 3125fdf63288..3a7466d5755c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1539,6 +1539,7 @@ if BR2_PACKAGE_POSTGRESQL source "package/postgis/Config.in" endif source "package/redis/Config.in" + source "package/redis-plus-plus/Config.in" source "package/rocksdb/Config.in" source "package/sqlcipher/Config.in" source "package/sqlite/Config.in" diff --git a/package/redis-plus-plus/Config.in b/package/redis-plus-plus/Config.in new file mode 100644 index 000000000000..6a21aee2b3ba --- /dev/null +++ b/package/redis-plus-plus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_REDIS_PLUS_PLUS + bool "redis-plus-plus" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_HIREDIS + help + Redis client written in C++ + + This is a C++ client library for Redis. + It's based on hiredis, and is compatible + with C++ 17, C++ 14, and C++ 11. + + https://github.com/sewenew/redis-plus-plus + +comment "redis-plus-plus needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/redis-plus-plus/redis-plus-plus.hash b/package/redis-plus-plus/redis-plus-plus.hash new file mode 100644 index 000000000000..93e58e2535ef --- /dev/null +++ b/package/redis-plus-plus/redis-plus-plus.hash @@ -0,0 +1,3 @@ +# Locally calculated: +sha256 a49a72fef26ed39d36a278fcc4e4d92822e111697b5992d8f26f70d16edc6c1f redis-plus-plus-1.3.5.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/redis-plus-plus/redis-plus-plus.mk b/package/redis-plus-plus/redis-plus-plus.mk new file mode 100644 index 000000000000..ea0e182748b3 --- /dev/null +++ b/package/redis-plus-plus/redis-plus-plus.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# redis-plus-plus +# +################################################################################ + +REDIS_PLUS_PLUS_VERSION = 1.3.5 +REDIS_PLUS_PLUS_SITE = $(call github,sewenew,redis-plus-plus,$(REDIS_PLUS_PLUS_VERSION)) +REDIS_PLUS_PLUS_LICENSE = Apache-2.0 +REDIS_PLUS_PLUS_LICENSE_FILES = LICENSE +REDIS_PLUS_PLUS_INSTALL_STAGING = YES +REDIS_PLUS_PLUS_DEPENDENCIES = hiredis + +REDIS_PLUS_PLUS_CONF_OPTS = \ + -DREDIS_PLUS_PLUS_BUILD_TEST=OFF + +# since version 1.3.0, by default, redis-plus-plus is built with the +# -std=c++17 standard +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),) +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),y) +REDIS_PLUS_PLUS_CONF_OPTS += -DREDIS_PLUS_PLUS_CXX_STANDARD=14 +else +REDIS_PLUS_PLUS_CONF_OPTS += -DREDIS_PLUS_PLUS_CXX_STANDARD=11 +endif +endif + +$(eval $(cmake-package)) From d3142f032a527d2118818890b5afb94c7decc4d7 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 13 Jul 2023 23:32:56 +0200 Subject: [PATCH 1053/2890] support/testing/tests/package/test_brotli.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_brotli.py | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 support/testing/tests/package/test_brotli.py diff --git a/DEVELOPERS b/DEVELOPERS index abea0bbb8693..202a8ba5012d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1730,6 +1730,7 @@ F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ +F: support/testing/tests/package/test_brotli.py F: support/testing/tests/package/test_bzip2.py F: support/testing/tests/package/test_compressor_base.py F: support/testing/tests/package/test_ddrescue.py diff --git a/support/testing/tests/package/test_brotli.py b/support/testing/tests/package/test_brotli.py new file mode 100644 index 000000000000..779b956cb31c --- /dev/null +++ b/support/testing/tests/package/test_brotli.py @@ -0,0 +1,13 @@ +from tests.package.test_compressor_base import TestCompressorBase + + +class TestBrotli(TestCompressorBase): + __test__ = True + config = TestCompressorBase.config + \ + """ + BR2_PACKAGE_BROTLI=y + """ + compress_cmd = "brotli" + decompress_cmd = "brotli -d" + compressed_file_ext = ".br" + timeout = 60 From 0a6af1116362790639494746cc3da336ff018144 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 13 Jul 2023 23:33:13 +0200 Subject: [PATCH 1054/2890] support/testing/tests/package/test_lz4.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_lz4.py | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 support/testing/tests/package/test_lz4.py diff --git a/DEVELOPERS b/DEVELOPERS index 202a8ba5012d..f7e7c02590f0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1745,6 +1745,7 @@ F: support/testing/tests/package/test_kexec.py F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lsof.py +F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_mtools.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py diff --git a/support/testing/tests/package/test_lz4.py b/support/testing/tests/package/test_lz4.py new file mode 100644 index 000000000000..988200250a9e --- /dev/null +++ b/support/testing/tests/package/test_lz4.py @@ -0,0 +1,11 @@ +from tests.package.test_compressor_base import TestCompressorBase + + +class TestLz4(TestCompressorBase): + __test__ = True + config = TestCompressorBase.config + \ + """ + BR2_PACKAGE_LZ4=y + BR2_PACKAGE_LZ4_PROGS=y + """ + compress_cmd = "lz4" From 4fb4658c5352ce0fc17b521d62891f395d5fc4d8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 13 Jul 2023 23:33:25 +0200 Subject: [PATCH 1055/2890] support/testing/tests/package/test_zstd.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_zstd.py | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 support/testing/tests/package/test_zstd.py diff --git a/DEVELOPERS b/DEVELOPERS index f7e7c02590f0..b7c9fa8c2751 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1766,6 +1766,7 @@ F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_xz.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ +F: support/testing/tests/package/test_zstd.py N: Julien Viard de Galbert F: package/dieharder/ diff --git a/support/testing/tests/package/test_zstd.py b/support/testing/tests/package/test_zstd.py new file mode 100644 index 000000000000..24dc5fb90dd9 --- /dev/null +++ b/support/testing/tests/package/test_zstd.py @@ -0,0 +1,11 @@ +from tests.package.test_compressor_base import TestCompressorBase + + +class TestZstd(TestCompressorBase): + __test__ = True + config = TestCompressorBase.config + \ + """ + BR2_PACKAGE_ZSTD=y + """ + compress_cmd = "zstd" + compressed_file_ext = ".zst" From 167e8479f483ac5b76d2c5da32216a3c09863281 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 13 Jul 2023 15:46:16 -0600 Subject: [PATCH 1056/2890] package/strace: bump to version 6.4 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/strace/strace.hash | 4 ++-- package/strace/strace.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 555d074c5d5d..e6e9c4ec9616 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.3/strace-6.3.tar.xz.asc -sha256 e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731 strace-6.3.tar.xz +# https://strace.io/files/6.4/strace-6.4.tar.xz.asc +sha256 27987dbac57fdfd260c6db4dc8328df35c95c6867c8a3d4371d59cdcf4eb9238 strace-6.4.tar.xz sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 6514bfe3545e..b109578a350d 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.3 +STRACE_VERSION = 6.4 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From bfb370286c8ad998db6723ed4ab013e70656bd2b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 13 Jul 2023 15:53:50 -0600 Subject: [PATCH 1057/2890] package/{rust, rust-bin}: bump to version 1.71.0 Link to Rust 1.70.0 announcement: https://blog.rust-lang.org/2023/07/13/Rust-1.71.0.html Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index f6c72f7555c3..211ac424ed83 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.70.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.70.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a36e20a55e39c857f9ec69b146ae04572d5e666e76ff2dd6422cc8f575aed1c7 rust-1.70.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.70.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.70.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 e3fb7f9d825e1bd1720765a358361ba4517584f6d0c1a1d80b2230e2f97c9b88 rust-1.70.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.70.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.70.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 c77505fd6ef54e9ff2819e876a67acb8fe5aa1628e9ebe7c1931ce7d0b41b247 rust-1.70.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.70.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.70.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 7771203dfd675fc7425508a106973725d976fb7334b35facb96f164934044bd0 rust-1.70.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.70.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.70.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 a98a6606a23622d608159f71cc870748c0b406e89d5ff5bf58fb5365ef0e4d40 rust-1.70.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.70.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.70.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 2ca5701b4ea5555afd6cc4d1063097e52828583f2c205c7b23717074d91a4096 rust-1.70.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 41093804c33ea79f8643566ad6cfff5c4f0755418d73abcdf774c870dd8a2e0e rust-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 2da9c69e6ce28da52a2b5ec78db090f41a393bf4b290012058be4f09559662a3 rust-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.70.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.70.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 34bfb5bb95b3f107e82b260a108df796bcf57a5eecda0efac5fd997ed4d3ae88 rust-1.70.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 991b59d1d0cd0dfcb2463bd79d2df1a235380f725557cdee831ee3c1d87a3122 rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 966e85187b6b76dc520b23aadc886c5fe54b209a21c68f959ff00ef8542b7f9f rust-std-1.70.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 277c2313f0ee420851c4009f15ba4d474000e0495deef38b0b636d6837e4f15f rust-std-1.70.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 a6bf20e4eb5b88cd193ea2a126efe1a33651dc0be47080488be2cfff41c29272 rust-std-1.70.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 6ad1231aeb34fef9c9db267859b0db3c6846bbade8227e6c9f456b6264c1278c rust-std-1.70.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 0b021ad310e638e90ae64b60c5a898f2f30ec77fcc1622e3775abb5476200de4 rust-std-1.70.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 f72c1983fcd90c338c62747b15964103518ec377530df2e71e35f7ea16eeede8 rust-std-1.70.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 93929160b961ea6feb0dd0c64aa0571e1e2dc3024a4e2d7ae9ab5f75b1950fd9 rust-std-1.70.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 4c4614c95bbd62665258248cc59d03d0d36e2034971892bd8f01659cdb953740 rust-std-1.70.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 9baaca8ed2a71040480654a1ff3c9917e017ddfe78030b054ad82aed9b94c11e rust-std-1.70.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 3edd71ce8102783c99b9b6661577ac1acf6a633156234ee220a20aa3d7190ebb rust-std-1.70.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 aaceb71de5268510cbfb59c356ef2f7fb539f89b57116a2d3a513d06c411bb35 rust-std-1.70.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 f9d5ce6b4bff635151579726ebf264b905679f42917283fa1268d86f7c82a55f rust-std-1.70.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 f52e3ac35157e90f86e5ca6c177a43774425c24a51b15655ed61f6209c7db6f0 rust-std-1.70.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-i586-unknown-linux-musl.tar.xz.asc -sha256 1a42665bb54eeff908f833dca12e917d6ce87140139ec56702b9d88cda61be79 rust-std-1.70.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 0e5543c35196ca5b08f1b7e49fa3f3b671444d75648504cdbcfd854e2e7efd2d rust-std-1.70.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-i686-unknown-linux-musl.tar.xz.asc -sha256 19ef3b0f6e52f81cd17f0d98a692c48fe02e85570d1e36b6369a7294ae875e2a rust-std-1.70.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 0cd85a53e328b1c445a8ec13af87f74280c1d344744076b102227f626456caec rust-std-1.70.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips-unknown-linux-musl.tar.xz.asc -sha256 5e1abc99236050e0371ffdce8f4924e7fe46957daa7509cabc21355f62ee05e7 rust-std-1.70.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 9624b99d806b64e11916b78afac1fac7561578c23b1321486f73f22f5e7d8710 rust-std-1.70.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 de3adfd43245dadff1fdb172250189f85dbcbc848badf29d5512d5bd10ff8e53 rust-std-1.70.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 55153a84e1a00d8426b08bb745de7eae8bd34dc65ece529a46c2b76448404338 rust-std-1.70.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 39edcc0d4cc184ec320c710b41cc7401ab6f2408da3d8a6bc9c1a836429d429f rust-std-1.70.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 58bf8a6407d92cd4786991f1cbdec7380001e07c057c3a8946c2e54593bb7f8c rust-std-1.70.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 4dd7f934ab4d21f933e5287b7ea194d34e36b6d5a17a5a7ef3bf0b705c59f8ca rust-std-1.70.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 101f358b08381b9c37c2f061bac1ff3e60c6036be20059c451f322a55f72376b rust-std-1.70.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 468672f84e5b140269e188b836ec82494d65c18bda8b7cf1f9bf6fce19f222ab rust-std-1.70.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 bbd882f9ec7f01a732ecc60cf50b7d8a10cd52c3de41c205f62938b6dc2b4dbc rust-std-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 cdecf32e245898306a27a0b164451b2ee9a2122176ce3a65f2ec73c200986dc3 rust-std-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 7084afbe9fb1a0e8a0c3e760f45475ebba400b72030ae8359bdccef67cb48992 rust-std-1.70.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 b06933f6f94cd30e1c2415b37db97a94533a727aa5d32a34ee80c6742ee418d2 rust-std-1.70.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 0c0129717da1e27ccf2c56da950d2fe56973f71beec9e80ae6904b282d2f0ee9 rust-std-1.70.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.70.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.70.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 7ebaba08385d1ec87d0a27ca8b4e1eb454374da18ffa12621bd1578973754101 rust-std-1.70.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 9712efaa9c7977b6f03aeb3ef086d0050273f498790bf242e96b9a8117de901f rust-1.71.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 afd7148aaacdd38acb2f02ded9dd31c833d6f20d99f3f4b5617282295d2092d7 rust-1.71.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 bd0bcdb5fc5c4a9561de7b10361267a25e623de02c65734e76ee904b816f6a56 rust-1.71.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 f76bc0fdd382d5064d69e5888bcf81312e5ee2b0a700a7a54f240e7c5090bf5f rust-1.71.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 c0a31776d8d1ea351cf40c02e1cfa0ed05f3bcdcdd8b203a87447b31fd2bae30 rust-1.71.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 90a4483ba3aa1e3eea4660fbdddad31b3b43fe89458c1d9805b22dac6136abe7 rust-1.71.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 1cdfccb28bed3ad6b0204e3773e3aa43a8687d1740dcb3dd21b4b37ae5308ac1 rust-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 afa670835f244adf06486fa5966e106366b39817d7bbae18504cb6767208ebe9 rust-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 a632cfda657b105c0355ebd575d54ef2e931827befb3e098098b7c3fba085f47 rust-1.71.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 7ae6cf3686f7638c8263d6d7aba68e275edee4e4d832723c603ddab96e330fa4 rust-1.71.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 58542a0ab1162ce05a45eb751793782dc24c5bf8eb9a7467317f254260305ea6 rust-std-1.71.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 759567c0e070a686a593e163c72aeda9e17eb85e783d00d0d5f5642471c65ccc rust-std-1.71.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 fdf359b745d750aeb292a59676ed31acd5ddcc74fb6e987b9bb51dfbf466f3b6 rust-std-1.71.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 452fda324514d5c2431a6c66f376a1369b7199cfa0464f8e669af3b196dabccc rust-std-1.71.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 43a64dc0a6711802bd9de917a17b17e12099d4d7ed9478c5d86b9170ff104ed3 rust-std-1.71.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 774b5f95730179ed561cb4937b6e7813d0424a6ada69ebba45f240fed61c3165 rust-std-1.71.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 9a3aeefbf7dc6eea4e7f437878f0e1af161963ed45b7979581014a0d8bd6602e rust-std-1.71.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 33533c29f7435837bc3c274e11eb5f538a9c56eae3bac0ae6c682aeab56bb53b rust-std-1.71.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 7f03a6caa03353da24851da5cd7ed8d07394d7134de680174ee7877302aa6f79 rust-std-1.71.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 fda8b435939f48364b879981d913df16b10c2951d143da4bbc60e49e013c7ddc rust-std-1.71.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 f4ce3c4436ab691e979e012bab626062c3f14b3fc798dc26b5dcbd1344a85e2e rust-std-1.71.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 1db88e655caa1e4af31c7104de50339d9e8a53fb92f23cd302263cea934d6f79 rust-std-1.71.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 5878f641f4e5a12ced79d2f0d5d9a9d5b0b97b56967684cf09357162c3e6a7b7 rust-std-1.71.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-i586-unknown-linux-musl.tar.xz.asc +sha256 2f62eb58d29a24a8a0d1c8f8b314e676b419cd6d324c02ed63af14954c57467d rust-std-1.71.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 46976bf8297efc65556ccddfec395d5327fbe303f9dabffd104628a37cb1de6d rust-std-1.71.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-i686-unknown-linux-musl.tar.xz.asc +sha256 fa84fb37715f10075060cb4c9acf39dcc568b58b155ae1cbc913334b93423dac rust-std-1.71.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 a259bddfc3ee36279b016ebd2682fc5b4d1b93c63bed6e4f57b5a2963d661dc9 rust-std-1.71.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips-unknown-linux-musl.tar.xz.asc +sha256 25f020e04a18e67bf98751c9f80ac07abfd298264d45d1228d66d2fc21c6c681 rust-std-1.71.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 1af97099a18357a0c36d6c4e6ace4973cd60186d76ff115ea14f6b031f86d7da rust-std-1.71.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 5d469176aae820868d4f86889621a371670d7ca2c860708f625da36b612ae4ab rust-std-1.71.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 d95d52c63989d80c9284d33c6db438763426c18fc814357de3e2c0ffc0f202dd rust-std-1.71.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 103e5ac47a362f6db324eb08673f2b54ab041428585d5f3b9e991846f709b840 rust-std-1.71.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 ad91d662c93e5092367048c8e717f64a5096b876623e5fbc3c791b2d1f868dfb rust-std-1.71.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 9dc87b5807730e6a69c2bfc167d93599c6dd481fe5189ce1e395787c432d4353 rust-std-1.71.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 fac6cc57d8a922423db2f0239b8484df3b029d0b58a63676868de682680bbf87 rust-std-1.71.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 628957fbe1f8665578167c6814486941f7b04417dce8a499cababa3284a2260a rust-std-1.71.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 3ce73e032232522cd7c37e64b1e8895f16ddcef02b1646d078f67bb36b6c1494 rust-std-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 bf692cee46d6c04c3993795633fdc5d4c1dffa7e4d4924227fa3e044872440a4 rust-std-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 4ceab97a7c15e1235aa099306798e1eb8620aad5477b7123dc9e343bb9a6fcfe rust-std-1.71.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 679ef3ee4a3876f071e08539734de2fabfcc3410977e8c20ba685bc9f40a693b rust-std-1.71.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 98ae6530c3a41167e9d93d11ea078be98a02f6d809a06d0d51af3ce0f73150d7 rust-std-1.71.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 c91408683fe0918732525ec1e70263d3fc871ec8d15ae98768a1c6d7b9e3bff1 rust-std-1.71.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index 78e36317619f..2336887ae6b1 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.70.0 +RUST_BIN_VERSION = 1.71.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 1ceed7683c35..7940ce09a53c 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.70.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.70.0-src.tar.xz.asc -sha256 bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843bfbaf5c34639 rustc-1.70.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.71.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.71.0-src.tar.xz.asc +sha256 5814699031aafdcc2e2f71fc9b389678cd7042350d1583da061463d8e88681c7 rustc-1.71.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d4566b3142bf..d2625318fda6 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.70.0 +RUST_VERSION = 1.71.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From 0b9451cd75f3897cad35e7fd29d82939fc06a50a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 14 Jul 2023 06:54:15 +0200 Subject: [PATCH 1058/2890] package/intel-mediadriver: bump version to 23.3.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 81fa5ba02751..d22732b99fc2 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfcf2facc4f8bf3df6b147222786032be195874adacc2f4071fc6c91a0abdf0a intel-media-23.2.4.tar.gz +sha256 2d0e8892199f1f2365fd8729776bdfd9968a97a63ce1e759b3724bff57e9fc08 intel-media-23.3.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index dc63bb6239ef..58376bde2b43 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 23.2.4 +INTEL_MEDIADRIVER_VERSION = 23.3.0 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From a0ca839ab193a46ed215df9235554458b6c81f21 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 14 Jul 2023 07:02:51 +0200 Subject: [PATCH 1059/2890] {linux, linux-headers}: bump 6.{3, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 17bf808cdc00..cd0a6a38f6ad 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.4.2" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.4.3" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index a4542b94b6ea..c8e72d31a870 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 a326ab224176c5b17c73c9ccad85f32e49b6e4e764861d57595727b7ef10062c linux-6.4.2.tar.xz -sha256 cb7fdefc207dd4e8ef947fccd687126425edce0138ca11191bc0590c678e6cd7 linux-6.3.12.tar.xz +sha256 7134ed29360df6f37a26410630283f0592c91a6d2178a9648226d30ddf8c88a1 linux-6.4.3.tar.xz +sha256 ea460560e2898022c5f3c4649908694dcd75a094ffde726e8c6ca5e0a09491fb linux-6.3.13.tar.xz sha256 f9a4f91b609f7d332a5f2be01ab86336fa00149fae6bdc19f16fa19f78802d43 linux-6.1.38.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 6499089eae6b271063cb3e873ab7f4ba0543cfb21dcc9c54d9bcf5357db683f6 linux-5.15.120.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1944d47e4eab..d886a4659b13 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -410,8 +410,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.186" if BR2_KERNEL_HEADERS_5_10 default "5.15.120" if BR2_KERNEL_HEADERS_5_15 default "6.1.38" if BR2_KERNEL_HEADERS_6_1 - default "6.3.12" if BR2_KERNEL_HEADERS_6_3 - default "6.4.2" if BR2_KERNEL_HEADERS_6_4 + default "6.3.13" if BR2_KERNEL_HEADERS_6_3 + default "6.4.3" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From a1a2bfa429ebeb061059a00fdb6c2f9def494c78 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Fri, 14 Jul 2023 08:13:28 +0000 Subject: [PATCH 1060/2890] DEVELOPERS: update entry for Daniel Lang Signed-off-by: Daniel Lang Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index b7c9fa8c2751..1021e5c6ba06 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -649,7 +649,7 @@ F: package/odroidc2-firmware/ N: Daniel J. Leach F: package/dacapo/ -N: Daniel Lang +N: Daniel Lang F: package/atkmm/ F: package/atkmm2_28/ F: package/cairomm/ @@ -663,6 +663,7 @@ F: package/libsigc2/ F: package/paho-mqtt-cpp/ F: package/pangomm/ F: package/pangomm2_46/ +F: package/sam-ba/ N: Damien Lanson F: package/libvdpau/ From a9fa704025d025433651223fea5e8b1983520187 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 14 Jul 2023 12:20:15 +0200 Subject: [PATCH 1061/2890] package/rtl8822cs: fix coding style in Config.in Fixes: package/rtl8822cs/Config.in:10: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/rtl8822cs/Config.in:11: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) As reported by: https://gitlab.com/buildroot.org/buildroot/-/jobs/4653997920 Signed-off-by: Thomas Petazzoni --- package/rtl8822cs/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8822cs/Config.in b/package/rtl8822cs/Config.in index ee5f09928d72..c827291ae4f7 100644 --- a/package/rtl8822cs/Config.in +++ b/package/rtl8822cs/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_RTL8822CS depends on !BR2_s390x depends on BR2_LINUX_KERNEL help - Realtek RTL8822CS Wi-Fi driver as a kernel module (JetHome - repository) + Realtek RTL8822CS Wi-Fi driver as a kernel module (JetHome + repository) https://github.com/jethome-ru/rtl88x2cs/ From 4528d5093c9a0002be6787024a342979666ce9af Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 17:53:23 +0200 Subject: [PATCH 1062/2890] package/gnutls: bump version to 3.8.0 Updated license hashes due to upstream commit: "Sync GPL/LGPL license files from Gnulib" https://github.com/gnutls/gnutls/commit/a39e528897184c6f6a33d245b82891a8dc8090ce Removed configure options related to guile which were removed upstream: https://github.com/gnutls/gnutls/commit/100cc2a706b8e097cbeb63d08c7ea59717c906ca Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/gnutls/gnutls.hash | 8 ++++---- package/gnutls/gnutls.mk | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 303f1351e07c..2f6dba9d3c96 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.8.tar.xz.sig -sha256 c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114 gnutls-3.7.8.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz.sig +sha256 0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 gnutls-3.8.0.tar.xz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 6e2cc501ef26..d6b8b229bdb2 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,8 +5,8 @@ ################################################################################ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS -GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8 +GNUTLS_VERSION_MAJOR = 3.8 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).0 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) @@ -16,7 +16,6 @@ GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 libunistring nettle GNUTLS_CPE_ID_VENDOR = gnu GNUTLS_CONF_OPTS = \ --disable-doc \ - --disable-guile \ --disable-libdane \ --disable-rpath \ --disable-tests \ @@ -44,7 +43,6 @@ GNUTLS_INSTALL_STAGING = YES HOST_GNUTLS_DEPENDENCIES = host-pkgconf host-libtasn1 host-libunistring host-nettle HOST_GNUTLS_CONF_OPTS = \ --disable-doc \ - --disable-guile \ --disable-libdane \ --disable-rpath \ --disable-tests \ From ecfa41b6f1b8c4cec9048acc0d241521811447db Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 11:25:58 +0200 Subject: [PATCH 1063/2890] package/wireless-regdb: bump version to 2023.05.03 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index 36451f839d84..b4e8dcaf5444 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73 wireless-regdb-2023.02.13.tar.xz +sha256 f254d08ab3765aeae2b856222e11a95d44aef519a6663877c71ef68fae4c8c12 wireless-regdb-2023.05.03.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 68fbe35b8be9..db9c7f42d566 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2023.02.13 +WIRELESS_REGDB_VERSION = 2023.05.03 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC From ad276d94a392fb13244e042851a44269e6254d61 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 12:41:59 +0200 Subject: [PATCH 1064/2890] package/util-linux: bump version to 2.39 Release notes: https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/v2.39-ReleaseNotes Removed patch which is included in this version bump. Updated license hash due to upstream commit https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=faeb1b64b36ededd1a0b62555cad65f002d47ac6 adding the BSD-2-Clause license: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/diff/README.licensing?id=faeb1b64b36ededd1a0b62555cad65f002d47ac6 Even though there is now some BSD-2-Clause code in util-linux, no license file was added upstream with the BSD-2-Clause text. Reformatted UTIL_LINUX_LICENSE and added BSD-2-Clause license. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...improve-dependence-on-NS_GET_-ioctls.patch | 34 ------------------- package/util-linux/util-linux.hash | 6 ++-- package/util-linux/util-linux.mk | 10 ++++-- 4 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 package/util-linux/0001-lsns-improve-dependence-on-NS_GET_-ioctls.patch diff --git a/.checkpackageignore b/.checkpackageignore index b88ad4ce9006..dc7770eff90a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1532,7 +1532,6 @@ package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch Upstream package/ussp-push/0001-fix-build-against-bluez-4.patch Upstream package/ussp-push/0002-fix-build-again-obex-bluez.patch Upstream package/ussp-push/0003-add-OBEX_CharToUnicode.patch Upstream -package/util-linux/0001-lsns-improve-dependence-on-NS_GET_-ioctls.patch Upstream package/vala/0001-dont-add-dirty-to-valac-version.patch Upstream package/vala/vala-wrapper Shellcheck package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch Upstream diff --git a/package/util-linux/0001-lsns-improve-dependence-on-NS_GET_-ioctls.patch b/package/util-linux/0001-lsns-improve-dependence-on-NS_GET_-ioctls.patch deleted file mode 100644 index 8e79b8d4d39c..000000000000 --- a/package/util-linux/0001-lsns-improve-dependence-on-NS_GET_-ioctls.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fc686823b008bc95e2ebe904c706a117a03e2754 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Wed, 6 Apr 2022 10:38:43 +0200 -Subject: lsns: improve dependence on NS_GET_ ioctls - -Fixes: http://autobuild.buildroot.org/results/572ecf8e37ac733a4e4265f4f78f35230337278e -Reported-by: Fabrice Fontaine -Signed-off-by: Karel Zak - -[Retrieved from: -https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=fc686823b008bc95e2ebe904c706a117a03e2754] -Signed-off-by: Fabrice Fontaine ---- - sys-utils/lsns.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c -index 1a7e9f333..75625b3a6 100644 ---- a/sys-utils/lsns.c -+++ b/sys-utils/lsns.c -@@ -40,7 +40,9 @@ - - #ifdef HAVE_LINUX_NSFS_H - # include --# define USE_NS_GET_API 1 -+# if defined(NS_GET_NSTYPE) && defined(NS_GET_OWNER_UID) -+# define USE_NS_GET_API 1 -+# endif - #endif - - #include "pathnames.h" --- -cgit - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 6f1bb74ecbb8..ab1807a28720 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,7 +1,7 @@ -# From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.38/sha256sums.asc -sha256 6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64 util-linux-2.38.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc +sha256 32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb util-linux-2.39.tar.xz # License files, locally calculated -sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing +sha256 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 87ec3c19d734..621e43ba79df 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -7,7 +7,7 @@ # When making changes to this file, please check if # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. -UTIL_LINUX_VERSION_MAJOR = 2.38 +UTIL_LINUX_VERSION_MAJOR = 2.39 UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) @@ -15,7 +15,13 @@ UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERS # README.licensing claims that some files are GPL-2.0 only, but this is not # true. Some files are GPL-3.0+ but only in tests and optionally in hwclock # (but we disable that option). rfkill uses an ISC-style license. -UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid), ISC (rfkill) +UTIL_LINUX_LICENSE = \ + GPL-2.0+, \ + BSD-4-Clause, \ + LGPL-2.1+ (libblkid, libfdisk, libmount), \ + BSD-3-Clause (libuuid), \ + BSD-2-Clause (xxhash), \ + ISC (rfkill) UTIL_LINUX_LICENSE_FILES = README.licensing \ Documentation/licenses/COPYING.BSD-3-Clause \ Documentation/licenses/COPYING.BSD-4-Clause-UC \ From e738ea3ebd6d1024b71f4f0ad5b8e63cccc0b37c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 19:51:42 +0200 Subject: [PATCH 1065/2890] package/nfs-utils: fix static build Fixes: http://autobuild.buildroot.net/results/f17/f17a554c86f0b24327b49fdc75612cc133f129ed/ f9dc4bab9f4576eed3a22ca7517bfc88d9812c34 bumped nfs-utils to version 2.6.3 which includes the addition of the two files patched here. Signed-off-by: Bernd Kuhls Reviewed-by: Giulio Benetti Reviewed-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- ...-guard-dlfcn.h-include-with-HAVE_DLF.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch diff --git a/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch b/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch new file mode 100644 index 000000000000..6612847be7e9 --- /dev/null +++ b/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch @@ -0,0 +1,44 @@ +From 274e4d212c30183242e48b639889865819f3ac33 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 11 Jun 2023 08:57:11 +0200 +Subject: [PATCH] support/reexport: guard dlfcn.h include with HAVE_DLFCN_H + +Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=8125c6f4ad156a9bad0dc2cc42e0243380fc478d + +Signed-off-by: Bernd Kuhls +--- + support/reexport/fsidd.c | 2 ++ + support/reexport/reexport.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/support/reexport/fsidd.c b/support/reexport/fsidd.c +index 37649d06..d4b245e8 100644 +--- a/support/reexport/fsidd.c ++++ b/support/reexport/fsidd.c +@@ -3,7 +3,9 @@ + #endif + + #include ++#ifdef HAVE_DLFCN_H + #include ++#endif + #include + #include + #include +diff --git a/support/reexport/reexport.c b/support/reexport/reexport.c +index d597a2f7..d9a700af 100644 +--- a/support/reexport/reexport.c ++++ b/support/reexport/reexport.c +@@ -2,7 +2,9 @@ + #include + #endif + ++#ifdef HAVE_DLFCN_H + #include ++#endif + #include + #include + #include +-- +2.39.2 + From 7258c27f6335aa66ce634c93b82ab146bf65f7f2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Jun 2023 18:26:02 +0200 Subject: [PATCH 1066/2890] package/elfutils: bump version to 0.189 Rebased patch due to upstream commit https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=c9c055a6949702af57e46f4eac3355d4a4f94c5d Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch | 4 ++-- package/elfutils/elfutils.hash | 4 ++-- package/elfutils/elfutils.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch index 85ac1e4b649e..565a3c1bbb04 100644 --- a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch +++ b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch @@ -12,7 +12,7 @@ function [-Werror=maybe-uninitialized] cc1: all warnings being treated as errors [Vincent: tweak patch for 0.166] -[Bernd: rebased patch for 0.177] +[Bernd: rebased patch for 0.177 & 0.189] Signed-off-by: "Yann E. MORIN" Signed-off-by: Vicente Olivert Riera @@ -26,9 +26,9 @@ index c2cc349ce876..99b368e09060 100644 --- a/config/eu.am +++ b/config/eu.am @@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - -Wold-style-definition -Wstrict-prototypes -Wtrampolines \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ + $(USE_AFTER_FREE3_WARNING) \ - $(if $($(*F)_no_Werror),,-Werror) \ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash index 3274b3265081..e3cc67dc0e5b 100644 --- a/package/elfutils/elfutils.hash +++ b/package/elfutils/elfutils.hash @@ -1,5 +1,5 @@ -# From https://sourceware.org/elfutils/ftp/0.186/sha512.sum -sha512 c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78 elfutils-0.186.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.189/sha512.sum +sha512 93a877e34db93e5498581d0ab2d702b08c0d87e4cafd9cec9d6636dfa85a168095c305c11583a5b0fb79374dd93bc8d0e9ce6016e6c172764bcea12861605b71 elfutils-0.189.tar.bz2 # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 8116ae597241..336544e12510 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELFUTILS_VERSION = 0.186 +ELFUTILS_VERSION = 0.189 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES From 52b325d1d4b884f661d143aa5311ba7737c77dd3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 14 Jul 2023 22:18:30 +0200 Subject: [PATCH 1067/2890] package/elfutils: fix build without c++ The version bump to 0.189 with commit 258c27f6335aa66ce634c93b82ab146bf65f7f2 introduced an error when libstdc++ support is not available and --disable-demangler was not used: https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=73e212b0a778c6dbe84f79b7eb2647dea50ea16f Fixes: http://autobuild.buildroot.net/results/cd4/cd4ca1a2b2eabe6937cb920cda5d8e566216546e/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/elfutils/elfutils.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 336544e12510..0757851b723e 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -66,6 +66,12 @@ ELFUTILS_DEPENDENCIES += argp-standalone ELFUTILS_CONF_OPTS += --disable-symbol-versioning endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +ELFUTILS_CONF_OPTS += --enable-demangler +else +ELFUTILS_CONF_OPTS += --disable-demangler +endif + ifeq ($(BR2_PACKAGE_BZIP2),y) ELFUTILS_DEPENDENCIES += bzip2 ELFUTILS_CONF_OPTS += --with-bzlib From 0368cd816307ee961bbd17ce2d3827b955b0c204 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 14 Jul 2023 22:35:30 +0200 Subject: [PATCH 1068/2890] package/libssh: fix build with Thumb /home/buildroot/autobuild/instance-3/output-1/build/libssh-0.10.5/src/bignum.c: In function 'ssh_make_bignum_string': /home/buildroot/autobuild/instance-3/output-1/build/libssh-0.10.5/src/bignum.c:64:1: sorry, unimplemented: '-fstack-check=specific' for Thumb-1 Fixes: http://autobuild.buildroot.net/results/82c/82c8e3bb755bc8732a81f05a72f04a96ecc08b4e/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libssh/libssh.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 3be6c6adaf31..e770d2b92443 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -17,6 +17,10 @@ LIBSSH_CONF_OPTS = \ -DWITH_STACK_PROTECTOR=OFF \ -DWITH_EXAMPLES=OFF +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBSSH_CONF_OPTS += -DWITH_STACK_CLASH_PROTECTION=OFF +endif + ifeq ($(BR2_PACKAGE_LIBSSH_SERVER),y) LIBSSH_CONF_OPTS += -DWITH_SERVER=ON else From 7be241b49cc1f537963b708ea5f26694385626e8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 14 Jul 2023 22:54:31 +0200 Subject: [PATCH 1069/2890] package/tovid: remove package Build is broken: "It seems that you are using `distutils.command.build` to add new subcommands. Using `distutils` directly is considered deprecated, please use `setuptools.command.build`. By 2023-Dec-13, you need to update your project and remove deprecated calls or your builds will no longer be supported." The last commit for this package occured on May, 30th, 2016. The last issue was opened Jan, 31st, 2017 and was unanswered. Fixes: http://autobuild.buildroot.net/results/b57/b571d7838950e0b5ca67106cbcd9ba61b4f04a48/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++ DEVELOPERS | 1 - package/Config.in | 1 - package/tovid/0001-manpage.patch | 25 ---------------- package/tovid/Config.in | 50 -------------------------------- package/tovid/tovid.hash | 3 -- package/tovid/tovid.mk | 13 --------- 7 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 package/tovid/0001-manpage.patch delete mode 100644 package/tovid/Config.in delete mode 100644 package/tovid/tovid.hash delete mode 100644 package/tovid/tovid.mk diff --git a/Config.in.legacy b/Config.in.legacy index 9cf138f42950..5c7e13fd5d5b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.08" +config BR2_PACKAGE_TOVID + bool "tovid removed" + select BR2_LEGACY + help + tovid was removed + config BR2_PACKAGE_LIBASPLIB bool "libasplib removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 1021e5c6ba06..555d597b00ee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2728,7 +2728,6 @@ F: package/dvdauthor/ F: package/dvdrw-tools/ F: package/memtest86/ F: package/mjpegtools/ -F: package/tovid/ F: package/udftools/ F: package/xorriso/ diff --git a/package/Config.in b/package/Config.in index 3a7466d5755c..57d3646566a8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -54,7 +54,6 @@ menu "Audio and video applications" source "package/speechd/Config.in" source "package/squeezelite/Config.in" source "package/tinycompress/Config.in" - source "package/tovid/Config.in" source "package/tstools/Config.in" source "package/twolame/Config.in" source "package/udpxy/Config.in" diff --git a/package/tovid/0001-manpage.patch b/package/tovid/0001-manpage.patch deleted file mode 100644 index 21669c9d5518..000000000000 --- a/package/tovid/0001-manpage.patch +++ /dev/null @@ -1,25 +0,0 @@ -setup.py: disable man page to kill txt2tags SVN checkout dependency - -Signed-off-by: Steve Kenton - -+diff -pruN tovid-3534.ori/setup.py tovid-3534/setup.py ---- tovid-3534.ori/setup.py 2013-04-14 09:52:08.000000000 -0500 -+++ tovid-3534/setup.py 2015-03-21 09:39:14.880173176 -0500 -@@ -186,7 +186,7 @@ class BuildTovidInit (Command): - - # Build tovid-init with regular 'build' command - build.sub_commands.append(('build_tovid_init', None)) --build.sub_commands.append(('build_docs', None)) -+#build.sub_commands.append(('build_docs', None)) - - # The actual setup - setup( -@@ -244,8 +244,6 @@ setup( - 'src/tovid.ini', - ]), - # Manual page -- ('share/man/man1', -- ['docs/man/tovid.1']), - # Desktop shortcut - ('share/applications', - ['tovidgui.desktop', diff --git a/package/tovid/Config.in b/package/tovid/Config.in deleted file mode 100644 index c263acdd62b1..000000000000 --- a/package/tovid/Config.in +++ /dev/null @@ -1,50 +0,0 @@ -config BR2_PACKAGE_TOVID - bool "tovid" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mpv - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_PYTHON3 - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mpv - depends on BR2_TOOLCHAIN_HAS_ATOMIC # mpv - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mpv - depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC # mpv - # The below dependencies are runtime dependencies only - select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng - select BR2_PACKAGE_DVDAUTHOR - select BR2_PACKAGE_DVDRW_TOOLS - select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_IMAGEMAGICK - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_MJPEGTOOLS - select BR2_PACKAGE_MPV - select BR2_PACKAGE_PROCPS_NG # pgrep and pkill - select BR2_PACKAGE_SOX - help - The tovid suite, also known simply as tovid, is a collection - of shell and Python scripts for creating DVDs and - (S)VCDs. It is pronounced "to vid" (because it converts to - video disc formats). - - http://tovid.wikia.com/wiki/Installing_tovid - -comment "tovid needs a toolchain w/ NPTL, C++, wchar, gcc >= 4.9" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ - || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC - -comment "tovid depends on python3" - depends on !BR2_PACKAGE_PYTHON3 - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC diff --git a/package/tovid/tovid.hash b/package/tovid/tovid.hash deleted file mode 100644 index 430ea52c1baf..000000000000 --- a/package/tovid/tovid.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 c03a746a3592a656bab0be4045da114a4231eb0f858d6c18503dac64049fbe48 tovid-87c676f4aadb7303d2cd921380b054bafa4b85bb.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/tovid/tovid.mk b/package/tovid/tovid.mk deleted file mode 100644 index 4c5c60aa7fc7..000000000000 --- a/package/tovid/tovid.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# tovid -# -################################################################################ - -TOVID_VERSION = 87c676f4aadb7303d2cd921380b054bafa4b85bb -TOVID_SITE = $(call github,tovid-suite,tovid,$(TOVID_VERSION)) -TOVID_LICENSE = GPL-2.0+ -TOVID_LICENSE_FILES = COPYING -TOVID_SETUP_TYPE = distutils - -$(eval $(python-package)) From f41fd3daf314ed84181d968ea7f5336d20ffde5b Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Fri, 14 Jul 2023 14:37:52 +0000 Subject: [PATCH 1070/2890] package/linux-firmware: fix old Mediatek WiFi firmware location The old Mediatek WiFi firmware was moved into a mediatek/ subdirectory, see https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=8451c2b1d529dc1a49328ac9235d3cf5bb8a8fcb Fixes: http://autobuild.buildroot.net/results/fd237455c59686d04a795af8b7e54e9f4678d073/ Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 9383b20c156d..068de3859edc 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -348,7 +348,7 @@ endif # MT7601 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U),y) -LINUX_FIRMWARE_FILES += mt7601u.bin +LINUX_FIRMWARE_FILES += mediatek/mt7601u.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware endif @@ -360,13 +360,13 @@ endif # MT7650 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650),y) -LINUX_FIRMWARE_FILES += mt7650.bin +LINUX_FIRMWARE_FILES += mediatek/mt7650.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware endif # MT76x2e ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT76X2E),y) -LINUX_FIRMWARE_FILES += mt7662.bin mt7662_rom_patch.bin +LINUX_FIRMWARE_FILES += mediatek/mt7662.bin mediatek/mt7662_rom_patch.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware endif From 305e74b2d89b982f7a73464f042f3e949a920930 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 14 Jul 2023 18:42:03 +0200 Subject: [PATCH 1071/2890] support/testing/tests/package/test_lzop.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_lzop.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 support/testing/tests/package/test_lzop.py diff --git a/DEVELOPERS b/DEVELOPERS index 555d597b00ee..0f306b61f185 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1747,6 +1747,7 @@ F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py +F: support/testing/tests/package/test_lzop.py F: support/testing/tests/package/test_mtools.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py diff --git a/support/testing/tests/package/test_lzop.py b/support/testing/tests/package/test_lzop.py new file mode 100644 index 000000000000..8d20ece3d69b --- /dev/null +++ b/support/testing/tests/package/test_lzop.py @@ -0,0 +1,12 @@ +from tests.package.test_compressor_base import TestCompressorBase + + +class TestLzop(TestCompressorBase): + __test__ = True + config = TestCompressorBase.config + \ + """ + BR2_PACKAGE_LZOP=y + """ + compress_cmd = "lzop" + decompress_cmd = "lzop -d" + compressed_file_ext = ".lzo" From 78c7f45946aed16ae40a0246aff2d14b905ce332 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 14 Jul 2023 18:42:19 +0200 Subject: [PATCH 1072/2890] support/testing/tests/package/test_pigz.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_pigz.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 support/testing/tests/package/test_pigz.py diff --git a/DEVELOPERS b/DEVELOPERS index 0f306b61f185..3c8a6197da86 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1755,6 +1755,7 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_openblas.py F: support/testing/tests/package/test_perftest.py +F: support/testing/tests/package/test_pigz.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_hkdf.py diff --git a/support/testing/tests/package/test_pigz.py b/support/testing/tests/package/test_pigz.py new file mode 100644 index 000000000000..92a4170265db --- /dev/null +++ b/support/testing/tests/package/test_pigz.py @@ -0,0 +1,12 @@ +from tests.package.test_compressor_base import TestCompressorBase + + +class TestPigz(TestCompressorBase): + __test__ = True + config = TestCompressorBase.config + \ + """ + BR2_PACKAGE_PIGZ=y + """ + compress_cmd = "pigz -p3" + decompress_cmd = "pigz -d -p3" + compressed_file_ext = ".gz" From 2fd06a0e57278891cd29f3497a5d23692716e253 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 14 Jul 2023 18:42:30 +0200 Subject: [PATCH 1073/2890] support/testing/tests/package/test_zchunk.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_zchunk.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 support/testing/tests/package/test_zchunk.py diff --git a/DEVELOPERS b/DEVELOPERS index 3c8a6197da86..405ccd645a20 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1769,6 +1769,7 @@ F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_xz.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ +F: support/testing/tests/package/test_zchunk.py F: support/testing/tests/package/test_zstd.py N: Julien Viard de Galbert diff --git a/support/testing/tests/package/test_zchunk.py b/support/testing/tests/package/test_zchunk.py new file mode 100644 index 000000000000..c250b748ef17 --- /dev/null +++ b/support/testing/tests/package/test_zchunk.py @@ -0,0 +1,16 @@ +from tests.package.test_compressor_base import TestCompressorBase + + +class TestZchunk(TestCompressorBase): + __test__ = True + config = TestCompressorBase.config + \ + """ + BR2_PACKAGE_ZCHUNK=y + BR2_PACKAGE_ZSTD=y + """ + compress_cmd = "zck" + + def check_integrity_test(self): + # Do nothing for the integrity test, because "zck" does not + # implement this feature. + pass From 9b31b643825e5ffa0e5849b622de4925b5b73cb9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 14 Jul 2023 20:24:00 +0200 Subject: [PATCH 1074/2890] utils/genrandconfig: increase default target ubifs image size The new value is calculated based on: ROOTFS_SIZE = 5G (see commit 3c98eb26db6501a373cc405c80505ba72fde9e96) BR2_TARGET_ROOTFS_UBIFS_LEBSIZE = 0x1f800 5G / 0x1f800 = 41610 Fixes: http://autobuild.buildroot.net/results/f72/f72918d63510b170e5da01bfa9c247cf9dcf507f/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 0938260c1be4..60922e871c10 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -525,6 +525,11 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_ROOTFS_F2FS_SIZE="100M"\n') configlines.append('BR2_TARGET_ROOTFS_F2FS_SIZE="%s"\n' % ROOTFS_SIZE) + if 'BR2_TARGET_ROOTFS_UBIFS=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2048\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2048\n') + configlines.append('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=41610\n') + if 'BR2_TARGET_S500_BOOTLOADER=y\n' in configlines and \ 'BR2_TARGET_S500_BOOTLOADER_BOARD=""\n' in configlines: configlines.remove('BR2_TARGET_S500_BOOTLOADER=y\n') From d3db2e61ce9d84247e9d72d72fad624ae471efee Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 14 Jul 2023 23:48:33 +0200 Subject: [PATCH 1075/2890] .checkpackageignore: remove entry to tovid patch The tovid package was removed in commit 7be241b49cc1f537963b708ea5f26694385626e8, but .checkpackageignore was forgotten. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4658045130 Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index dc7770eff90a..a762d8e98b23 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1489,7 +1489,6 @@ package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstrea package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch Upstream package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch Upstream package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch Upstream -package/tovid/0001-manpage.patch Upstream package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch Upstream package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables From 3c66f65a6a549930870f2c0d98abb5ca9321d2a5 Mon Sep 17 00:00:00 2001 From: Danny Wood Date: Fri, 14 Jul 2023 18:41:02 +0200 Subject: [PATCH 1076/2890] package/libopenssl: bump version to 3.0.9 Rebase patches onto new version Remove 0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch, 0006-Add-support-for-io_pgetevents_time64-syscall.patch, and 0007-Fixup-support-for-io_pgetevents_time64-syscall.patch as these are already applied upstream Updated license after switch to Apache license: https://www.openssl.org/blog/blog/2021/06/17/OpenSSL3.0ReleaseCandidate/ [Bernd: fixed license file/hash] Signed-off-by: Danny Wood Signed-off-by: Bernd Kuhls [Peter: update .checkpackageignore] Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 - ...building-manpages-if-we-re-not-going.patch | 8 +- ...ible-build-do-not-leak-compiler-path.patch | 8 +- ...ENSSL_NO_MADVISE-to-disable-call-to-.patch | 2 +- ...m-ppc-xlate.pl-add-linux64v2-flavour.patch | 64 ------------ ...ort-for-io_pgetevents_time64-syscall.patch | 61 ------------ ...ort-for-io_pgetevents_time64-syscall.patch | 98 ------------------- package/libopenssl/libopenssl.hash | 4 +- package/libopenssl/libopenssl.mk | 6 +- 9 files changed, 14 insertions(+), 240 deletions(-) delete mode 100644 package/libopenssl/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch delete mode 100644 package/libopenssl/0006-Add-support-for-io_pgetevents_time64-syscall.patch delete mode 100644 package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch diff --git a/.checkpackageignore b/.checkpackageignore index a762d8e98b23..a7bf69be394c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -790,9 +790,6 @@ package/libodb-mysql/0002-mariadb-FTBFS-fix.patch Upstream package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch Upstream package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch Upstream package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch Upstream -package/libopenssl/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch Upstream -package/libopenssl/0006-Add-support-for-io_pgetevents_time64-syscall.patch Upstream -package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch Upstream package/liboping/0001-fix-utf8-support.patch Upstream package/liboping/0002-Open-raw-sockets-when-adding-hosts-not-when-doing-th.patch Upstream package/liboping/0003-Fix-compile-break-with-GCC-7-buffer-overflow-with-snprintf.patch Upstream diff --git a/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch b/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch index 6527bc23a1d3..ed4590dd5507 100644 --- a/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +++ b/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch @@ -19,14 +19,14 @@ diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tm index 40cf2c3..777d9ca 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl -@@ -491,7 +491,7 @@ list-tests: +@@ -546,7 +546,7 @@ list-tests: @echo "Tests are not supported with your chosen Configure options" @ : {- output_on() if !$disabled{tests}; "" -} --install: install_sw install_ssldirs install_docs -+install: install_sw install_ssldirs +-install: install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -} ++install: install_sw install_ssldirs {- $disabled{fips} ? "" : "install_fips" -} - uninstall: uninstall_docs uninstall_sw + uninstall: uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} -- 2.16.3 diff --git a/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch b/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch index 820c2addf100..ea26a3107537 100644 --- a/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch +++ b/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch @@ -15,15 +15,15 @@ diff --git a/crypto/build.info b/crypto/build.info index 2c619c6..49ca6ab 100644 --- a/crypto/build.info +++ b/crypto/build.info -@@ -10,7 +10,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ - ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl +@@ -111,7 +111,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ + DEPEND[info.o]=buildinf.h DEPEND[cversion.o]=buildinf.h -GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" +GENERATE[buildinf.h]=../util/mkbuildinf.pl "$$(basename $(CC)) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" - DEPEND[buildinf.h]=../configdata.pm - GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME) + GENERATE[uplink-x86.S]=../ms/uplink-x86.pl + GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl -- 2.20.1 diff --git a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch index ef40b0353a35..425adea5d88a 100644 --- a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch +++ b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch @@ -13,7 +13,7 @@ diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c index 9e0f670..32c7282 100644 --- a/crypto/mem_sec.c +++ b/crypto/mem_sec.c -@@ -491,7 +491,7 @@ static int sh_init(size_t size, int minsize) +@@ -557,7 +557,7 @@ static int sh_init(size_t size, int minsize) if (mlock(sh.arena, sh.arena_size) < 0) ret = 2; #endif diff --git a/package/libopenssl/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch b/package/libopenssl/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch deleted file mode 100644 index 30bddc23deba..000000000000 --- a/package/libopenssl/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 07a0bbdd179a52907485fd793f0df31c097447af Mon Sep 17 00:00:00 2001 -From: Andy Polyakov -Date: Sun, 5 May 2019 18:25:50 +0200 -Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is a big endian ELFv2 configuration. ELFv2 was already being -used for little endian, and big endian was traditionally ELFv1 -but there are practical configurations that use ELFv2 with big -endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.) - -Reviewed-by: Paul Dale -Reviewed-by: Richard Levitte -(Merged from https://github.com/openssl/openssl/pull/8883) -Signed-off-by: Vincent Fazio ---- - crypto/perlasm/ppc-xlate.pl | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl -index d220c6245b..eec82b8d48 100755 ---- a/crypto/perlasm/ppc-xlate.pl -+++ b/crypto/perlasm/ppc-xlate.pl -@@ -49,7 +49,7 @@ my $globl = sub { - /osx/ && do { $name = "_$name"; - last; - }; -- /linux.*(32|64le)/ -+ /linux.*(32|64(le|v2))/ - && do { $ret .= ".globl $name"; - if (!$$type) { - $ret .= "\n.type $name,\@function"; -@@ -80,7 +80,7 @@ my $globl = sub { - }; - my $text = sub { - my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text"; -- $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64le/); -+ $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64(le|v2)/); - $ret; - }; - my $machine = sub { -@@ -186,7 +186,7 @@ my $vmr = sub { - - # Some ABIs specify vrsave, special-purpose register #256, as reserved - # for system use. --my $no_vrsave = ($flavour =~ /aix|linux64le/); -+my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/); - my $mtspr = sub { - my ($f,$idx,$ra) = @_; - if ($idx == 256 && $no_vrsave) { -@@ -318,7 +318,7 @@ while($line=<>) { - if ($label) { - my $xlated = ($GLOBALS{$label} or $label); - print "$xlated:"; -- if ($flavour =~ /linux.*64le/) { -+ if ($flavour =~ /linux.*64(le|v2)/) { - if ($TYPES{$label} =~ /function/) { - printf "\n.localentry %s,0\n",$xlated; - } --- -2.25.0 - diff --git a/package/libopenssl/0006-Add-support-for-io_pgetevents_time64-syscall.patch b/package/libopenssl/0006-Add-support-for-io_pgetevents_time64-syscall.patch deleted file mode 100644 index 0f59fa648e88..000000000000 --- a/package/libopenssl/0006-Add-support-for-io_pgetevents_time64-syscall.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Thu, 29 Aug 2019 13:56:21 -0700 -Subject: [PATCH] Add support for io_pgetevents_time64 syscall - -32-bit architectures that are y2038 safe don't include syscalls that use -32-bit time_t. Instead these architectures have suffixed syscalls that -always use a 64-bit time_t. In the case of the io_getevents syscall the -syscall has been replaced with the io_pgetevents_time64 syscall instead. - -This patch changes the io_getevents() function to use the correct -syscall based on the avaliable syscalls and the time_t size. We will -only use the new 64-bit time_t syscall if the architecture is using a -64-bit time_t. This is to avoid having to deal with 32/64-bit -conversions and relying on a 64-bit timespec struct on 32-bit time_t -platforms. As of Linux 5.3 there are no 32-bit time_t architectures -without __NR_io_getevents. In the future if a 32-bit time_t architecture -wants to use the 64-bit syscalls we can handle the conversion. - -This fixes build failures on 32-bit RISC-V. - -Signed-off-by: Alistair Francis - -Reviewed-by: Richard Levitte -Reviewed-by: Paul Dale -(Merged from https://github.com/openssl/openssl/pull/9819) ---- - engines/e_afalg.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/engines/e_afalg.c b/engines/e_afalg.c -index dacbe358cb..99516cb1bb 100644 ---- a/engines/e_afalg.c -+++ b/engines/e_afalg.c -@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max, - struct io_event *events, - struct timespec *timeout) - { -+#if defined(__NR_io_getevents) - return syscall(__NR_io_getevents, ctx, min, max, events, timeout); -+#elif defined(__NR_io_pgetevents_time64) -+ /* Let's only support the 64 suffix syscalls for 64-bit time_t. -+ * This simplifies the code for us as we don't need to use a 64-bit -+ * version of timespec with a 32-bit time_t and handle converting -+ * between 64-bit and 32-bit times and check for overflows. -+ */ -+ if (sizeof(timeout->tv_sec) == 8) -+ return syscall(__NR_io_pgetevents_time64, ctx, min, max, events, timeout, NULL); -+ else { -+ errno = ENOSYS; -+ return -1; -+ } -+#else -+# error "We require either the io_getevents syscall or __NR_io_pgetevents_time64." -+#endif - } - - static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key, --- -2.25.1 - diff --git a/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch b/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch deleted file mode 100644 index 7b003e483634..000000000000 --- a/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch +++ /dev/null @@ -1,98 +0,0 @@ -From e5499a3cac1e823c3e0697e8667e952317b70cc8 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Thu, 4 Mar 2021 12:10:11 -0500 -Subject: [PATCH] Fixup support for io_pgetevents_time64 syscall - -This is a fixup for the original commit 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc -"Add support for io_pgetevents_time64 syscall" that didn't correctly -work for 32-bit architecutres with a 64-bit time_t that aren't RISC-V. - -For a full discussion of the issue see: -https://github.com/openssl/openssl/commit/5b5e2985f355c8e99c196d9ce5d02c15bebadfbc - -Signed-off-by: Alistair Francis - -Reviewed-by: Tomas Mraz -Reviewed-by: Paul Dale -(Merged from https://github.com/openssl/openssl/pull/14432) ---- - engines/e_afalg.c | 55 ++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 42 insertions(+), 13 deletions(-) - -diff --git a/engines/e_afalg.c b/engines/e_afalg.c -index 9480d7c24b..4e9d67db2d 100644 ---- a/engines/e_afalg.c -+++ b/engines/e_afalg.c -@@ -121,27 +121,56 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb) - return syscall(__NR_io_submit, ctx, n, iocb); - } - -+/* A version of 'struct timespec' with 32-bit time_t and nanoseconds. */ -+struct __timespec32 -+{ -+ __kernel_long_t tv_sec; -+ __kernel_long_t tv_nsec; -+}; -+ - static ossl_inline int io_getevents(aio_context_t ctx, long min, long max, - struct io_event *events, - struct timespec *timeout) - { -+#if defined(__NR_io_pgetevents_time64) -+ /* Check if we are a 32-bit architecture with a 64-bit time_t */ -+ if (sizeof(*timeout) != sizeof(struct __timespec32)) { -+ int ret = syscall(__NR_io_pgetevents_time64, ctx, min, max, events, -+ timeout, NULL); -+ if (ret == 0 || errno != ENOSYS) -+ return ret; -+ } -+#endif -+ - #if defined(__NR_io_getevents) -- return syscall(__NR_io_getevents, ctx, min, max, events, timeout); --#elif defined(__NR_io_pgetevents_time64) -- /* Let's only support the 64 suffix syscalls for 64-bit time_t. -- * This simplifies the code for us as we don't need to use a 64-bit -- * version of timespec with a 32-bit time_t and handle converting -- * between 64-bit and 32-bit times and check for overflows. -- */ -- if (sizeof(timeout->tv_sec) == 8) -- return syscall(__NR_io_pgetevents_time64, ctx, min, max, events, timeout, NULL); -+ if (sizeof(*timeout) == sizeof(struct __timespec32)) -+ /* -+ * time_t matches our architecture length, we can just use -+ * __NR_io_getevents -+ */ -+ return syscall(__NR_io_getevents, ctx, min, max, events, timeout); - else { -- errno = ENOSYS; -- return -1; -+ /* -+ * We don't have __NR_io_pgetevents_time64, but we are using a -+ * 64-bit time_t on a 32-bit architecture. If we can fit the -+ * timeout value in a 32-bit time_t, then let's do that -+ * and then use the __NR_io_getevents syscall. -+ */ -+ if (timeout && timeout->tv_sec == (long)timeout->tv_sec) { -+ struct __timespec32 ts32; -+ -+ ts32.tv_sec = (__kernel_long_t) timeout->tv_sec; -+ ts32.tv_nsec = (__kernel_long_t) timeout->tv_nsec; -+ -+ return syscall(__NR_io_getevents, ctx, min, max, events, ts32); -+ } else { -+ return syscall(__NR_io_getevents, ctx, min, max, events, NULL); -+ } - } --#else --# error "We require either the io_getevents syscall or __NR_io_pgetevents_time64." - #endif -+ -+ errno = ENOSYS; -+ return -1; - } - - static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key, --- -2.25.1 - diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 708926de8037..ddba5f204919 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ # From https://www.openssl.org/source/openssl-1.1.1u.tar.gz.sha256 -sha256 e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6 openssl-1.1.1u.tar.gz +sha256 eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90 openssl-3.0.9.tar.gz # License files -sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE +sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index cd3ba3df3085..7a4e0dfca247 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1u +LIBOPENSSL_VERSION = 3.0.9 LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz -LIBOPENSSL_LICENSE = OpenSSL or SSLeay -LIBOPENSSL_LICENSE_FILES = LICENSE +LIBOPENSSL_LICENSE = Apache-2.0 +LIBOPENSSL_LICENSE_FILES = LICENSE.txt LIBOPENSSL_INSTALL_STAGING = YES LIBOPENSSL_DEPENDENCIES = zlib HOST_LIBOPENSSL_DEPENDENCIES = host-zlib From 14216c3c85491ea1dc1fa753a8006ab2ce3cc3f7 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 12 Jun 2023 01:36:19 +0200 Subject: [PATCH 1077/2890] package/python-rpi-ws281x: bump to version 5.0.0 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/python-rpi-ws281x/python-rpi-ws281x.hash | 4 ++-- package/python-rpi-ws281x/python-rpi-ws281x.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-rpi-ws281x/python-rpi-ws281x.hash b/package/python-rpi-ws281x/python-rpi-ws281x.hash index ffdd826b6f99..42bc20552324 100644 --- a/package/python-rpi-ws281x/python-rpi-ws281x.hash +++ b/package/python-rpi-ws281x/python-rpi-ws281x.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/rpi-ws281x/json -md5 016e1f03f9168ef03d4baf074aa60f03 rpi_ws281x-4.3.4.tar.gz -sha256 072eff1787e579d1710381b27c467709e3aab28ac579c7a47d7cc87398496f28 rpi_ws281x-4.3.4.tar.gz +md5 9c87b5bedba0a48bb97e9953378dfb78 rpi_ws281x-5.0.0.tar.gz +sha256 00ce6db771436b778d0930245cf8ea2aae11008cc5fd67d57789c5422af3ee55 rpi_ws281x-5.0.0.tar.gz # Locally computed sha256 checksums sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 LICENSE sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 lib/LICENSE diff --git a/package/python-rpi-ws281x/python-rpi-ws281x.mk b/package/python-rpi-ws281x/python-rpi-ws281x.mk index 73befeb56e98..610467b160cf 100644 --- a/package/python-rpi-ws281x/python-rpi-ws281x.mk +++ b/package/python-rpi-ws281x/python-rpi-ws281x.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPI_WS281X_VERSION = 4.3.4 +PYTHON_RPI_WS281X_VERSION = 5.0.0 PYTHON_RPI_WS281X_SOURCE = rpi_ws281x-$(PYTHON_RPI_WS281X_VERSION).tar.gz -PYTHON_RPI_WS281X_SITE = https://files.pythonhosted.org/packages/e2/d4/75fcc4f3412b9b16e39e6cd6156f2e171fe7b2e79057be17d1acf38fded4 +PYTHON_RPI_WS281X_SITE = https://files.pythonhosted.org/packages/c0/1e/642208a685c5e96d38323f42c75d9b24f95e2d1b8390dd104e04a712f29e PYTHON_RPI_WS281X_SETUP_TYPE = setuptools PYTHON_RPI_WS281X_LICENSE = BSD-2-Clause PYTHON_RPI_WS281X_LICENSE_FILES = LICENSE lib/LICENSE From 5eec4aac49c4a01ad35a927ad72d0dd2114d93eb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 17 Jul 2023 17:06:21 +0200 Subject: [PATCH 1078/2890] Update for 2023.05.1 Signed-off-by: Peter Korsgaard (cherry picked from commit 7814dbce1580c51f62255105ae572da2c42f2eb4) [Peter: drop Makefile update] Signed-off-by: Peter Korsgaard --- CHANGES | 31 +++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 83034c48597a..bbf8fccca26f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,34 @@ +2023.05.1, released July 17th, 2023 + + Important / security related fixes. + + Defconfigs: Chiliboard, mx53loco: fix build on hosts without + openssl development headers. + Nitrogen*: fix build on hosts without openssl or pylibfdt. + Hifive unleased: Bump OpenSBI to 1.2 to fix a build issue. + Raspberrypi: Handle DTB overlays for all variants + + Updated/fixed packages: agentpp, alsa-plugins, assimp, audit, + bind, busybox, c-ares, check, cups, dav1d, dbus, fftw, + fluidsynth, freetype, fwts, ghostscript, gnupg2, gnuradio, + graphicsmagick, gupnp, haproxy, heimdal, hwdata, jhead, kodi, + libcap, libgcrypt, libgpg-error, libgtk3, libmdbx, libxslt, + mesa3d, mesa3d-demos, mpir, nodejs, php, pkgconf, + python-cryptography, python-dbus-fast, python-django, + python-docker, python-pyicu, python-requests, python3, qemu, + qt6, quickjs, rtl8192eu, samba4, sconeserver, syslog-ng, + taglib, tiff, wine, wireshark, xdriver_xf86-video-dummy, + xlib_libX11, + + Issues resolved (http://bugs.uclibc.org): + + #15643: ERROR: No hash found for linux-6.3.8.tar.xz + #15658: hifive_unleashed_defconfig: Linker errors in opensbi-0.9 + #15661: mx53loco_defconfig: Dependency on OpenSSL missing + #15664: Can't compile mesa3d with v3d driver + #15673: PKGCONF_SITE in pkgconf.mk points to parked domain + #15682: pkgconf: no longer able to download source from... + 2023.05, released June 7th, 2023 Fixes all over the tree. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index eaac13e32bd0..12da353f2e1c 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.05' +RELEASE='2023.05.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From 6c8abbf72fdebfe8d1b34dc40113c8db0a800ed3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 17 Jul 2023 18:13:44 +0200 Subject: [PATCH 1079/2890] docs/website: Update for 2023.05.1 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 0a97d9f8224a..32b3d04d634a 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

                  buildroot-2023.02.2.tar.xz

                  -

                  Latest stable release: 2023.05

                  +

                  Latest stable release: 2023.05.1

                  - +
                  - +
                  -

                  buildroot-2023.05.tar.gz

                  -

                  PGP signature

                  +

                  buildroot-2023.05.1.tar.gz

                  +

                  PGP signature

                  - +
                  - +
                  -

                  buildroot-2023.05.tar.xz

                  -

                  PGP signature

                  +

                  buildroot-2023.05.1.tar.xz

                  +

                  PGP signature

                  + unix:tmpdir=/tmp + + + EXTERNAL + @@ -23,6 +35,9 @@ + + /etc/dbus-1/session.conf + session.d diff --git a/package/dbus-broker/system.conf b/package/dbus-broker/system.conf index 4b17fbd90eca..272f92361e46 100644 --- a/package/dbus-broker/system.conf +++ b/package/dbus-broker/system.conf @@ -14,18 +14,33 @@ system - - - dbus + + + + + /usr/libexec/dbus-daemon-launch-helper + + + /run/messagebus.pid + + + EXTERNAL + + + unix:path=/run/dbus/system_bus_socket + @@ -54,6 +69,8 @@ send_interface="org.freedesktop.DBus.Introspectable"/> + + + /etc/dbus-1/system.conf + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
                diff --git a/docs/website/news.html b/docs/website/news.html index acd3ffeee412..a338b15acffd 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

                News

                  +
                • +
                  +
                  +
                  +

                  2023.08-rc1 released

                  +

                  5 August 2023

                  +
                  +
                  +

                  We have a new release candidate! Lots of changes all over + the tree, see + the CHANGES + file for more details.

                  +

                  Go to the downloads page to pick up the + 2023.08-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

                  +
                  +
                  +
                  • +
                • From a5a7de82f37c5b6997894f51aff50593b6081cfa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Aug 2023 23:57:45 +0200 Subject: [PATCH 1425/2890] Kickoff 2023.11 cycle Signed-off-by: Thomas Petazzoni --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 080136bc9a15..18e337006b49 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.08-rc1 +export BR2_VERSION := 2023.11-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1691269000 From 09c4a7a35fb0e82f24399dea4507e47242eee27b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 23:33:26 +0200 Subject: [PATCH 1426/2890] package/gmp: bump version to 6.3.0 Removed patch which is included in this release. Release notes: https://gmplib.org/list-archives/gmp-announce/2023-July/000050.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...z-inp_raw.c-Avoid-bit-size-overflows.patch | 27 ------------------- package/gmp/gmp.hash | 2 +- package/gmp/gmp.mk | 5 +--- 4 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch diff --git a/.checkpackageignore b/.checkpackageignore index f846cc7a8723..3a9329ab717a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -536,7 +536,6 @@ package/gli/0001-Optional-building-tests.patch Upstream package/glog/0001-added-emscripten-support.patch Upstream package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream -package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch Upstream package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch Upstream package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch Upstream package/gnuplot/0001-configure-add-without-demo-option.patch Upstream diff --git a/package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch b/package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch deleted file mode 100644 index 0003f342c3c8..000000000000 --- a/package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch +++ /dev/null @@ -1,27 +0,0 @@ -# HG changeset patch -# User Marco Bodrato -# Date 1634836009 -7200 -# Node ID 561a9c25298e17bb01896801ff353546c6923dbd -# Parent e1fd9db13b475209a864577237ea4b9105b3e96e -mpz/inp_raw.c: Avoid bit size overflows - -[Retrieved from: https://gmplib.org/repo/gmp-6.2/rev/561a9c25298e] -Signed-off-by: Fabrice Fontaine - -diff -r e1fd9db13b47 -r 561a9c25298e mpz/inp_raw.c ---- a/mpz/inp_raw.c Tue Dec 22 23:49:51 2020 +0100 -+++ b/mpz/inp_raw.c Thu Oct 21 19:06:49 2021 +0200 -@@ -88,8 +88,11 @@ - - abs_csize = ABS (csize); - -+ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8)) -+ return 0; /* Bit size overflows */ -+ - /* round up to a multiple of limbs */ -- abs_xsize = BITS_TO_LIMBS (abs_csize*8); -+ abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8); - - if (abs_xsize != 0) - { - diff --git a/package/gmp/gmp.hash b/package/gmp/gmp.hash index d55e312bbb58..8c8b4d1151bc 100644 --- a/package/gmp/gmp.hash +++ b/package/gmp/gmp.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2 gmp-6.2.1.tar.xz +sha256 a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898 gmp-6.3.0.tar.xz # Locally calculated sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 9b402767fd8e..c52a5214a6bd 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -GMP_VERSION = 6.2.1 +GMP_VERSION = 6.3.0 GMP_SITE = $(BR2_GNU_MIRROR)/gmp GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz GMP_INSTALL_STAGING = YES @@ -14,9 +14,6 @@ GMP_CPE_ID_VENDOR = gmplib GMP_DEPENDENCIES = host-m4 HOST_GMP_DEPENDENCIES = host-m4 -# 0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch -GMP_IGNORE_CVES += CVE-2021-43618 - # GMP doesn't support assembly for coldfire or mips r6 ISA yet # Disable for ARM v7m since it has different asm constraints ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CPU_ARMV7M),y) From 7991d2c48a859f9c0333ade8192868c21b1a8a31 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 23:34:08 +0200 Subject: [PATCH 1427/2890] package/libarchive: bump version to 3.7.1 Removed patch, upstream applied a different solution: https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 Release notes: https://github.com/libarchive/libarchive/releases/tag/v3.7.1 https://github.com/libarchive/libarchive/releases/tag/v3.7.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...o-not-add-iconv-for-Requires.private.patch | 28 ------------------- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 6 +--- 4 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch diff --git a/.checkpackageignore b/.checkpackageignore index 3a9329ab717a..f5c4f807e759 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -659,7 +659,6 @@ package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch Upstream package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch Upstream package/lftp/0002-src-lftp_ssl.c-fix-build-with-libressl-2.7.0.patch Upstream package/libabseil-cpp/0001-force-position-independent-code.patch Upstream -package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch Upstream package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch Upstream package/libart/0001-art-config-cross.patch Sob Upstream package/libatasmart/0001-strpool-cross-flags.patch Upstream diff --git a/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch deleted file mode 100644 index 91903866ef29..000000000000 --- a/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 619c1be8d38ff79622db8f66f3b02832795315f9 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Wed, 14 Dec 2022 09:04:39 +0100 -Subject: [PATCH] autotools: do not add iconv for Requires.private - -There is no pkgconfig file for iconv, thus things break with this -change. Let's drop iconv from Requires.private. - -Fixes: a83f3d32 ("autotools: Fix static linking when openssl is enabled in windows") -[Retrieved from: -https://github.com/libarchive/libarchive/pull/1817/commits/619c1be8d38ff79622db8f66f3b02832795315f9] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 99bff20d1..f245d0c55 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -378,7 +378,6 @@ if test "x$with_iconv" != "xno"; then - AC_CHECK_HEADERS([localcharset.h]) - am_save_LIBS="$LIBS" - LIBS="${LIBS} ${LIBICONV}" -- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" - AC_CHECK_FUNCS([locale_charset]) - LIBS="${am_save_LIBS}" - if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index b03bef3de590..02f7d8424613 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d libarchive-3.6.2.tar.xz +sha256 b17403ce670ff18d8e06fea05a9ea9accf70678c88f1b9392a2e29b51127895f libarchive-3.7.1.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 2010b6529f4a..5bcf559a6e5d 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,17 +4,13 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.6.2 +LIBARCHIVE_VERSION = 3.7.1 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive -# We're patching configure.ac -LIBARCHIVE_AUTORECONF = YES -# needed for autoreconf -LIBARCHIVE_DEPENDENCIES += host-pkgconf ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) From fb99d902e4ee36e0f50b3fe0c2ec4a05358b1915 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 23:34:37 +0200 Subject: [PATCH 1428/2890] package/xz: bump version to 5.4.4 Release notes: https://git.tukaani.org/?p=xz.git;a=blob;f=NEWS;hb=HEAD Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/xz/xz.hash | 4 ++-- package/xz/xz.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 0a8a13f1eba6..92bac40463e5 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://tukaani.org/xz/xz-5.4.3.tar.gz.sig -sha256 9243a04598d7a70c1f567a0143a255581ac5c64b140fd55fd5cbc1e00b0e6f90 xz-5.4.3.tar.bz2 +# https://tukaani.org/xz/xz-5.4.4.tar.gz.sig +sha256 0b6fcde1ac38e90433a2556f500c065950b9bcd2d602006efc334782bdfe6296 xz-5.4.4.tar.bz2 # Hash for license files sha256 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e COPYING diff --git a/package/xz/xz.mk b/package/xz/xz.mk index dcdbe142b61e..42fee82e8085 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.4.3 +XZ_VERSION = 5.4.4 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES From db8c5b35f29a163b7e72ca9e280904b76e6ff391 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 23:35:05 +0200 Subject: [PATCH 1429/2890] package/pipewire: bump version to 0.3.77 Release notes: https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 98de073bdbb0..88fd9c2fabae 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b30d886b87aa8c055af6d6c7261d1d04336f3a75221c31afe1ea8ba86184bf70 pipewire-0.3.74.tar.bz2 +sha256 3027cadf9933adb03b1895069c79f4eb39f7f2873b962c674ee1fec316ec60e1 pipewire-0.3.77.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 24e642b418d6..994da081b7ac 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.74 +PIPEWIRE_VERSION = 0.3.77 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) From b86708826bcbbc1f1af01ed84f3e13dc9538ac6b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 23:35:42 +0200 Subject: [PATCH 1430/2890] package/linux-firmware: bump version to 20230804 Updated license hash due to various commits: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/WHENCE Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.hash | 4 ++-- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 25b6d018a1ea..7ba9537dd8fb 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 87597111c0d4b71b31e53cb85a92c386921b84c825a402db8c82e0e86015500d linux-firmware-20230625.tar.xz +sha256 88d46c543847ee3b03404d4941d91c92974690ee1f6fdcbee9cef3e5f97db688 linux-firmware-20230804.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -35,6 +35,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 cb91afd4cf763c316d3cb6acc20a63a58d3c7e7b3ff03f254285a4414aeb76f9 WHENCE +sha256 0f87f8f67de39828d8e59c69369f850e0a80de638795e22ddfdd1f7f31cdf889 WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 01718fa1e075..a1cec90de2ca 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20230625 +LINUX_FIRMWARE_VERSION = 20230804 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES From 05f4c2fd102c0ca0a4e5947ce55e0a09660b6282 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 23:36:32 +0200 Subject: [PATCH 1431/2890] package/gnutls: bump version to 3.8.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 2f6dba9d3c96..a6ba6b22c695 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz.sig -sha256 0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 gnutls-3.8.0.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.1.tar.xz.sig +sha256 ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c gnutls-3.8.1.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index d6b8b229bdb2..d9b9831fd67b 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).0 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).1 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From 2a44207ea0eeaf2346cb6fe572a96770b74d9dc9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 23:36:52 +0200 Subject: [PATCH 1432/2890] package/hwdata: bump version to 0.373 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/hwdata/hwdata.hash | 2 +- package/hwdata/hwdata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 84979a70fac0..6915e04e46d5 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8059ed6f696b5be4bf77c59d57fc26e35d9e579ba2629e325400a6eb8b91089f hwdata-0.371.tar.gz +sha256 0db28dc635d5059ad23d068d2e56ef5dc540f95bc813ea5a3c0f5d63b03d20d6 hwdata-0.373.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index cac6b80185ec..025f5b496915 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.371 +HWDATA_VERSION = 0.373 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE From 7aea64c843590fb8dc3640d4ccc6851b114cdd30 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 6 Aug 2023 01:04:09 +0200 Subject: [PATCH 1433/2890] package/acpica: remove HARDWARE_NAME make variable override The HARDWARE_NAME Makefile variable was removed few years ago in upstream (by Thomas). See [1]. This commit was first included in tag R01_19_17 (version 20170119). See the change log [2]. This patch removes occurences of this HARDWARE_NAME, since it's now unneeded. There is no change in the behavior of this build recipe. [1] https://github.com/acpica/acpica/commit/0ba20f5f86d41bbe442eaeb426d13d25181fa512 [2] https://github.com/acpica/acpica/blob/R01_19_17/documents/changes.txt#L26 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/acpica/acpica.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk index 81f7d8e10311..b93294136972 100644 --- a/package/acpica/acpica.mk +++ b/package/acpica/acpica.mk @@ -14,7 +14,7 @@ HOST_ACPICA_DEPENDENCIES = host-bison host-flex define ACPICA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - HARDWARE_NAME=$(BR2_ARCH) HOST=_LINUX CC="$(TARGET_CC)" \ + HOST=_LINUX CC="$(TARGET_CC)" \ NOWERROR=TRUE \ all endef @@ -27,7 +27,7 @@ endef define ACPICA_INSTALL_TARGET_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - HARDWARE_NAME=$(BR2_ARCH) DESTDIR="$(TARGET_DIR)" \ + DESTDIR="$(TARGET_DIR)" \ INSTALLFLAGS=-m755 install endef From 6d37bf0509aa163154c7b8723ce653afb8810e6c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 6 Aug 2023 01:04:10 +0200 Subject: [PATCH 1434/2890] package/acpica: rename HOST make variable override to ACPI_HOST The HOST Makefile variable was renamed upstream to ACPI_HOST in [1]. This commit was first included in tag R02_14_20 (version 20200214). See the change log [2]. This no longer correct use of HOST did not introduced any compilation error, as the code uses constructs like: #if defined(_LINUX) || defined(__linux__) This patch change the variable name to follow upstream, just for correctness. [1] https://github.com/acpica/acpica/commit/98753481f7321a7c8f2a79ff0158cdc5e73acace [2] https://github.com/acpica/acpica/blob/R02_14_20/documents/changes.txt#L25 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/acpica/acpica.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk index b93294136972..bbabd9de69a5 100644 --- a/package/acpica/acpica.mk +++ b/package/acpica/acpica.mk @@ -14,7 +14,7 @@ HOST_ACPICA_DEPENDENCIES = host-bison host-flex define ACPICA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - HOST=_LINUX CC="$(TARGET_CC)" \ + ACPI_HOST=_LINUX CC="$(TARGET_CC)" \ NOWERROR=TRUE \ all endef From 7449146f5996b22d6f3db6ab67d5af3ec23b9ecb Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 26 Jul 2023 13:28:36 -0700 Subject: [PATCH 1435/2890] package/python-pylibfdt: bump version to 1.7.0.post1 Signed-off-by: Christian Stewart Tested-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- package/python-pylibfdt/python-pylibfdt.hash | 4 ++-- package/python-pylibfdt/python-pylibfdt.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pylibfdt/python-pylibfdt.hash b/package/python-pylibfdt/python-pylibfdt.hash index 056fd3a62ec9..82527e727edf 100644 --- a/package/python-pylibfdt/python-pylibfdt.hash +++ b/package/python-pylibfdt/python-pylibfdt.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.python.org/pypi/pylibfdt/json -md5 5765c20ac6cde517d5b7218503ab707b pylibfdt-1.6.1.tar.gz -sha256 90c667c5adf44c6ab2f13bdc566598897784c7b781bed91064e7373bd270b778 pylibfdt-1.6.1.tar.gz +md5 353ee3063d0b10e94d165e032897d34e pylibfdt-1.7.0.post1.tar.gz +sha256 2d048f9f8ce9a0527d497f423dea1f1135f9811c05b009cc5d5753771c1f9ba1 pylibfdt-1.7.0.post1.tar.gz # Locally computed sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd BSD-2-Clause sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 GPL diff --git a/package/python-pylibfdt/python-pylibfdt.mk b/package/python-pylibfdt/python-pylibfdt.mk index dc68de83b3ed..5511bd12b393 100644 --- a/package/python-pylibfdt/python-pylibfdt.mk +++ b/package/python-pylibfdt/python-pylibfdt.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PYLIBFDT_VERSION = 1.6.1 +PYTHON_PYLIBFDT_VERSION = 1.7.0.post1 PYTHON_PYLIBFDT_SOURCE = pylibfdt-$(PYTHON_PYLIBFDT_VERSION).tar.gz -PYTHON_PYLIBFDT_SITE = https://files.pythonhosted.org/packages/15/3c/40b1d6a1df9dbc9d9ba5700a47ad95ca1e984f18daf25ede0da5f67d0cf7 -PYTHON_PYLIBFDT_SETUP_TYPE = setuptools +PYTHON_PYLIBFDT_SITE = https://files.pythonhosted.org/packages/96/5c/77ef0f0459e0b13f39ecc22e21ad4ac9fbe741e8a7cd70702ac8165f80e2 +PYTHON_PYLIBFDT_SETUP_TYPE = pep517 PYTHON_PYLIBFDT_LICENSE = BSD-2-Clause or GPL-2.0+ PYTHON_PYLIBFDT_LICENSE_FILES = BSD-2-Clause GPL PYTHON_PYLIBFDT_DEPENDENCIES = host-python-setuptools-scm host-swig From 05a0adea8355ba0901d5af02548a57657a2af89d Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 26 Jul 2023 13:28:37 -0700 Subject: [PATCH 1436/2890] package/python-pylibfdt: add host python package Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/python-pylibfdt/python-pylibfdt.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pylibfdt/python-pylibfdt.mk b/package/python-pylibfdt/python-pylibfdt.mk index 5511bd12b393..9591439b014e 100644 --- a/package/python-pylibfdt/python-pylibfdt.mk +++ b/package/python-pylibfdt/python-pylibfdt.mk @@ -11,5 +11,7 @@ PYTHON_PYLIBFDT_SETUP_TYPE = pep517 PYTHON_PYLIBFDT_LICENSE = BSD-2-Clause or GPL-2.0+ PYTHON_PYLIBFDT_LICENSE_FILES = BSD-2-Clause GPL PYTHON_PYLIBFDT_DEPENDENCIES = host-python-setuptools-scm host-swig +HOST_PYTHON_PYLIBFDT_DEPENDENCIES = host-python-setuptools-scm host-swig $(eval $(python-package)) +$(eval $(host-python-package)) From f788a8f527c038112671ff6fdc968823a54cf3aa Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 26 Jul 2023 13:28:38 -0700 Subject: [PATCH 1437/2890] boot/uboot: add host-python-pylibfdt dependency if needed Until now, BR2_TARGET_UBOOT_NEEDS_PYLIBFDT was only bringing host-swig as a dependency, because U-Boot was building its own pylibfdt, which requires host-swig. However, since commit 231d79c81e9a1f8c2ef14861374a40fcdc5e6b33 ("boot/uboot: set DTC path when BR2_TARGET_UBOOT_NEEDS_DTC"), in which we tell U-Boot to use the Buildroot built DTC, a consequence is that U-Boot no longer builds its own pylibfdt: it expects the system to provided it. So now, BR2_TARGET_UBOOT_NEEDS_PYLIBFDT really needs to bring host-python-pylibfdt. The dependency on host-swig is no longer needed, as what we need is host-python-pylibfdt, and it is an internal detail of pylibfdt that it needs host-swig to build. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4749556137 https://gitlab.com/buildroot.org/buildroot/-/jobs/4749556224 https://gitlab.com/buildroot.org/buildroot/-/jobs/4749556227 https://gitlab.com/buildroot.org/buildroot/-/jobs/4749556229 https://gitlab.com/buildroot.org/buildroot/-/jobs/4749556230 Signed-off-by: Christian Stewart Tested-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index f0a85ee1caeb..9f81c0b84204 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -236,7 +236,7 @@ UBOOT_DEPENDENCIES += host-python3 host-python-setuptools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) -UBOOT_DEPENDENCIES += host-swig +UBOOT_DEPENDENCIES += host-python-pylibfdt endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) From ffbc72e8bc1feb28351d009aa6292309c8aaf9bf Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 4 Aug 2023 22:54:01 +0200 Subject: [PATCH 1438/2890] package/arp-scan: allow to not install package data The patch adds an option that allows you to not install the data along with the binaries (less than 100kb), saving 1.4Mb of rootfs data. By default, the data is installed for backward compatibility. Cc: Angelo Compagnucci Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/arp-scan/Config.in | 11 +++++++++++ package/arp-scan/arp-scan.mk | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/package/arp-scan/Config.in b/package/arp-scan/Config.in index ed70b3958610..cf7377d2f9b6 100644 --- a/package/arp-scan/Config.in +++ b/package/arp-scan/Config.in @@ -8,3 +8,14 @@ config BR2_PACKAGE_ARP_SCAN discover and fingerprint IP hosts on the local network. https://github.com/royhills/arp-scan + +if BR2_PACKAGE_ARP_SCAN + +config BR2_PACKAGE_ARP_SCAN_DATA + bool "install data (OUI)" + default y # legacy + help + Say 'y' here (the default) to install the data along the + binaries. + +endif # BR2_PACKAGE_ARP_SCAN diff --git a/package/arp-scan/arp-scan.mk b/package/arp-scan/arp-scan.mk index 89644be9d3ef..67eb1881dba2 100644 --- a/package/arp-scan/arp-scan.mk +++ b/package/arp-scan/arp-scan.mk @@ -23,4 +23,8 @@ else ARP_SCAN_CONF_OPTS += --without-libcap endif +ifeq ($(BR2_PACKAGE_ARP_SCAN_DATA),) +ARP_SCAN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec +endif + $(eval $(autotools-package)) From c2a450ddd6ab8235009149a9fc14ff77199a9d57 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 4 Aug 2023 20:33:19 +0200 Subject: [PATCH 1439/2890] package/stellarium: disable telescopecontrol plugin Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped stellarium which included this commit https://github.com/Stellarium/stellarium/commit/186b06fa215bd28ea03cc291dc861b552af8d99a It removed the previously bundled libindi source and lets stellarium download the sourcecode of the indiclient package (not present in buildroot) during the build: $ find output/build/stellarium-23.2/ -iname *.zip output/build/stellarium-23.2/_deps/indiclient-subbuild/indiclient-populate-prefix/src/v1.8.5.zip which breaks offline builds. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/stellarium/stellarium.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index 4dc5692d7935..cc25f9106391 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -20,6 +20,7 @@ STELLARIUM_CONF_OPTS = \ -DENABLE_NLS=OFF \ -DENABLE_QTWEBENGINE=OFF \ -DENABLE_QT6=OFF \ + -DUSE_PLUGIN_TELESCOPECONTROL=OFF \ -DUSE_SYSTEM_ZLIB=ON ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) @@ -34,13 +35,9 @@ STELLARIUM_DEPENDENCIES += qt5serialport ifeq ($(BR2_PACKAGE_GPSD),y) STELLARIUM_DEPENDENCIES += gpsd endif -STELLARIUM_CONF_OPTS += \ - -DENABLE_GPS=ON \ - -DUSE_PLUGIN_TELESCOPECONTROL=ON +STELLARIUM_CONF_OPTS += -DENABLE_GPS=ON else -STELLARIUM_CONF_OPTS += \ - -DENABLE_GPS=OFF \ - -DUSE_PLUGIN_TELESCOPECONTROL=OFF +STELLARIUM_CONF_OPTS += -DENABLE_GPS=OFF endif $(eval $(cmake-package)) From b032b3b1df645eaaf79f53005945bac7dad45e74 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 4 Aug 2023 20:33:20 +0200 Subject: [PATCH 1440/2890] package/stellarium: disable xlsx support Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped stellarium which included this commit https://github.com/Stellarium/stellarium/commit/186b06fa215bd28ea03cc291dc861b552af8d99a It removed the previously bundled QXlsx source and lets stellarium git-clone the sourcecode of the QXlsx package (not present in buildroot) during the build: $ find output/build/stellarium-23.2/ -iname .gitignore | grep qxl output/build/stellarium-23.2/_deps/qxlsxqt5-src/.gitignore which breaks offline builds. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/stellarium/stellarium.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index cc25f9106391..7ee19c8b184a 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -20,6 +20,7 @@ STELLARIUM_CONF_OPTS = \ -DENABLE_NLS=OFF \ -DENABLE_QTWEBENGINE=OFF \ -DENABLE_QT6=OFF \ + -DENABLE_XLSX=OFF \ -DUSE_PLUGIN_TELESCOPECONTROL=OFF \ -DUSE_SYSTEM_ZLIB=ON From 2616272339073834c262bc46fdf995fdaa91acf7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 4 Aug 2023 20:33:21 +0200 Subject: [PATCH 1441/2890] package/stellarium: disable ShowMySky atmosphere model Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped stellarium which included these commits https://github.com/Stellarium/stellarium/commit/b3f02beaec2a285251db1e1707abe2e423803834 https://github.com/Stellarium/stellarium/commit/5d5edd0e5f5630872628a1525685b77854b6e4b4 It downloads external packages during the build: $ find output/build/stellarium-23.2/ -iname *.tar.* output/build/stellarium-23.2/_deps/eigen3-subbuild/eigen3-populate-prefix/src/eigen-3.4.0.tar.bz2 output/build/stellarium-23.2/_deps/showmysky-qt5-subbuild/showmysky-qt5-populate-prefix/src/v0.3.1.tar.gz which breaks offline builds. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/stellarium/stellarium.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index 7ee19c8b184a..43c99413ddbc 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -18,6 +18,7 @@ STELLARIUM_DEPENDENCIES = \ STELLARIUM_CONF_OPTS = \ -DENABLE_MEDIA=ON \ -DENABLE_NLS=OFF \ + -DENABLE_SHOWMYSKY=OFF \ -DENABLE_QTWEBENGINE=OFF \ -DENABLE_QT6=OFF \ -DENABLE_XLSX=OFF \ From e4f053c7b0582251c8441def72619bbe18bb78ea Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 6 Aug 2023 12:57:03 +0200 Subject: [PATCH 1442/2890] package/lsof: add LSOF_CPE_ID_VENDOR cpe:2.3:a:lsof_project:lsof is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alsof_project%3Alsof Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/lsof/lsof.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 66911dddb914..8d9c1b60e322 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -10,6 +10,7 @@ LSOF_LICENSE = lsof license # License is repeated in each file, this is a relatively small one. # It is also defined in 00README, but that contains a lot of other cruft. LSOF_LICENSE_FILES = dialects/linux/dproto.h +LSOF_CPE_ID_VENDOR = lsof_project ifeq ($(BR2_PACKAGE_LIBTIRPC),y) LSOF_DEPENDENCIES += libtirpc From bcfa3d6d1b45e8aedea38142c12665d7d76f390b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 4 Aug 2023 18:11:21 +0200 Subject: [PATCH 1443/2890] package/tvheadend: needs __sync_*_8 intrisics Fixes: http://autobuild.buildroot.net/results/992/99235aa2aca1afe031a088baebbd46057fe75fcd/ /home/autobuild/autobuild/instance-15/output-1/build/tvheadend-fe47ecb5504a521fed9c1ca9705fb0dd2bb8443a/src/atomic.h:253: undefined reference to `__sync_lock_test_and_set_8' /home/autobuild/autobuild/instance-15/output-1/build/tvheadend-fe47ecb5504a521fed9c1ca9705fb0dd2bb8443a/src/atomic.h:81: undefined reference to `__sync_fetch_and_add_8' The build error was introduced by the latest bump of tvheadend with commit 67cbbbfe6e9632deacd0784bdbf51496ad76701d. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tvheadend/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in index 3d21897c6d7f..fa06f345e9d7 100644 --- a/package/tvheadend/Config.in +++ b/package/tvheadend/Config.in @@ -1,14 +1,14 @@ comment "tvheadend needs a toolchain w/ NPTL, headers >= 3.2, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_SYNC_8 menuconfig BR2_PACKAGE_TVHEADEND bool "tvheadend" depends on !BR2_STATIC_LIBS # dladdr() depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_SYNC_8 select BR2_PACKAGE_DTV_SCAN_TABLES select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_OPENSSL From cb9c63055db66f29cc0af15ba3f2be87ead0cf6f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 4 Aug 2023 21:38:01 +0200 Subject: [PATCH 1444/2890] package/harfbuzz: bump version to 8.1.1 Release notes: https://github.com/harfbuzz/harfbuzz/blob/main/NEWS Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 6b71e3819c6b..1f0d9befa120 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c1ce780acd385569f25b9a29603d1d5bc71e6940e55bfdd4f7266fad50e42620 harfbuzz-8.0.1.tar.xz +sha256 0305ad702e11906a5fc0c1ba11c270b7f64a8f5390d676aacfd71db129d6565f harfbuzz-8.1.1.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 3118ec62c988..6d52c52a8588 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 8.0.1 +HARFBUZZ_VERSION = 8.1.1 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 727584320785aca15990b2a03d4ff7b541b4c210 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 5 Aug 2023 10:07:52 +0200 Subject: [PATCH 1445/2890] package/lua-rotas: bump to version 0.3.0 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-rotas/lua-rotas.hash | 4 ++-- package/lua-rotas/lua-rotas.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-rotas/lua-rotas.hash b/package/lua-rotas/lua-rotas.hash index cb8d48c0eacd..6b33d94a851b 100644 --- a/package/lua-rotas/lua-rotas.hash +++ b/package/lua-rotas/lua-rotas.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 601d0fe9cb57e4c2fd22352c6e0f064888edc428e32f0cb7ddbdc9650f21d8d9 lua-rotas-0.2.2-1.src.rock -sha256 1112307622ef36ed8ee3e8ddb15ed294e699a9db45f6251d89343534388ec3dd lua-Rotas-0.2.2/COPYRIGHT +sha256 c1570d38552816c7b4a4881e491049a22214ddaa609f65d9edc8013b416cecf7 lua-rotas-0.3.0-1.src.rock +sha256 1112307622ef36ed8ee3e8ddb15ed294e699a9db45f6251d89343534388ec3dd lua-Rotas-0.3.0/COPYRIGHT diff --git a/package/lua-rotas/lua-rotas.mk b/package/lua-rotas/lua-rotas.mk index 5c9b2caacbfd..79e1e422911e 100644 --- a/package/lua-rotas/lua-rotas.mk +++ b/package/lua-rotas/lua-rotas.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_ROTAS_VERSION = 0.2.2-1 +LUA_ROTAS_VERSION = 0.3.0-1 LUA_ROTAS_NAME_UPSTREAM = lua-Rotas LUA_ROTAS_LICENSE = MIT LUA_ROTAS_LICENSE_FILES = $(LUA_ROTAS_SUBDIR)/COPYRIGHT From 05adefbafd532d901f8476e9dc59eb416108c4d4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 10:34:40 +0200 Subject: [PATCH 1446/2890] package/python-lxml: bump version to 4.9.3 Changelog: https://github.com/lxml/lxml/blob/master/CHANGES.txt Added sha256 hash provided by upstream. This release includes fixes for upcoming Python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-lxml/python-lxml.hash | 3 ++- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index 72df6d027873..e34cb193f4de 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,6 @@ +# From https://pypi.org/project/lxml/ +sha256 48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c lxml-4.9.3.tar.gz # Locally computed -sha256 2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67 lxml-4.9.2.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 657622a9620f..3ef3aabdbc89 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.9.2 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/06/5a/e11cad7b79f2cf3dd2ff8f81fa8ca667e7591d3d8451768589996b65dec1 +PYTHON_LXML_VERSION = 4.9.3 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/30/39/7305428d1c4f28282a4f5bdbef24e0f905d351f34cf351ceb131f5cddf78 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From 6a3166cc2931178602810e241c21c67ac885ab87 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 18:05:36 +0200 Subject: [PATCH 1447/2890] package/python-dominate: bump version to 2.8.0 Release notes: https://github.com/Knio/dominate/releases/tag/2.8.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-dominate/python-dominate.hash | 4 ++-- package/python-dominate/python-dominate.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dominate/python-dominate.hash b/package/python-dominate/python-dominate.hash index 89293baec60c..9993dbe95fc5 100644 --- a/package/python-dominate/python-dominate.hash +++ b/package/python-dominate/python-dominate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dominate/json -md5 77bba29beaaac4dfb657092cd89db033 dominate-2.7.0.tar.gz -sha256 520101360892ebf9d0553f67d37e359ff92403d8a1e33814030503088a05da49 dominate-2.7.0.tar.gz +md5 df2d30e7c2e7f1e5b085a58820e4cc94 dominate-2.8.0.tar.gz +sha256 4c90c3befaf88e612b71f4b39af7bcbef8977acfa855cec957225a8fbf504007 dominate-2.8.0.tar.gz # Locally computed sha256 checksums sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 LICENSE.txt diff --git a/package/python-dominate/python-dominate.mk b/package/python-dominate/python-dominate.mk index 0f3687de5ff4..39e2edb82e01 100644 --- a/package/python-dominate/python-dominate.mk +++ b/package/python-dominate/python-dominate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOMINATE_VERSION = 2.7.0 +PYTHON_DOMINATE_VERSION = 2.8.0 PYTHON_DOMINATE_SOURCE = dominate-$(PYTHON_DOMINATE_VERSION).tar.gz -PYTHON_DOMINATE_SITE = https://files.pythonhosted.org/packages/12/d7/5e5f50f5d5bdd4282d2a70b9479c1d91d6628bebd4829e455cdf7366a92e +PYTHON_DOMINATE_SITE = https://files.pythonhosted.org/packages/13/3d/8d22916c12184f0c4930b9cdfb136a130e8d8eacf5942fc9883f2a189f6a PYTHON_DOMINATE_SETUP_TYPE = setuptools PYTHON_DOMINATE_LICENSE = LGPL-3.0+ PYTHON_DOMINATE_LICENSE_FILES = LICENSE.txt From 90be99fd67f1f931c6fd1545b2e0690113a00316 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 3 Aug 2023 06:13:12 +0200 Subject: [PATCH 1448/2890] package/{mesa3d, mesa3d-headers}: bump version to 23.1.5 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-August/000726.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index b1013948693c..e602953a3fb4 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.1.4 +MESA3D_HEADERS_VERSION = 23.1.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 60c3bd6d5dac..3606cca56d12 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-July/000724.html -sha256 7261a17fb94867e3dc5a90d8a1f100fa04b0cbbde51d25302c0872b5e9a10959 mesa-23.1.4.tar.xz -sha512 4063c7848f507b5e25cfc862394268147254b90c9f3eb19035cce338b0a9cb611b7380c1c73f0e4feeddde68124225df7dee7b9db5f019603dfde2b88ff46a21 mesa-23.1.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-August/000726.html +sha256 3cf88576fdebf24fc4047067936131c90cb6541c27365996b79b661dec1fb153 mesa-23.1.5.tar.xz +sha512 c5eac5a497561374eaf931214aebc9001820c5ab49f9b8c5634b62af081b03b2f21c169c936524b2953c8815eb27dfb5c8c12276b9b1c119722cd6fea0b22d85 mesa-23.1.5.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 6fa5c1c68693..add9232d2fe2 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.1.4 +MESA3D_VERSION = 23.1.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 8251bf2d2d7572264bace97a160cbc5cfd04d10a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 3 Aug 2023 19:59:36 +0200 Subject: [PATCH 1449/2890] package/kodi-pvr-iptvsimple: bump version to 20.11.0-Nexus Release notes: https://github.com/kodi-pvr/pvr.iptvsimple/releases/tag/20.11.0-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 6be0623a5ab9..8f6072116316 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 91ed962a4f77a2aa5df820ce57cf744c2a8ea02a356dafc2da270cf813c2d669 kodi-pvr-iptvsimple-20.10.1-Nexus.tar.gz +sha256 c2014b11dd928a1d4789279d7f3ce25af8af4047194e8406f9dfd99d16fe2ee2 kodi-pvr-iptvsimple-20.11.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 1182ea517aed..1ea3975be561 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 20.10.1-Nexus +KODI_PVR_IPTVSIMPLE_VERSION = 20.11.0-Nexus KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md From f5d68db8bd7001ff25be1f512c8518dbbe7fe83d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 2 Aug 2023 20:12:15 +0200 Subject: [PATCH 1450/2890] package/liblo: add upstream patch to fix build error Since the merge of gcc 13.x, a warning treated as error causes liblo to fail building: server.c: In function 'lo_server_del_lo_method': server.c:2251:16: error: pointer 'prev' used after 'free' [-Werror=use-after-free] Fixes: http://autobuild.buildroot.net/results/c98/c98c21093714542d4c0546a742fdcc48f3f07d04/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...x-use-after-free-warning-in-server.c.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/liblo/0001-Fix-use-after-free-warning-in-server.c.patch diff --git a/package/liblo/0001-Fix-use-after-free-warning-in-server.c.patch b/package/liblo/0001-Fix-use-after-free-warning-in-server.c.patch new file mode 100644 index 000000000000..be815a0a612c --- /dev/null +++ b/package/liblo/0001-Fix-use-after-free-warning-in-server.c.patch @@ -0,0 +1,29 @@ +From 8187a8456c14eeb3af08c86ffa1228823c9ef1c5 Mon Sep 17 00:00:00 2001 +From: Guido Aulisi +Date: Sun, 25 Jun 2023 15:58:30 +0200 +Subject: [PATCH] Fix use-after-free warning in server.c + +That assignment is not necessary before returning + +Upstream: https://sourceforge.net/p/liblo/git/ci/8187a8456c14eeb3af08c86ffa1228823c9ef1c5/ + +Signed-off-by: Bernd Kuhls +--- + src/server.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/server.c b/src/server.c +index ba02d8e..35c9ba5 100644 +--- a/src/server.c ++++ b/src/server.c +@@ -2289,7 +2289,6 @@ int lo_server_del_lo_method(lo_server s, lo_method m) + free((void *) it->path); + free((void *) it->typespec); + free(it); +- it = prev; + return 0; + } + prev = it; +-- +2.39.2 + From 07acc00add7ac09114f3c01b85d794a31c68229c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 2 Aug 2023 22:31:46 +0200 Subject: [PATCH 1451/2890] boot/at91dataflashboot: force arm mode instead of Thumb mode The at91dataflashboot code contains some hand-written ARM assembly that uses ARM classic instructions, and will not build in Thumb-1 mode. This issue has always existed in Buildroot, but it's only since we started testing random configurations, including Thumb-1 configurations, that this issue popped up. Fixes: http://autobuild.buildroot.net/results/68bf2291201ef1882d8e8d3eca2b1a5ad731e4b0/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- boot/at91dataflashboot/at91dataflashboot.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index c66f27e34313..cb329a90dff4 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -11,9 +11,14 @@ AT91DATAFLASHBOOT_SITE = ftp://www.at91.com/pub/buildroot AT91DATAFLASHBOOT_INSTALL_TARGET = NO AT91DATAFLASHBOOT_INSTALL_IMAGES = YES +AT91DATAFLASHBOOT_CFLAGS = $(TARGET_CFLAGS) -fno-stack-protector +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +AT91DATAFLASHBOOT_CFLAGS += -marm +endif + define AT91DATAFLASHBOOT_BUILD_CMDS make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" + CFLAGS="$(AT91DATAFLASHBOOT_CFLAGS)" endef define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS From e34063c5be6963cb3fd87e6852af0854ec1c2dc1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 1 Aug 2023 23:59:58 +0200 Subject: [PATCH 1452/2890] package/ccache: fix build with gcc 12.3 Since the bump of ccache from 4.7.4 to 4.8.2 in Buildroot commit 1db3f0f84449843476c2887d2ea09323c66f33a4 ("package/ccache: bump version to 4.8.2"), it started failing to build on machines that use gcc 12.3, due to a bug in gcc: /home/buildroot/autobuild/instance-0/output-1/build/host-ccache-4.8.2/src/storage/local/LocalStorage.cpp:701:24: required from here /home/buildroot/autobuild/instance-0/output-1/build/host-ccache-4.8.2/src/Logging.hpp:33:7: internal compiler error: Segmentation fault 33 | Logging::log(std::string_view(message_)); \ | ^~~~~~~ Upstream ccache has committed a workaround to avoid this compiler bug, which we backport in this commit. Fixes: http://autobuild.buildroot.net/results/cd341365d1c429bfca505a742e86b3090897db23/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...-fix-Work-around-GCC-12.3-bug-109241.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch diff --git a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch new file mode 100644 index 000000000000..42872597cd63 --- /dev/null +++ b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch @@ -0,0 +1,29 @@ +From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001 +From: Joel Rosdahl +Date: Tue, 1 Aug 2023 12:30:12 +0200 +Subject: [PATCH] fix: Work around GCC 12.3 bug 109241 + +See also #1289. + +Upstream: https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5 + +Signed-off-by: Bernd Kuhls +--- + src/storage/local/LocalStorage.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp +index 3e5abe5074..d0a904e553 100644 +--- a/src/storage/local/LocalStorage.cpp ++++ b/src/storage/local/LocalStorage.cpp +@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional level, + auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index); + l2_content_lock.make_long_lived(lock_manager); + if (!l2_content_lock.acquire()) { +- LOG("Failed to acquire content lock for {}/{}", l1_index, l2_index); ++ // LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241 ++ LOG_RAW(fmt::format( ++ "Failed to acquire content lock for {}/{}", l1_index, l2_index)); + return; + } + From 2b738044edbed64e313a2b4f275a70e02e5bc143 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 4 Aug 2023 07:20:06 +0100 Subject: [PATCH 1453/2890] board/versal: clean shellcheck issues This patch cleans up the shellcheck issues in the versal post scripts. Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 -- board/versal/post-build.sh | 5 ++--- board/versal/post-image.sh | 14 +++++++------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index f846cc7a8723..f612dfae4d55 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -99,8 +99,6 @@ board/technologic/ts4900/post-image.sh Shellcheck board/toradex/apalis-imx6/post-image.sh Shellcheck board/udoo/common/post-build.sh Shellcheck board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch Upstream -board/versal/post-build.sh Shellcheck -board/versal/post-image.sh Shellcheck TrailingSpace board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch ApplyOrder Upstream boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch Upstream boot/at91bootstrap/0001-eabi-fix.patch Upstream diff --git a/board/versal/post-build.sh b/board/versal/post-build.sh index ff8f8a60719f..ed08ea2d4979 100755 --- a/board/versal/post-build.sh +++ b/board/versal/post-build.sh @@ -3,9 +3,8 @@ # genimage will need to find the extlinux.conf # in the binaries directory -BOARD_DIR="$(dirname $0)" -CONSOLE=$2 -ROOT=$3 +CONSOLE="$2" +ROOT="$3" mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index 92e65ed3b73b..1d9802c34d2a 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -6,12 +6,12 @@ FIRST_DT=$(sed -nr \ -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ - ${BR2_CONFIG}) + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -BOARD_DIR="$(dirname $0)" -BOARD_NAME=$4 +BOARD_DIR="$(dirname "$0")" +BOARD_NAME="$4" mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" @@ -23,7 +23,7 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" { core=psm, file=${BINARIES_DIR}/${BOARD_NAME}_psmfw.elf } } image { - id = 0x1c000000, name=apu_subsystem + id = 0x1c000000, name=apu_subsystem { type=raw, load=0x00001000, file=${BINARIES_DIR}/u-boot.dtb } { core=a72-0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf } { core=a72-0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf } @@ -31,5 +31,5 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" } __HEADER_EOF -${HOST_DIR}/bin/bootgen -arch versal -image ${BINARIES_DIR}/bootgen.bif -o ${BINARIES_DIR}/boot.bin -w on -support/scripts/genimage.sh -c ${BOARD_DIR}/genimage.cfg +"${HOST_DIR}/bin/bootgen" -arch versal -image "${BINARIES_DIR}/bootgen.bif" -o "${BINARIES_DIR}/boot.bin" -w on +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" From 95116bc65e53f58b1dfbd35e5156b46f9e6b9a51 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 3 Aug 2023 20:15:44 +0200 Subject: [PATCH 1454/2890] {linux, linux-headers}: bump 5.15.x / 6.{1, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 6 +++--- package/linux-headers/Config.in.host | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 58cc9574a09e..1501df86e97d 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.4.7" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.4.8" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 1236686384b6..c9a0497d1af4 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,8 +1,8 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 de143cb61dcaa756c05f56ff35144316d810615819518a33e34754f064c4a7d8 linux-6.4.7.tar.xz -sha256 aaf8261b551c8b76b81eab8780b446e88cea4d551ae517ac3a9b2dbdbd381ed3 linux-6.1.42.tar.xz +sha256 c59f34e19e84db30206b9373041abf893f9d8a08765d163586570a5238c458b6 linux-6.4.8.tar.xz +sha256 245248470a62d4e94b46f753afc01e19e45b9e6f3a0fa06e7f5da21fe845a808 linux-6.1.43.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 2de69544a12e6a059163c58fc901c13bcf22e8cac39c66b56f8fbb633399bf93 linux-5.15.123.tar.xz +sha256 00036a0260ad012aa832a8698a4afcf23b2410091527738ce48ce3fcc23f22ed linux-5.15.124.tar.xz sha256 c9558bab35e23ae67661bfb3192c609c857f78582a035449ae63e33d04ab6112 linux-5.10.188.tar.xz sha256 bcb4953ed68131ef17f9f1ba52cac8b9d70007f5ab600bf3dee1fbf8beb218ca linux-5.4.251.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 98360204f75a..d528f88745bd 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -404,9 +404,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.289" if BR2_KERNEL_HEADERS_4_19 default "5.4.251" if BR2_KERNEL_HEADERS_5_4 default "5.10.188" if BR2_KERNEL_HEADERS_5_10 - default "5.15.123" if BR2_KERNEL_HEADERS_5_15 - default "6.1.42" if BR2_KERNEL_HEADERS_6_1 - default "6.4.7" if BR2_KERNEL_HEADERS_6_4 + default "5.15.124" if BR2_KERNEL_HEADERS_5_15 + default "6.1.43" if BR2_KERNEL_HEADERS_6_1 + default "6.4.8" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 0fb677c087228bd853ad66f31191378a9f1b39c2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 6 Aug 2023 15:02:14 +0200 Subject: [PATCH 1455/2890] package/gdal: drop remnants of cmake workarounds In 2b43579e9453 (package/gdal: switch to cmake build to fix libgeotiff detection) a workaround was added to use the generated 'Makefile' rather than the bundled-for-autotools GNUMakefile, which was supposedly removed for the then upcoming 3.6 version. In 4c17985880be (package/gdal: bump version to 3.6.2) the bump occured, but the workaround was left untouched. However, in 3.6.2, there is indeed no GNUMakefile anymore. Drop the workaround now. Signed-off-by: Yann E. MORIN --- package/gdal/gdal.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index ce67399c3277..3f39aa657a1d 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -14,13 +14,6 @@ GDAL_INSTALL_STAGING = YES GDAL_CONFIG_SCRIPTS = gdal-config GDAL_SUPPORTS_IN_SOURCE_BUILD = NO -# Using 'make' with CMake's Makefile generator will not work, as -# 'make' uses GNUmakefile first, but GNUmakefile is provided by -# autotools in gdal. We need to force 'make' to use the Makefile, -# which is generated by CMake. GNUmakefile and autoconf are dropped in -# 3.6 so this can be dropped in future version. -GDAL_MAKE_OPTS += -f Makefile - # gdal at its core only needs host-pkgconf, libgeotiff, proj and tiff # but since by default mrf driver support is enabled, it also needs # jpeg, libpng and zlib. By default there are also many other drivers From 4cf79d9b71ff5cf2aede3f21e09ade7c7ac59606 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 2 Aug 2023 13:14:44 +0200 Subject: [PATCH 1456/2890] pkg-cmake: add option to select the Ninja generator Cmake supports multiple generators. For now, Buildroot only uses the venerable "GNU Makefile" generator, which generates Makefiles as the build backend. Cmake also has support for Ninja as a build backend, and provides the corresponding generator. Ninja is a small build system with a focus on speed. It is mainly used with the meson build system, but also cmake has very good support for it. Packages that are selecting Ninja (or over time another generator), should also use the _BUILD_{ENV,OPTS} variables instead of the _MAKE variables. No _INSTALL{,_STAGING,_TARGET}_OPTS used so far, so reuse as cmake install opts: $ grep '_INSTALL_OPTS' $(git grep -l -E '\$\(eval \$\((host-)?cmake-package))') $ grep '_INSTALL_STAGING_OPTS' $(git grep -l -E '\$\(eval \$\((host-)?cmake-package))') $ grep '_INSTALL_TARGET_OPTS' $(git grep -l -E '\$\(eval \$\((host-)?cmake-package))') The _MAKE_{ENV,OPTS} are copied to _BUILD_{ENV,OPTS}, involved packages: $ grep '_MAKE_ENV =' $(git grep -l -E '\$\(eval \$\((host-)?cmake-package))') package/netopeer2/netopeer2.mk:NETOPEER2_MAKE_ENV = \ package/racehound/racehound.mk:RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) (qt6, webkitgtk, and wpewebkit also match, but already use -Gninja) $ grep '_MAKE_OPTS =' $(git grep -l -E '\$\(eval \$\((host-)?cmake-package))') package/mariadb/mariadb.mk:HOST_MARIADB_MAKE_OPTS = import_executables package/zeek/zeek.mk:HOST_ZEEK_MAKE_OPTS = binpac bifcl Only "musepack" seems to overwrite MAKE to enforce -j1, so replace it: $ grep '_MAKE =' $(git grep -l -E '\$\(eval \$\((host-)?cmake-package))') package/musepack/musepack.mk:MUSEPACK_MAKE = $(MAKE1) Signed-off-by: Thomas Devoogdt Reviewed-by: John Keeping [yann.morin.1998@free.fr: - switch to FOO_CMAKE_BACKEND = (make|ninja) - use firstword of $(MAKE), not $(BR2_MAKE) - explain why we use firstword of $(MAKE) - update manual with the three new variables - yweak commit log ] Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-cmake.txt | 8 ++++++ package/musepack/musepack.mk | 2 +- package/pkg-cmake.mk | 41 +++++++++++++++++++-------- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt index 541d7422cf37..4f336db73734 100644 --- a/docs/manual/adding-packages-cmake.txt +++ b/docs/manual/adding-packages-cmake.txt @@ -91,6 +91,10 @@ typical packages will therefore only use a few of them. the tree extracted by the tarball. If +HOST_LIBFOO_SUBDIR+ is not specified, it defaults to +LIBFOO_SUBDIR+. +* +LIBFOO_CMAKE_BACKEND+ specifies the cmake backend to use, one of + `make` (to use the GNU Makefiles generator, the default) or `ninja` + (to use the Ninja generator). + * +LIBFOO_CONF_ENV+, to specify additional environment variables to pass to CMake. By default, empty. @@ -107,6 +111,10 @@ typical packages will therefore only use a few of them. ** +BUILD_EXAMPLE+, +BUILD_EXAMPLES+ are disabled; ** +BUILD_TEST+, +BUILD_TESTS+, +BUILD_TESTING+ are disabled. +* +LIBFOO_BUILD_ENV+ and +LIBFOO_BUILD_OPTS+ to specify additional + environment variables, or command line options, to pass to the backend + at build time. + * +LIBFOO_SUPPORTS_IN_SOURCE_BUILD = NO+ should be set when the package cannot be built inside the source tree but needs a separate build directory. diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk index fc66c684a522..d4dd08df3637 100644 --- a/package/musepack/musepack.mk +++ b/package/musepack/musepack.mk @@ -9,7 +9,7 @@ MUSEPACK_SITE = http://files.musepack.net/source MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz MUSEPACK_DEPENDENCIES = libcuefile libreplaygain MUSEPACK_INSTALL_STAGING = YES -MUSEPACK_MAKE = $(MAKE1) +MUSEPACK_BUILD_OPTS = -j1 MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc) MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 8c375779cb69..e085fb2b5d78 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -51,13 +51,10 @@ endif define inner-cmake-package -$(2)_MAKE ?= $$(MAKE) -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast - $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES +# The default backend, unless specified by the package +$(3)_CMAKE_BACKEND ?= make ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) $(2)_BUILDDIR = $$($(2)_SRCDIR) @@ -65,6 +62,24 @@ else $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build endif +ifeq ($$($(3)_CMAKE_BACKEND),make) +$(2)_GENERATOR = "Unix Makefiles" +# $$(MAKE) can be 'make -jN', we just want 'make' (possibly with a full path) +$(2)_GENERATOR_PROGRAM = $(firstword $$(MAKE)) +# Generator specific code (make) should be avoided, +# but for now, copy them to the new variables. +$(2)_BUILD_ENV ?= $$($(2)_MAKE_ENV) +$(2)_BUILD_OPTS ?= -- $$($(2)_MAKE_OPTS) + +else ifeq ($$($(3)_CMAKE_BACKEND),ninja) +$(2)_DEPENDENCIES += host-ninja +$(2)_GENERATOR = "Ninja" +$(2)_GENERATOR_PROGRAM = $(HOST_DIR)/bin/ninja + +else +$$(error Unsupported cmake backend "$$($(3)_CMAKE_BACKEND)") +endif + # # Configure step. Only define it if not already defined by the package # .mk file. And take care of the differences between host and target @@ -88,7 +103,8 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ + -DCMAKE_MAKE_PROGRAM="$$($$(PKG)_GENERATOR_PROGRAM)" \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ @@ -119,7 +135,8 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ + -DCMAKE_MAKE_PROGRAM="$$($$(PKG)_GENERATOR_PROGRAM)" \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -166,11 +183,11 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) -j$(PARALLEL_JOBS) $$($$(PKG)_BUILD_OPTS) endef else define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) -j$(PARALLEL_JOBS) $$($$(PKG)_BUILD_OPTS) endef endif endif @@ -181,7 +198,7 @@ endif # ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) endef endif @@ -191,7 +208,7 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(STAGING_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_STAGING_OPTS) endef endif @@ -201,7 +218,7 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(TARGET_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_TARGET_OPTS) endef endif From f3b22e3642c836f83b5f45d0bceba9c36ae9d33f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Aug 2023 12:25:51 +0200 Subject: [PATCH 1457/2890] package/elf2flt: refresh patches Some patches had some fuzz, and patch 0004 was no longer applicable using "git am". Patch 0006 is renamed so that it matches the commit log title, as generated automatically by git format-patch. Signed-off-by: Thomas Petazzoni Tested-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 +- .../0001-elf2flt-handle-binutils-2.34.patch | 4 ++-- ...tate-32-byte-alignment-for-.data-sec.patch | 4 ++-- ...03-elf2flt-add-riscv-64-bits-support.patch | 8 ++++---- ...2flt-create-a-common-helper-function.patch | 20 +++++++++---------- ...l-error-regression-on-m68k-xtensa-ri.patch | 8 ++++---- ...=> 0006-xtensa-fix-text-relocations.patch} | 10 +++++----- 7 files changed, 28 insertions(+), 28 deletions(-) rename package/elf2flt/{0006-elf2flt-xtensa-fix-text-relocations.patch => 0006-xtensa-fix-text-relocations.patch} (88%) diff --git a/.checkpackageignore b/.checkpackageignore index f612dfae4d55..0954f22b4b60 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -395,7 +395,7 @@ package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch Upstream package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch Upstream package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch Upstream -package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch Upstream +package/elf2flt/0006-xtensa-fix-text-relocations.patch Upstream package/elftosb/0001-fixes-includes.patch Upstream package/elftosb/0002-force-cxx-compiler.patch Upstream package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch Upstream diff --git a/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch b/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch index 4aa473c244d7..f9e493a761ec 100644 --- a/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch +++ b/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch @@ -1,4 +1,4 @@ -From d78acba6510527aaa01a41eaf4c931f7a57e5f44 Mon Sep 17 00:00:00 2001 +From 2821fcb55cbe0f2b77237d89b5b3467fb3ad058b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 5 Feb 2020 10:31:32 +0100 Subject: [PATCH] elf2flt: handle binutils >= 2.34 @@ -373,5 +373,5 @@ index 7ac0617..ea6b5a1 100644 fatal("read error section %s", s->name); } -- -2.35.1 +2.41.0 diff --git a/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch index 4df3ea5929f6..8bd038368369 100644 --- a/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch +++ b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch @@ -1,4 +1,4 @@ -From 85ba5664eb368eb1cbd2c30b7cd574acd75edd4c Mon Sep 17 00:00:00 2001 +From 37b281e4dd0fb5832181e51943a4eb3c74d4f618 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Mon, 4 Apr 2022 15:30:24 +0200 Subject: [PATCH] elf2flt.ld: reinstate 32 byte alignment for .data section @@ -77,5 +77,5 @@ index 0df999d..e5aea14 100644 @SYMBOL_PREFIX@__data_start = . ; @SYMBOL_PREFIX@data_start = . ; -- -2.35.1 +2.41.0 diff --git a/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch b/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch index 15c191c83dba..c2aa538d0240 100644 --- a/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch +++ b/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch @@ -1,4 +1,4 @@ -From 3f1f323feb5cf25d8c80861991d0360784f4d2e6 Mon Sep 17 00:00:00 2001 +From 1498503bde2a6055a83f1e9f3eaa6f2a104bd597 Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Wed, 9 Sep 2020 17:31:33 +0900 Subject: [PATCH] elf2flt: add riscv 64-bits support @@ -27,7 +27,7 @@ Signed-off-by: Damien Le Moal 3 files changed, 25 insertions(+) diff --git a/elf2flt.c b/elf2flt.c -index da25e93..a03ea3a 100644 +index ea6b5a1..c2816b6 100644 --- a/elf2flt.c +++ b/elf2flt.c @@ -81,6 +81,8 @@ const char *elf2flt_progname; @@ -48,7 +48,7 @@ index da25e93..a03ea3a 100644 #else #error "Don't know how to support your CPU architecture??" #endif -@@ -812,6 +816,18 @@ output_relocs ( +@@ -821,6 +825,18 @@ output_relocs ( goto good_32bit_resolved_reloc; default: goto bad_resolved_reloc; @@ -99,5 +99,5 @@ index 7cb02d5..75ee1bb 100644 if (!linker_script) linker_script = concat(ldscriptpath, "/elf2flt.ld", NULL); -- -2.36.1 +2.41.0 diff --git a/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch b/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch index 6fee99d45a16..be8d57affa78 100644 --- a/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch +++ b/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch @@ -1,4 +1,4 @@ -From 37e1e0ace8ccebf54ec2f5522bfc1f9db86946ad Mon Sep 17 00:00:00 2001 +From 4f28e4329897b7f23d828b375fb365d0e30c9cb5 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 12:13:50 +0200 Subject: [PATCH] elf2flt: create a common helper function @@ -14,10 +14,10 @@ Signed-off-by: Niklas Cassel 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index 669591e..9c32f9a 100644 +index c2816b6..8cd48d9 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -337,6 +337,13 @@ compare_relocs (const void *pa, const void *pb) +@@ -346,6 +346,13 @@ compare_relocs (const void *pa, const void *pb) } #endif @@ -31,7 +31,7 @@ index 669591e..9c32f9a 100644 static uint32_t * output_relocs ( bfd *abs_bfd, -@@ -428,8 +435,7 @@ output_relocs ( +@@ -437,8 +444,7 @@ output_relocs ( */ if ((!pic_with_got || ALWAYS_RELOC_TEXT) && ((a->flags & SEC_CODE) || @@ -41,7 +41,7 @@ index 669591e..9c32f9a 100644 sectionp = text + (a->vma - text_vma); else if (a->flags & SEC_DATA) sectionp = data + (a->vma - data_vma); -@@ -1893,8 +1899,7 @@ int main(int argc, char *argv[]) +@@ -1902,8 +1908,7 @@ int main(int argc, char *argv[]) bfd_vma sec_vma; if ((s->flags & SEC_CODE) || @@ -51,7 +51,7 @@ index 669591e..9c32f9a 100644 vma = &text_vma; len = &text_len; } else if (s->flags & SEC_DATA) { -@@ -1932,8 +1937,7 @@ int main(int argc, char *argv[]) +@@ -1941,8 +1946,7 @@ int main(int argc, char *argv[]) * data sections.*/ for (s = abs_bfd->sections; s != NULL; s = s->next) if ((s->flags & SEC_CODE) || @@ -60,8 +60,8 @@ index 669591e..9c32f9a 100644 + ro_reloc_data_section_should_be_in_text(s)) if (!bfd_get_section_contents(abs_bfd, s, text + (s->vma - text_vma), 0, - bfd_section_size(abs_bfd, s))) -@@ -1962,8 +1966,7 @@ int main(int argc, char *argv[]) + elf2flt_bfd_section_size(s))) +@@ -1971,8 +1975,7 @@ int main(int argc, char *argv[]) * data sections already included in the text output section.*/ for (s = abs_bfd->sections; s != NULL; s = s->next) if ((s->flags & SEC_DATA) && @@ -70,7 +70,7 @@ index 669591e..9c32f9a 100644 + !ro_reloc_data_section_should_be_in_text(s)) if (!bfd_get_section_contents(abs_bfd, s, data + (s->vma - data_vma), 0, - bfd_section_size(abs_bfd, s))) + elf2flt_bfd_section_size(s))) -- -2.37.1 +2.41.0 diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch index 616bbc891fc7..96befd53d852 100644 --- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch +++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch @@ -1,4 +1,4 @@ -From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001 +From 87d45736a6855f2147ef9c88d2bce2cabc84cb52 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 21:06:05 +0200 Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 @@ -50,10 +50,10 @@ Signed-off-by: Niklas Cassel 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index e0d7891..39d035f 100644 +index 8cd48d9..60bfa57 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb) +@@ -349,8 +349,13 @@ compare_relocs (const void *pa, const void *pb) static bool ro_reloc_data_section_should_be_in_text(asection *s) { @@ -70,5 +70,5 @@ index e0d7891..39d035f 100644 static uint32_t * -- -2.39.0 +2.41.0 diff --git a/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch b/package/elf2flt/0006-xtensa-fix-text-relocations.patch similarity index 88% rename from package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch rename to package/elf2flt/0006-xtensa-fix-text-relocations.patch index 3664775906ea..19c47cca906b 100644 --- a/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch +++ b/package/elf2flt/0006-xtensa-fix-text-relocations.patch @@ -1,4 +1,4 @@ -From e248d9774506fdd8698b14a7edead113f19ecdb0 Mon Sep 17 00:00:00 2001 +From 7e1c17d7fe72a0889d56d5e6a1390d493d1de144 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Tue, 29 Nov 2022 17:47:54 -0800 Subject: [PATCH] xtensa: fix text relocations @@ -21,10 +21,10 @@ Signed-off-by: Max Filippov 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/elf2flt.c b/elf2flt.c -index b93aecdaced3..cec3f4a22239 100644 +index 60bfa57..0fcb747 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -808,7 +808,20 @@ output_relocs ( +@@ -833,7 +833,20 @@ output_relocs ( continue; case R_XTENSA_32: case R_XTENSA_PLT: @@ -45,7 +45,7 @@ index b93aecdaced3..cec3f4a22239 100644 + break; default: goto bad_resolved_reloc; - #else + #elif defined(TARGET_riscv64) -- -2.30.2 +2.41.0 From d79f9c9f416ac5da90cd428916cff0b5288cb03a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Aug 2023 12:25:52 +0200 Subject: [PATCH 1458/2890] package/elf2flt: backport upstream patch to remove use of BFD_VMA_FMT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit backports upstream commit https://github.com/uclinux-dev/elf2flt/commit/a36df7407d9e3f93ca6449841ff0821b0d980438 to fix a build issue with binutils 2.40 or later: elf2flt.c:223:31: error: expected ‘)’ before ‘BFD_VMA_FMT’ We prefer a backport over updating to a newer elf2flt version for now as there has been multiple other changes in elf2flt, and elf2flt is very fragile. Therefore for now we prefer to be conservative. Fixes: http://autobuild.buildroot.net/results/938a59b5e52d712786590e80328bb45b1c5fc519/ Signed-off-by: Thomas Petazzoni Tested-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...07-elf2flt-remove-use-of-BFD_VMA_FMT.patch | 169 ++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch diff --git a/package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch b/package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch new file mode 100644 index 000000000000..82e693f35f13 --- /dev/null +++ b/package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch @@ -0,0 +1,169 @@ +From 9ec7dd9dead2f3c4c73c3ab2166a1f81bfb41825 Mon Sep 17 00:00:00 2001 +From: Greg Ungerer +Date: Thu, 13 Apr 2023 22:58:20 +1000 +Subject: [PATCH] elf2flt: remove use of BFD_VMA_FMT + +In binutils-2.40 the BFD_VMA_FMT definition used for printf style +formatting specifiers has been removed. For reference this was done in +commit b82817674f46 ("Don't use BFD_VMA_FMT in binutils") in the +binutils git development tree. + +BFD_VMA_FMT is used in a number of places in the elf2flt code to output +bfd offsets, values and the like. So it is broken when using the bfd +code from binutils-2.40 and newer. + +According to the binutils change PRIx64 (and friends) is used to replace +it, with appropriate casts to keep it clean for 32 and 64 bit platforms. +Change the elf2flt.c use of it in the same way to fix. + +This does not change the output in any way in normal use. This fix can +be used on all versions of binutils (older and newer), there is no +need to only do this on 2.40 and newer. + +Signed-off-by: Greg Ungerer +Upstream: https://github.com/uclinux-dev/elf2flt/commit/a36df7407d9e3f93ca6449841ff0821b0d980438 +Signed-off-by: Thomas Petazzoni +--- + elf2flt.c | 58 ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 30 insertions(+), 28 deletions(-) + +diff --git a/elf2flt.c b/elf2flt.c +index 0fcb747..6685bff 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -220,8 +220,8 @@ dump_symbols(asymbol **symbol_table, long number_of_symbols) + long i; + printf("SYMBOL TABLE:\n"); + for (i=0; iname, symbol_table[i]->value); ++ printf(" NAME=%s VALUE=0x%"PRIx64"\n", ++ symbol_table[i]->name, (uint64_t) symbol_table[i]->value); + } + printf("\n"); + return(0); +@@ -466,8 +466,8 @@ output_relocs ( + if (r == NULL) + continue; + if (verbose) +- printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"BFD_VMA_FMT"x\n", +- r->name, r, r->flags, elf2flt_bfd_section_vma(r)); ++ printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"PRIx64"\n", ++ r->name, r, r->flags, (uint64_t) elf2flt_bfd_section_vma(r)); + if ((r->flags & SEC_RELOC) == 0) + continue; + relsize = bfd_get_reloc_upper_bound(rel_bfd, r); +@@ -952,12 +952,13 @@ output_relocs ( + if (verbose) + fprintf(stderr, + "%s vma=0x%x, " +- "value=0x%"BFD_VMA_FMT"x, " +- "address=0x%"BFD_VMA_FMT"x " ++ "value=0x%"PRIx64", " ++ "address=0x%"PRIx64" " + "sym_addr=0x%x rs=0x%x, opcode=0x%x\n", + "ABS32", +- sym_vma, (*(q->sym_ptr_ptr))->value, +- q->address, sym_addr, ++ sym_vma, ++ (uint64_t) (*(q->sym_ptr_ptr))->value, ++ (uint64_t) q->address, sym_addr, + (*p)->howto->rightshift, + *(uint32_t *)r_mem); + sym_vma = elf2flt_bfd_section_vma(sym_section); +@@ -971,12 +972,13 @@ output_relocs ( + if (verbose) + fprintf(stderr, + "%s vma=0x%x, " +- "value=0x%"BFD_VMA_FMT"x, " +- "address=0x%"BFD_VMA_FMT"x " ++ "value=0x%"PRIx64", " ++ "address=0x%"PRIx64" " + "sym_addr=0x%x rs=0x%x, opcode=0x%x\n", + "PLT32", +- sym_vma, (*(q->sym_ptr_ptr))->value, +- q->address, sym_addr, ++ sym_vma, ++ (uint64_t) (*(q->sym_ptr_ptr))->value, ++ (uint64_t) q->address, sym_addr, + (*p)->howto->rightshift, + *(uint32_t *)r_mem); + case R_ARM_PC24: +@@ -994,8 +996,8 @@ output_relocs ( + case R_V850_ZDA_16_16_OFFSET: + case R_V850_ZDA_16_16_SPLIT_OFFSET: + /* Can't support zero-relocations. */ +- printf ("ERROR: %s+0x%"BFD_VMA_FMT"x: zero relocations not supported\n", +- sym_name, q->addend); ++ printf ("ERROR: %s+0x%"PRIx64": zero relocations not supported\n", ++ sym_name, (uint64_t) q->addend); + continue; + #endif /* TARGET_v850 */ + +@@ -1194,12 +1196,12 @@ output_relocs ( + temp |= (exist_val & 0x3f); + *(unsigned long *)r_mem = htoniosl(temp); + if (verbose) +- printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " ++ printf("omit: offset=0x%"PRIx64" symbol=%s%s " + "section=%s size=%d " +- "fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x) GPREL\n", +- q->address, sym_name, addstr, ++ "fixup=0x%x (reloc=0x%"PRIx64") GPREL\n", ++ (uint64_t) q->address, sym_name, addstr, + section_name, sym_reloc_size, +- sym_addr, section_vma + q->address); ++ sym_addr, (uint64_t) section_vma + q->address); + continue; + } + case R_NIOS2_PCREL16: +@@ -1214,12 +1216,12 @@ output_relocs ( + exist_val |= ((sym_addr & 0xFFFF) << 6); + *(unsigned long *)r_mem = htoniosl(exist_val); + if (verbose) +- printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " ++ printf("omit: offset=0x%"PRIx64" symbol=%s%s " + "section=%s size=%d " +- "fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x) PCREL\n", +- q->address, sym_name, addstr, ++ "fixup=0x%x (reloc=0x%"PRIx64") PCREL\n", ++ (uint64_t) q->address, sym_name, addstr, + section_name, sym_reloc_size, +- sym_addr, section_vma + q->address); ++ sym_addr, (uint64_t) section_vma + q->address); + continue; + } + +@@ -1231,9 +1233,9 @@ output_relocs ( + && (p[-1]->sym_ptr_ptr == p[0]->sym_ptr_ptr) + && (p[-1]->addend == p[0]->addend)) { + if (verbose) +- printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " ++ printf("omit: offset=0x%"PRIx64" symbol=%s%s " + "section=%s size=%d LO16\n", +- q->address, sym_name, addstr, ++ (uint64_t) q->address, sym_name, addstr, + section_name, sym_reloc_size); + continue; + } +@@ -1646,13 +1648,13 @@ DIS29_RELOCATION: + */ + if (relocation_needed) { + if (verbose) +- printf(" RELOC[%d]: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " ++ printf(" RELOC[%d]: offset=0x%"PRIx64" symbol=%s%s " + "section=%s size=%d " +- "fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x)\n", ++ "fixup=0x%x (reloc=0x%"PRIx64")\n", + flat_reloc_count, +- q->address, sym_name, addstr, ++ (uint64_t) q->address, sym_name, addstr, + section_name, sym_reloc_size, +- sym_addr, section_vma + q->address); ++ sym_addr, (uint64_t) section_vma + q->address); + + #ifndef TARGET_bfin + flat_relocs = realloc(flat_relocs, +-- +2.41.0 + From d0349d5ba02df26c9f3d98b1e34ebd2c5c34192c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Aug 2023 12:25:53 +0200 Subject: [PATCH 1459/2890] package/elf2flt: fix build with binutils >= 2.41 due to libbfd location elf2flt needs to link against libbfd.a and libiberty.a which are provided by host-binutils, but not installed, so we poke directly into the host-binutils build directory. While not very nice, it has already been like this for a long time. We could build host-binutils with --enable-install-libbfd and --enable-install-libiberty so that those libraries are installed, but we prefer to do this separately, and there is a serious potential for perturbations to other packages by having libbfd/libiberty installed in $(HOST_DIR). In the mean time, an issue of poking directly into the host-binutils build directory is that the location of libbfd.a has changed in binutils >= 2.41, so we special case binutils 2.39 and 2.40, which are the two remaining versions still using the "old" path". Note: the ARC-special binutils version is not considered because Buildroot only supports ARC CPUs with a MMU and therefore host-elf2flt is never used on ARC. Fixes: gcc: error: /builds/buildroot.org/toolchains-builder/build/output/build/host-binutils-2.41/bfd/libbfd.a: No such file or directory When build host-elf2flt against host-binutils 2.41. This issue is not visible in the autobuilders as it is hidden by the BFD_VMA_FMT issue fixed in the previous commit. Signed-off-by: Thomas Petazzoni Tested-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/elf2flt/elf2flt.mk | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index 6cd0786c3d40..b970de48f2b8 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -14,12 +14,27 @@ HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib # 0001-elf2flt-handle-binutils-2.34.patch HOST_ELF2FLT_AUTORECONF = YES +# elf2flt needs to link against libbfd.a and libiberty.a which are +# provided by host-binutils, but not installed, so we poke directly +# into the host-binutils build directory. Turns out that the location +# of libbfd.a has changed in binutils >= 2.41, so we special case +# binutils 2.39 and 2.40, which are the two remaining versions still +# using the "old" path". Note: the ARC-special binutils version is not +# considered because Buildroot only supports ARC CPUs with a MMU and +# therefore host-elf2flt is never used on ARC. libiberty.a has +# remained at the same location. +ifeq ($(BR2_BINUTILS_VERSION_2_39_X)$(BR2_BINUTILS_VERSION_2_40_X),y) +HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/libbfd.a +else +HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/.libs/libbfd.a +endif + # It is not exactly a host variant, but more a cross variant, which is # why we pass a special --target option. HOST_ELF2FLT_CONF_OPTS = \ --with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \ --with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \ - --with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \ + --with-libbfd=$(HOST_ELF2FLT_LIBBFD_PATH) \ --with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \ --target=$(GNU_TARGET_NAME) \ --disable-werror From e8cb970534debcb5b36c7919d435dbad8c4e38ee Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 2 Aug 2023 13:14:45 +0200 Subject: [PATCH 1460/2890] package/webkitgtk: use the CMAKE_NINJA flag Use the newly introduce backend option to specify what cmake backend to use, in lieue of special-coding its use as done in 16e5c92ff5fd (package/webkitgtk: Build with ninja). Signed-off-by: Thomas Devoogdt Signed-off-by: Yann E. MORIN --- package/webkitgtk/webkitgtk.mk | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 56277a0a0a0f..3e9d42c7c33c 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -16,6 +16,9 @@ WEBKITGTK_CPE_ID_VENDOR = webkitgtk WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 + +WEBKITGTK_CMAKE_BACKEND = ninja + WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ -DENABLE_DOCUMENTATION=OFF \ @@ -140,23 +143,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# webkitgtk needs cmake >= 3.20 when not building with ninja, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WEBKITGTK_CONF_OPTS += -GNinja -WEBKITGTK_DEPENDENCIES += host-ninja - -define WEBKITGTK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - $(eval $(cmake-package)) From 05555c0daf5610f733f5516901b5c44d07d09599 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 2 Aug 2023 13:14:46 +0200 Subject: [PATCH 1461/2890] package/wpewebkit: use the CMAKE_NINJA flag Use the newly introduce backend option to specify what cmake backend to use, in lieue of special-coding its use as done in 78d499409f71 (package/wpewebkit: Build with ninja). Signed-off-by: Thomas Devoogdt Signed-off-by: Yann E. MORIN --- package/wpewebkit/wpewebkit.mk | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index c13a7201e671..6712291c22e4 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -18,6 +18,8 @@ WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby host-unifdef \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo +WPEWEBKIT_CMAKE_BACKEND = ninja + WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_ACCESSIBILITY=OFF \ @@ -104,23 +106,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# wpewebkit needs cmake >= 3.20 when building with the make backend, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WPEWEBKIT_CONF_OPTS += -GNinja -WPEWEBKIT_DEPENDENCIES += host-ninja - -define WPEWEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - $(eval $(cmake-package)) From 28e38f4d5cff5db7aa96a4ab5c87cf996087c977 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 2 Aug 2023 14:01:48 +0200 Subject: [PATCH 1462/2890] package/libsoup3: new package Libsoup3 has a new API [1], packages using libsoup may not compile with libsoup3 or may crash at runtime in unexpected ways, so we add a new package. It can be installed side by site with libsoup, without any conflict. [1] https://libsoup.org/libsoup-3.0/ch02.html Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libsoup3/Config.in | 34 ++++++++++++++++++++ package/libsoup3/libsoup3.hash | 4 +++ package/libsoup3/libsoup3.mk | 57 ++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+) create mode 100644 package/libsoup3/Config.in create mode 100644 package/libsoup3/libsoup3.hash create mode 100644 package/libsoup3/libsoup3.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0f6cb75e0e6e..c9117146ea8a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2854,6 +2854,7 @@ F: toolchain/ N: Thomas Devoogdt F: package/fluent-bit/ +F: package/libsoup3/ N: Thomas Huth F: board/qemu/m68k-mcf5208/ diff --git a/package/Config.in b/package/Config.in index 54cddc39140d..e12ee34e9f41 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1957,6 +1957,7 @@ menu "Networking" source "package/libshout/Config.in" source "package/libsocketcan/Config.in" source "package/libsoup/Config.in" + source "package/libsoup3/Config.in" source "package/libsrtp/Config.in" source "package/libstrophe/Config.in" source "package/libteam/Config.in" diff --git a/package/libsoup3/Config.in b/package/libsoup3/Config.in new file mode 100644 index 000000000000..504cc3bd2b65 --- /dev/null +++ b/package/libsoup3/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_LIBSOUP3 + bool "libsoup3" + depends on BR2_USE_WCHAR # glib2, libpsl + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBPSL + select BR2_PACKAGE_NGHTTP2 + select BR2_PACKAGE_SQLITE + help + libsoup3 is an HTTP client/server library. It uses GObject + and the GLib main loop, to integrate well with GNOME + applications. + + https://wiki.gnome.org/Projects/libsoup + +if BR2_PACKAGE_LIBSOUP3 + +config BR2_PACKAGE_LIBSOUP3_SSL + bool "https support" + depends on !BR2_STATIC_LIBS # glib-networking, gnutls + select BR2_PACKAGE_GLIB_NETWORKING # runtime + select BR2_PACKAGE_GNUTLS # runtime + help + Enable HTTPS (SSL) support. + +comment "libsoup3 https support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + +endif + +comment "libsoup3 needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libsoup3/libsoup3.hash b/package/libsoup3/libsoup3.hash new file mode 100644 index 000000000000..01313b394bb5 --- /dev/null +++ b/package/libsoup3/libsoup3.hash @@ -0,0 +1,4 @@ +# From https://download.gnome.org/sources/libsoup/3.4/libsoup-3.4.2.sha256sum +sha256 78c8fa37cb152d40ec8c4a148d6155e2f6947f3f1602a7cda3a31ad40f5ee2f3 libsoup-3.4.2.tar.xz +# Locally calculated +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup3/libsoup3.mk b/package/libsoup3/libsoup3.mk new file mode 100644 index 000000000000..9e66b6ebd277 --- /dev/null +++ b/package/libsoup3/libsoup3.mk @@ -0,0 +1,57 @@ +################################################################################ +# +# libsoup3 +# +################################################################################ + +LIBSOUP3_VERSION_MAJOR = 3.4 +LIBSOUP3_VERSION = $(LIBSOUP3_VERSION_MAJOR).2 +LIBSOUP3_SOURCE = libsoup-$(LIBSOUP3_VERSION).tar.xz +LIBSOUP3_SITE = https://download.gnome.org/sources/libsoup/$(LIBSOUP3_VERSION_MAJOR) +LIBSOUP3_LICENSE = LGPL-2.0+ +LIBSOUP3_LICENSE_FILES = COPYING +LIBSOUP3_CPE_ID_VENDOR = gnome +LIBSOUP3_INSTALL_STAGING = YES +LIBSOUP3_DEPENDENCIES = \ + host-intltool \ + host-libglib2 \ + host-pkgconf \ + libglib2 \ + libpsl \ + nghttp2 \ + sqlite \ + $(TARGET_NLS_DEPENDENCIES) + +LIBSOUP3_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + +LIBSOUP3_CONF_OPTS = \ + -Dntlm=disabled \ + -Dsysprof=disabled \ + -Dtests=false \ + -Dtls_check=false \ + -Dvapi=disabled + +ifeq ($(BR2_PACKAGE_BROTLI),y) +LIBSOUP3_CONF_OPTS += -Dbrotli=enabled +LIBSOUP3_DEPENDENCIES += brotli +else +LIBSOUP3_CONF_OPTS += -Dbrotli=disabled +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBSOUP3_CONF_OPTS += -Dintrospection=enabled +LIBSOUP3_DEPENDENCIES += gobject-introspection +else +LIBSOUP3_CONF_OPTS += -Dintrospection=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +LIBSOUP3_CONF_OPTS += \ + -Dgssapi=enabled \ + -Dkrb5_config=$(STAGING_DIR)/usr/bin/krb5-config +LIBSOUP3_DEPENDENCIES += libkrb5 +else +LIBSOUP3_CONF_OPTS += -Dgssapi=disabled +endif + +$(eval $(meson-package)) From 38a098df133aaa2ebf09742054b02db5a44f58e5 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 2 Aug 2023 14:01:49 +0200 Subject: [PATCH 1463/2890] package/webkitgtk: add http/2 support by using libsoup3 Support added in 2.33.2: https://webkitgtk.org/2021/06/08/webkitgtk2.33.2-released.html "HTTP/2 support when building with libsoup3." Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- package/webkitgtk/Config.in | 10 +++++----- package/webkitgtk/webkitgtk.mk | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 23c0bf41db84..6835467c46c4 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -31,9 +31,9 @@ config BR2_PACKAGE_WEBKITGTK depends on !BR2_BINFMT_FLAT # icu depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 - depends on BR2_USE_WCHAR # icu, libsoup + depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS select BR2_PACKAGE_CAIRO @@ -44,7 +44,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBSECRET - select BR2_PACKAGE_LIBSOUP + select BR2_PACKAGE_LIBSOUP3 select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT @@ -82,9 +82,9 @@ comment "sandboxing support needs a toolchain w/ headers >= 3.12" config BR2_PACKAGE_WEBKITGTK_HTTPS bool "HTTPS support" - depends on !BR2_STATIC_LIBS # libsoup -> glib-networking, gnutls + depends on !BR2_STATIC_LIBS # libsoup3 -> glib-networking, gnutls select BR2_PACKAGE_CA_CERTIFICATES # runtime - select BR2_PACKAGE_LIBSOUP_SSL + select BR2_PACKAGE_LIBSOUP3_SSL help Enable HTTPS protocol support. diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 3e9d42c7c33c..32f6102797f8 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -14,7 +14,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \ - enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ + enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup3 \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 WEBKITGTK_CMAKE_BACKEND = ninja @@ -30,7 +30,6 @@ WEBKITGTK_CONF_OPTS = \ -DUSE_AVIF=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ - -DUSE_SOUP2=ON \ -DUSE_WOFF2=ON ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y) From dff67170f73959e6826ec3e87e892747f8d3a5fb Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 2 Aug 2023 14:01:50 +0200 Subject: [PATCH 1464/2890] package/wpewebkit: add http/2 support by using libsoup3 Support added in 2.33.2: https://wpewebkit.org/release/wpewebkit-2.33.2.html "HTTP/2 support when building with libsoup3." Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- package/wpewebkit/Config.in | 6 +++--- package/wpewebkit/wpewebkit.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 7a8dc557c366..f1d38c7cad24 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -36,9 +36,9 @@ config BR2_PACKAGE_WPEWEBKIT depends on !BR2_BINFMT_FLAT # icu depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu - depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 - depends on BR2_USE_WCHAR # icu, libsoup + depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wpebackend-fdo @@ -51,7 +51,7 @@ config BR2_PACKAGE_WPEWEBKIT select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_LIBSOUP + select BR2_PACKAGE_LIBSOUP3 select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_OPENJPEG diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 6712291c22e4..bf0b0953723d 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -15,7 +15,7 @@ WPEWEBKIT_LICENSE_FILES = \ WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby host-unifdef \ - harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ + harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup3 libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo WPEWEBKIT_CMAKE_BACKEND = ninja @@ -28,8 +28,7 @@ WPEWEBKIT_CONF_OPTS = \ -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ -DENABLE_WEB_RTC=OFF \ - -DUSE_AVIF=OFF \ - -DUSE_SOUP2=ON + -DUSE_AVIF=OFF ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) WPEWEBKIT_CONF_OPTS += \ From 8382f0eb41bc12098f032c12781fb488aa63d901 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 31 Jul 2023 22:49:46 +0200 Subject: [PATCH 1465/2890] package/sentry-cli: fix build with OpenSSL 3.x Fixes: http://autobuild.buildroot.net/results/4e2/4e24cb67402bad35ab57833d72e6c857b3eb4e07/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...able-SSL-support-for-the-curl-module.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch diff --git a/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch b/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch new file mode 100644 index 000000000000..e68401da78ee --- /dev/null +++ b/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch @@ -0,0 +1,62 @@ +From a3754088b4cf7d19ff4f9a98412dd132d5baf1c1 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Mon, 31 Jul 2023 22:34:04 +0200 +Subject: [PATCH] Disable SSL support for the curl module + +Fixes build with OpenSSL v3. + +Downloaded Cargo.toml patch from +https://cgit.freebsd.org/ports/tree/devel/sentry-cli/files/patch-Cargo.toml + +Upstream: https://github.com/getsentry/sentry-cli/issues/1706 + +Signed-off-by: Bernd Kuhls +--- + Cargo.lock | 10 ---------- + Cargo.toml | 2 +- + 2 files changed, 1 insertion(+), 11 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 75e1c8c..5121211 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1557,15 +1557,6 @@ version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +-[[package]] +-name = "openssl-src" +-version = "111.22.0+1.1.1q" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +-dependencies = [ +- "cc", +-] +- + [[package]] + name = "openssl-sys" + version = "0.9.74" +@@ -1575,7 +1566,6 @@ dependencies = [ + "autocfg", + "cc", + "libc", +- "openssl-src", + "pkg-config", + "vcpkg", + ] +diff --git a/Cargo.toml b/Cargo.toml +index abd6839..ddc141f 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -19,7 +19,7 @@ clap = { version = "3.2.22", default-features = false, features = [ + "wrap_help", + ] } + console = "0.15.2" +-curl = { version = "0.4.44", features = ["static-curl", "static-ssl"] } ++curl = { version = "0.4.44" } + dirs = "4.0.0" + dotenv = "0.15.0" + elementtree = "1.2.2" +-- +2.39.2 + From 961dc9d397c136181982a9c3add17f737e1b9e82 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 31 Jul 2023 22:49:46 +0200 Subject: [PATCH 1466/2890] package/sentry-cli: fix build with OpenSSL 3.x Fixes: http://autobuild.buildroot.net/results/4e2/4e24cb67402bad35ab57833d72e6c857b3eb4e07/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...able-SSL-support-for-the-curl-module.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch diff --git a/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch b/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch new file mode 100644 index 000000000000..e68401da78ee --- /dev/null +++ b/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch @@ -0,0 +1,62 @@ +From a3754088b4cf7d19ff4f9a98412dd132d5baf1c1 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Mon, 31 Jul 2023 22:34:04 +0200 +Subject: [PATCH] Disable SSL support for the curl module + +Fixes build with OpenSSL v3. + +Downloaded Cargo.toml patch from +https://cgit.freebsd.org/ports/tree/devel/sentry-cli/files/patch-Cargo.toml + +Upstream: https://github.com/getsentry/sentry-cli/issues/1706 + +Signed-off-by: Bernd Kuhls +--- + Cargo.lock | 10 ---------- + Cargo.toml | 2 +- + 2 files changed, 1 insertion(+), 11 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 75e1c8c..5121211 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1557,15 +1557,6 @@ version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +-[[package]] +-name = "openssl-src" +-version = "111.22.0+1.1.1q" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +-dependencies = [ +- "cc", +-] +- + [[package]] + name = "openssl-sys" + version = "0.9.74" +@@ -1575,7 +1566,6 @@ dependencies = [ + "autocfg", + "cc", + "libc", +- "openssl-src", + "pkg-config", + "vcpkg", + ] +diff --git a/Cargo.toml b/Cargo.toml +index abd6839..ddc141f 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -19,7 +19,7 @@ clap = { version = "3.2.22", default-features = false, features = [ + "wrap_help", + ] } + console = "0.15.2" +-curl = { version = "0.4.44", features = ["static-curl", "static-ssl"] } ++curl = { version = "0.4.44" } + dirs = "4.0.0" + dotenv = "0.15.0" + elementtree = "1.2.2" +-- +2.39.2 + From e29f3760e8f3922dfa963bb07ba69ba03f9a3220 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 31 Jul 2023 22:49:47 +0200 Subject: [PATCH 1467/2890] package/sentry-cli: bump version to 2.20.3 Changelog: https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md Rebased patch 0001. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...able-SSL-support-for-the-curl-module.patch | 24 +++++++++---------- package/sentry-cli/sentry-cli.hash | 2 +- package/sentry-cli/sentry-cli.mk | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch b/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch index e68401da78ee..819d8016ae2e 100644 --- a/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch +++ b/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch @@ -1,4 +1,4 @@ -From a3754088b4cf7d19ff4f9a98412dd132d5baf1c1 Mon Sep 17 00:00:00 2001 +From 5b4179af15b435a476c006260718d4f6e22ea2ab Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 31 Jul 2023 22:34:04 +0200 Subject: [PATCH] Disable SSL support for the curl module @@ -17,26 +17,26 @@ Signed-off-by: Bernd Kuhls 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 75e1c8c..5121211 100644 +index e5031db..7357215 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -1557,15 +1557,6 @@ version = "0.1.5" +@@ -1521,15 +1521,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" --version = "111.22.0+1.1.1q" +-version = "111.25.0+1.1.1t" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +-checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" - version = "0.9.74" -@@ -1575,7 +1566,6 @@ dependencies = [ + version = "0.9.80" +@@ -1539,7 +1530,6 @@ dependencies = [ "autocfg", "cc", "libc", @@ -45,18 +45,18 @@ index 75e1c8c..5121211 100644 "vcpkg", ] diff --git a/Cargo.toml b/Cargo.toml -index abd6839..ddc141f 100644 +index c8c9ca9..117e77d 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -19,7 +19,7 @@ clap = { version = "3.2.22", default-features = false, features = [ - "wrap_help", +@@ -25,7 +25,7 @@ clap = { version = "4.1.6", default-features = false, features = [ + "error-context", ] } - console = "0.15.2" + console = "0.15.5" -curl = { version = "0.4.44", features = ["static-curl", "static-ssl"] } +curl = { version = "0.4.44" } dirs = "4.0.0" dotenv = "0.15.0" - elementtree = "1.2.2" + elementtree = "1.2.3" -- 2.39.2 diff --git a/package/sentry-cli/sentry-cli.hash b/package/sentry-cli/sentry-cli.hash index 3562199a8297..78f137da3a0e 100644 --- a/package/sentry-cli/sentry-cli.hash +++ b/package/sentry-cli/sentry-cli.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 fa06f9f47782713eef8a4f10b674e2375b9439360ab34b37558ec4b30ec84861 sentry-cli-2.8.0.tar.gz +sha256 2188b8eead4f2b6543725b23852427bea164e8dd76bf1ce33f41ca0c03cfeee7 sentry-cli-2.20.3.tar.gz sha256 9503def7b54ceb6e3cd182fd59bc05d3a30d7eae481e65aaba4b495133c83c14 LICENSE diff --git a/package/sentry-cli/sentry-cli.mk b/package/sentry-cli/sentry-cli.mk index 15094c2d01b8..df419f81e19d 100644 --- a/package/sentry-cli/sentry-cli.mk +++ b/package/sentry-cli/sentry-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -SENTRY_CLI_VERSION = 2.8.0 +SENTRY_CLI_VERSION = 2.20.3 SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) SENTRY_CLI_LICENSE = BSD-3-clause SENTRY_CLI_LICENSE_FILES = LICENSE From 223596c75d73a7eb29152235d3c5d9bf53bd58f5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 29 Jul 2023 23:21:58 +0200 Subject: [PATCH 1468/2890] package/crun: allow building with uClibc uClibc now provides fexecve(), so crun can build just fine with uClibc. However, argp-standalone is needed, just like it was needed for musl. Signed-off-by: Thomas Petazzoni Reviewed-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/crun/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/crun/Config.in b/package/crun/Config.in index 45c86f0655a0..1b69034459cc 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_CRUN bool "crun" - depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_YAJL # libocispec help crun is a fast and low-memory OCI Container Runtime in C. From 206d08c04a0bb8e7d03a672a322a4c30c2b0dde8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 1 Aug 2023 15:11:15 +0200 Subject: [PATCH 1469/2890] support/download: fix shellcheck errors in svn backend Bizarrely enough, the unquoted expansion of ${quiet} does not trigger any warning from shellcheck, so we do not add any exception for it. ${SVN} can contain more than one item, but we don't care about splitting on spaces when we just print it for debug, so we can just quote it rather than add an exception. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - support/download/svn | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index f5c4f807e759..429776af25cb 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1651,7 +1651,6 @@ support/download/go-post-process Shellcheck support/download/hg Shellcheck support/download/scp Shellcheck support/download/sftp Shellcheck -support/download/svn Shellcheck support/download/wget Shellcheck support/gnuconfig/update Shellcheck support/libtool/buildroot-libtool-v1.5.patch ApplyOrder Sob Upstream diff --git a/support/download/svn b/support/download/svn index b23b7773d39b..d9325b7478ac 100755 --- a/support/download/svn +++ b/support/download/svn @@ -20,6 +20,7 @@ set -e # Environment: # SVN : the svn command to call +# shellcheck disable=SC1090 # Only provides mk_tar_gz() . "${0%/*}/helpers" quiet= @@ -41,12 +42,13 @@ shift $((OPTIND-1)) # Get rid of our options # being expanded a second time (in case there are spaces in them) _svn() { if [ -z "${quiet}" ]; then - printf '%s ' ${SVN} "${@}"; printf '\n' + printf '%s ' "${SVN}" "${@}"; printf '\n' fi _plain_svn "$@" } # Note: please keep command below aligned with what is printed above _plain_svn() { + # shellcheck disable=SC2086 # We want word-splitting for SVN eval ${SVN} "${@}" } From 92d51faedab5f738ad3b9e7b7084c177e100cc7b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 1 Aug 2023 15:11:16 +0200 Subject: [PATCH 1470/2890] support/download: use svn credentials to retrieve revision date When an svn repository requires credentials, and they are passed in _DL_OPTS, they must be used also to retrieve the revision date. One could argue that credentials should not be handled in _DL_OPTS, but rather that they be fed through other means (e.g. by pre-authenticating manually once in an interactive session, or by filling them in the usual ~/svn/auth/* mechanisms for a CI). However, some public facing repositories are using authentication, even though the credentials are public. This is the case for example for: http://software.rtcm-ntrip.org/ In such a case, it does make sense to pass credentials via _DL_OPTS, because they are not really, even really not, secret. Another use-case (e.g. for a CI) is to pass the credentials as environment variables, with _DL_OPTS not hard-coded in the .mk file. However, _DL_OPTS may contain options that are not valid for 'svn info', as they are meant to be passed to 'svn export' in the first place. Since the only options common to 'svn info' and 'svn export' are the credentials, we just extract those and pass them to 'svn info'. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- support/download/svn | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/support/download/svn b/support/download/svn index d9325b7478ac..3e08a0ef368c 100755 --- a/support/download/svn +++ b/support/download/svn @@ -54,12 +54,28 @@ _plain_svn() { _svn export --ignore-keywords ${quiet} "${@}" "'${uri}@${rev}'" "'${basename}'" +# For 'svn info', we only need the credentials, if any; other options +# would be invalid, as they are intended for 'svn export'. +# We can also consume the positional parameters, as we'll no longer +# be calling any other remote-reaching svn command. +creds= +while [ ${#} -gt 0 ]; do + case "${1}" in + --username=*) creds+=" ${1}"; shift;; + --password=*) creds+=" ${1}"; shift;; + --username) creds+=" ${1} ${2}"; shift 2;; + --password) creds+=" ${1} ${2}"; shift 2;; + *) shift;; + esac +done + # Get the date of the revision, to generate reproducible archives. # The output format is YYYY-MM-DDTHH:MM:SS.mmmuuuZ (i.e. always in the # UTC timezone), which we can feed as-is to the --mtime option for tar. # In case there is a redirection (e.g. http -> https), just keep the # last line (svn outputs everything on stdout) -date="$( _plain_svn info "'${uri}@${rev}'" \ +# shellcheck disable=SC2086 # creds may be empty +date="$( _plain_svn info ${creds} "'${uri}@${rev}'" \ |sed -r -e '/^Last Changed Date: /!d; s///' )" From 7dd27cbe5b9ec99e71760c77c78a7971a93c7615 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 1 Aug 2023 15:11:17 +0200 Subject: [PATCH 1471/2890] support/download: add support to exclude svn externals Like git which can have submodules, subversion can have externals. The default behaviour for subversion is to retrieve all the externals, unless told otherwise. For some repositories, the externals may be huge (e.g. a dataset or some assets) and may not be required for building the package. In such a case, retrieving the externals is both a waste of network bandwitdh and time, and a waste of disk storage. Like for git submodules and git lfs, add an option that packages can set to specify whether they want externals or not. Since we've so far been retrieving externals, we keep that the default, and packages can opt-out (rather than the opt-in for git submodules or git lfs). We must only set it when the package is actually hosted on svn, to avoid passing -r when the package is not hosted by svn; otherwise, -r would also be passed e.g. to a git-hosted package, triggering the download of git submodules even when they are not requested. We need to do so, because we have a default value, which we usually do not have in other download options. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.txt | 6 ++++++ package/pkg-download.mk | 1 + package/pkg-generic.mk | 10 ++++++++++ support/download/svn | 6 +++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index fbe37f9ca9ff..299017f9d24b 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -347,6 +347,12 @@ not and can not work as people would expect it should: Git LFS to store large files out of band. This is only available for packages downloaded with git (i.e. when +LIBFOO_SITE_METHOD=git+). ++ +LIBFOO_SVN_EXTERNAL+ can be set to +YES+ (the default) to specify + whether to retrieve the svn external references, or to +NO+ to avoid + retrieving those externals. Note that, contrary to other similar + options like +LIBFOO_GIT_SUBMODULES+ or +LIBFOO_GIT_LFS+, the default + here is to actually retrieve the externals; this is a legacy heritage. + * +LIBFOO_STRIP_COMPONENTS+ is the number of leading components (directories) that tar must strip from file names on extraction. The tarball for most packages has one leading component named diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 0718f21aad2e..5a311a95c6b5 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -119,6 +119,7 @@ define DOWNLOAD -n '$($(2)_BASENAME_RAW)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ + $(if $(filter YES,$($(2)_SVN_EXTERNALS)),-r) \ $(if $($(2)_GIT_SUBMODULES),-r) \ $(if $($(2)_GIT_LFS),-l) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5d1c1da12835..86b9c1f9d3d5 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -643,6 +643,16 @@ ifndef $(2)_GIT_SUBMODULES endif endif +ifndef $(2)_SVN_EXTERNALS + ifdef $(3)_SVN_EXTERNALS + $(2)_SVN_EXTERNALS = $$($(3)_SVN_EXTERNALS) + else + # Legacy: we used to always use externals by default + # Only set it when the package is actually hosted on svn + $(2)_SVN_EXTERNALS = $$(if $$(filter svn,$$($(2)_SITE_METHOD)),YES) + endif +endif + # Do not accept to download git submodule if not using the git method ifneq ($$($(2)_GIT_SUBMODULES),) ifneq ($$($(2)_SITE_METHOD),git) diff --git a/support/download/svn b/support/download/svn index 3e08a0ef368c..1decb2310b46 100755 --- a/support/download/svn +++ b/support/download/svn @@ -16,6 +16,7 @@ set -e # -u URI Checkout from repository at URI. # -c REV Use revision REV. # -n NAME Use basename NAME. +# -r Recursive, i.e. use externals # # Environment: # SVN : the svn command to call @@ -24,6 +25,7 @@ set -e . "${0%/*}/helpers" quiet= +externals=--ignore-externals while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q;; @@ -31,6 +33,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do u) uri="${OPTARG}";; c) rev="${OPTARG}";; n) basename="${OPTARG}";; + r) externals=;; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac @@ -52,7 +55,8 @@ _plain_svn() { eval ${SVN} "${@}" } -_svn export --ignore-keywords ${quiet} "${@}" "'${uri}@${rev}'" "'${basename}'" +# shellcheck disable=SC2086 # externals and quiet may be empty +_svn export --ignore-keywords ${quiet} ${externals} "${@}" "'${uri}@${rev}'" "'${basename}'" # For 'svn info', we only need the credentials, if any; other options # would be invalid, as they are intended for 'svn export'. From ae0b6f43832b9f5ccc7da3480dcc1092740065b7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 2 Aug 2023 23:49:46 +0200 Subject: [PATCH 1472/2890] package/gdb: add support for GDB 13.2 Sadly, the stack of patches remain exactly the same, none of the changes have been upstreamed. Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 9 +++ ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 55 ++++++++++++++++ ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 43 +++++++++++++ package/gdb/13.2/0003-use-asm-sgidefs.h.patch | 40 ++++++++++++ .../0004-gdbserver-fix-build-for-m68k.patch | 63 +++++++++++++++++++ ...fork-inferior-include-linux-ptrace.h.patch | 53 ++++++++++++++++ ...getrandom-compile-for-uclibc-v1.0.35.patch | 39 ++++++++++++ .../13.2/0007-fix-musl-build-on-riscv.patch | 60 ++++++++++++++++++ ...-gdbserver-Makefile.in-fix-NLS-build.patch | 38 +++++++++++ .../0009-gdb-Fix-native-build-on-xtensa.patch | 57 +++++++++++++++++ package/gdb/Config.in.host | 4 ++ package/gdb/gdb.hash | 1 + 12 files changed, 462 insertions(+) create mode 100644 package/gdb/13.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch create mode 100644 package/gdb/13.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch create mode 100644 package/gdb/13.2/0003-use-asm-sgidefs.h.patch create mode 100644 package/gdb/13.2/0004-gdbserver-fix-build-for-m68k.patch create mode 100644 package/gdb/13.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch create mode 100644 package/gdb/13.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch create mode 100644 package/gdb/13.2/0007-fix-musl-build-on-riscv.patch create mode 100644 package/gdb/13.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch create mode 100644 package/gdb/13.2/0009-gdb-Fix-native-build-on-xtensa.patch diff --git a/.checkpackageignore b/.checkpackageignore index 429776af25cb..75da7fa92336 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -522,6 +522,15 @@ package/gdb/12.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream package/gdb/12.1/0007-fix-musl-build-on-riscv.patch Upstream package/gdb/12.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream package/gdb/12.1/0009-gdb-Fix-native-build-on-xtensa.patch Upstream +package/gdb/13.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream +package/gdb/13.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream +package/gdb/13.2/0003-use-asm-sgidefs.h.patch Upstream +package/gdb/13.2/0004-gdbserver-fix-build-for-m68k.patch Upstream +package/gdb/13.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch Upstream +package/gdb/13.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream +package/gdb/13.2/0007-fix-musl-build-on-riscv.patch Upstream +package/gdb/13.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream +package/gdb/13.2/0009-gdb-Fix-native-build-on-xtensa.patch Upstream package/gengetopt/0001-configure.ac-add-disable-doc-option.patch Upstream package/genpart/0001-fix-return-code.patch Upstream package/genromfs/0001-build-system.patch Sob Upstream diff --git a/package/gdb/13.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/13.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch new file mode 100644 index 000000000000..adf605203ec7 --- /dev/null +++ b/package/gdb/13.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -0,0 +1,55 @@ +From 2edb66509607289ea7462db99e247de1200454c1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 6 Aug 2016 17:32:50 -0700 +Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +Signed-off-by: Thomas Petazzoni +[Rebase on gdb 8.3] +Signed-off-by: Romain Naour +--- + gdb/nat/ppc-linux.h | 6 ++++++ + gdbserver/linux-ppc-low.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h +index c84f9146bbd..8c8580c95e1 100644 +--- a/gdb/nat/ppc-linux.h ++++ b/gdb/nat/ppc-linux.h +@@ -18,7 +18,13 @@ + #ifndef NAT_PPC_LINUX_H + #define NAT_PPC_LINUX_H + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + #include + + /* This sometimes isn't defined. */ +diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc +index fdf74727e39..f64afd09b7a 100644 +--- a/gdbserver/linux-ppc-low.cc ++++ b/gdbserver/linux-ppc-low.cc +@@ -23,7 +23,13 @@ + #include "elf/common.h" + #include + #include ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + + #include "arch/ppc-linux-common.h" + #include "arch/ppc-linux-tdesc.h" +-- +2.41.0 + diff --git a/package/gdb/13.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/13.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch new file mode 100644 index 000000000000..30bffea6dcd5 --- /dev/null +++ b/package/gdb/13.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch @@ -0,0 +1,43 @@ +From 2dd3ed43936f26d2929d0e42b200f29e128d4f0d Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 3 Jun 2017 21:23:52 +0200 +Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC + systems + +Fixes a pt_{dsp,}regs redefinition when building with the musl C library +on SuperH. + +Inspired by +http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch, +adapted for SuperH. + +Signed-off-by: Thomas Petazzoni +[Rebase on gdb 8.0] +Signed-off-by: Romain Naour +--- + gdbserver/linux-sh-low.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/gdbserver/linux-sh-low.cc b/gdbserver/linux-sh-low.cc +index 782b8292010..e42f29b845a 100644 +--- a/gdbserver/linux-sh-low.cc ++++ b/gdbserver/linux-sh-low.cc +@@ -76,7 +76,15 @@ extern const struct target_desc *tdesc_sh; + #include + #endif + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++# define pt_dspregs uapi_pt_dspregs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++# undef pt_dspregs ++#endif + + #define sh_num_regs 41 + +-- +2.41.0 + diff --git a/package/gdb/13.2/0003-use-asm-sgidefs.h.patch b/package/gdb/13.2/0003-use-asm-sgidefs.h.patch new file mode 100644 index 000000000000..acb80e6f3302 --- /dev/null +++ b/package/gdb/13.2/0003-use-asm-sgidefs.h.patch @@ -0,0 +1,40 @@ +From 7f05121278d5d5a1939276cfd9f913a0bbe004e1 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use + +Build fix for MIPS with musl libc + +The MIPS specific header is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide + which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] + +Signed-off-by: Andre McCurdy +Signed-off-by: Khem Raj +Signed-off-by: Vicente Olivert Riera +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index 972b5db8e76..e3d838dd9a4 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -31,7 +31,7 @@ + #include "gdb_proc_service.h" + #include "gregset.h" + +-#include ++#include + #include "nat/gdb_ptrace.h" + #include + #include "inf-ptrace.h" +-- +2.41.0 + diff --git a/package/gdb/13.2/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/13.2/0004-gdbserver-fix-build-for-m68k.patch new file mode 100644 index 000000000000..d4c417375bf5 --- /dev/null +++ b/package/gdb/13.2/0004-gdbserver-fix-build-for-m68k.patch @@ -0,0 +1,63 @@ +From e1eef0a642f7aa8aa6071b99b7c0119c436dec11 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 22 Jun 2018 22:40:26 +0200 +Subject: [PATCH] gdbserver: fix build for m68k +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As for strace [1], when is included after , +the build fails on m68k with the following diagnostics: + +In file included from ./../nat/linux-ptrace.h:28:0, + from linux-low.h:27, + from linux-m68k-low.c:20: +[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant + PT_D1 = 0, + ^ +[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant +[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant +In file included from linux-m68k-low.c:27:0: +[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token + }; + ^ + +Fix this by moving on top of "linux-low.h". + +[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 + +Signed-off-by: Romain Naour +--- + gdbserver/linux-m68k-low.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/gdbserver/linux-m68k-low.cc b/gdbserver/linux-m68k-low.cc +index 6094fd914f5..3613d9f642a 100644 +--- a/gdbserver/linux-m68k-low.cc ++++ b/gdbserver/linux-m68k-low.cc +@@ -17,6 +17,11 @@ + along with this program. If not, see . */ + + #include "server.h" ++ ++#ifdef HAVE_SYS_REG_H ++#include ++#endif ++ + #include "linux-low.h" + + /* Linux target op definitions for the m68k architecture. */ +@@ -80,10 +85,6 @@ m68k_target::low_decr_pc_after_break () + void init_registers_m68k (void); + extern const struct target_desc *tdesc_m68k; + +-#ifdef HAVE_SYS_REG_H +-#include +-#endif +- + #define m68k_num_regs 29 + #define m68k_num_gregs 18 + +-- +2.41.0 + diff --git a/package/gdb/13.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/13.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch new file mode 100644 index 000000000000..e8986459825e --- /dev/null +++ b/package/gdb/13.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch @@ -0,0 +1,53 @@ +From 1527c8a790f50be8386eef413483248ff281ed28 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 24 Jun 2018 23:33:55 +0200 +Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h + +To decide whether fork() or vfork() should be used, fork-inferior.c +uses the following test: + + #if !(defined(__UCLIBC__) && defined(HAS_NOMMU)) + +However, HAS_NOMMU is never defined, because it gets defined in +linux-ptrace.h, which is not included by fork-inferior.c. Due to this, +gdbserver fails to build on noMMU architectures. This commit fixes +that by simply including linux-ptrace.h. + +This bug was introduced by commit +2090129c36c7e582943b7d300968d19b46160d84 ("Share fork_inferior et al +with gdbserver"). Indeed, the same fork()/vfork() selection was done, +but in another file where linux-ptrace.h was included. + +Fixes the following build issue: + +../nat/fork-inferior.c: In function 'pid_t fork_inferior(const char*, const string&, char**, void (*)(), void (*)(int), void (*)(), const char*, void (*)(const char*, char* const*, char* const*))': +../nat/fork-inferior.c:376:11: error: 'fork' was not declared in this scope + pid = fork (); + ^~~~ +../nat/fork-inferior.c:376:11: note: suggested alternative: 'vfork' + pid = fork (); + ^~~~ + vfork + +Signed-off-by: Thomas Petazzoni +[Romain: rebase on gdb 8.3] +Signed-off-by: Romain Naour +--- + gdb/nat/fork-inferior.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c +index 968983b2021..8ef620c7193 100644 +--- a/gdb/nat/fork-inferior.c ++++ b/gdb/nat/fork-inferior.c +@@ -27,6 +27,7 @@ + #include "gdbsupport/pathstuff.h" + #include "gdbsupport/signals-state-save-restore.h" + #include "gdbsupport/gdb_tilde_expand.h" ++#include "linux-ptrace.h" + #include + + extern char **environ; +-- +2.41.0 + diff --git a/package/gdb/13.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/13.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch new file mode 100644 index 000000000000..27ff83421524 --- /dev/null +++ b/package/gdb/13.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch @@ -0,0 +1,39 @@ +From a9a4213216d95b4e7cbe4f96d993233bfa2f21e6 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sat, 6 Nov 2021 10:06:25 +0100 +Subject: [PATCH] Fix getrandom compile for uclibc < v1.0.35 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- fix getrandom compile for uclibc < v1.0.35, add missing stddef.h + include (fixed in uclibc since v1.0.35, see [1]) + +Fixes: + + .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name ‘size_t’ + 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) + | ^~~~~~ + +[1] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=00972c02c2b6e0a95d5def4a71bdfb188e091782t + +Signed-off-by: Peter Seiderer +--- + gnulib/import/getrandom.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gnulib/import/getrandom.c b/gnulib/import/getrandom.c +index e1468730933..3948d8d552a 100644 +--- a/gnulib/import/getrandom.c ++++ b/gnulib/import/getrandom.c +@@ -19,6 +19,7 @@ + + #include + ++#include + #include + + #include +-- +2.41.0 + diff --git a/package/gdb/13.2/0007-fix-musl-build-on-riscv.patch b/package/gdb/13.2/0007-fix-musl-build-on-riscv.patch new file mode 100644 index 000000000000..9b494f6b71e1 --- /dev/null +++ b/package/gdb/13.2/0007-fix-musl-build-on-riscv.patch @@ -0,0 +1,60 @@ +From dcadf89351e1944986d3f8c96081142b65f131eb Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 10 Nov 2021 23:14:54 +0100 +Subject: [PATCH] fix musl build on riscv + +Fix the following build failure raised with musl: + +../../gdbserver/linux-riscv-low.cc: In function 'void riscv_fill_fpregset(regcache*, void*)': +../../gdbserver/linux-riscv-low.cc:140:19: error: 'ELF_NFPREG' was not declared in this scope; did you mean 'ELF_NGREG'? + 140 | for (i = 0; i < ELF_NFPREG - 1; i++, regbuf += flen) + | ^~~~~~~~~~ + | ELF_NGREG + +musl fixed the issue with +https://git.musl-libc.org/cgit/musl/commit/?id=e5d2823631bbfebacf48e1a34ed28f28d7cb2570 + +Fixes: + - http://autobuild.buildroot.org/results/16b19198980ce9c81a618b3f6e8dc9fe28247a28 + +Signed-off-by: Fabrice Fontaine +--- + gdb/nat/riscv-linux-tdesc.c | 5 +++++ + gdbserver/linux-riscv-low.cc | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/gdb/nat/riscv-linux-tdesc.c b/gdb/nat/riscv-linux-tdesc.c +index d676233cc31..b620aab5b72 100644 +--- a/gdb/nat/riscv-linux-tdesc.c ++++ b/gdb/nat/riscv-linux-tdesc.c +@@ -31,6 +31,11 @@ + # define NFPREG 33 + #endif + ++/* Work around musl breakage since version 1.1.24. */ ++#ifndef ELF_NFPREG ++# define ELF_NFPREG 33 ++#endif ++ + /* See nat/riscv-linux-tdesc.h. */ + + struct riscv_gdbarch_features +diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc +index 129bc3b138b..a813a897de4 100644 +--- a/gdbserver/linux-riscv-low.cc ++++ b/gdbserver/linux-riscv-low.cc +@@ -30,6 +30,11 @@ + # define NFPREG 33 + #endif + ++/* Work around musl breakage since version 1.1.24. */ ++#ifndef ELF_NFPREG ++# define ELF_NFPREG 33 ++#endif ++ + /* Linux target op definitions for the RISC-V architecture. */ + + class riscv_target : public linux_process_target +-- +2.41.0 + diff --git a/package/gdb/13.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/13.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch new file mode 100644 index 000000000000..c8a40ab5e5da --- /dev/null +++ b/package/gdb/13.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch @@ -0,0 +1,38 @@ +From a4535ce245a0675399877c62a9a12fb0fd36b510 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 18 Nov 2021 22:52:08 +0100 +Subject: [PATCH] gdbserver/Makefile.in: fix NLS build + +Fix the following build failure raised since gdb version 10.1 and +https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=9a665d62266e75f0519f3a663784c458885b5c63: + + CXXLD libinproctrace.so +/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: gdbsupport/tdesc-ipa.o: in function `print_xml_feature::visit(tdesc_type_builtin const*)': +/home/buildroot/autobuild/instance-2/output-1/build/gdb-10.2/build/gdbserver/../../gdbserver/../gdbsupport/tdesc.cc:310: undefined reference to `libintl_gettext' + +Fixes: + - http://autobuild.buildroot.org/results/faacc874fe9d32b74cb3d3dea988ef661cb0e3d0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://sourceware.org/pipermail/gdb-patches/2021-November/183580.html] +--- + gdbserver/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in +index 040f0b6faa0..07ca24cef5c 100644 +--- a/gdbserver/Makefile.in ++++ b/gdbserver/Makefile.in +@@ -389,7 +389,7 @@ $(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS} + $(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \ + -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + $(CXXFLAGS) \ +- -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread ++ -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread $(INTL) + + # Put the proper machine-specific files first, so M-. on a machine + # specific routine gets the one for the correct machine. +-- +2.41.0 + diff --git a/package/gdb/13.2/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/13.2/0009-gdb-Fix-native-build-on-xtensa.patch new file mode 100644 index 000000000000..553ef2785b90 --- /dev/null +++ b/package/gdb/13.2/0009-gdb-Fix-native-build-on-xtensa.patch @@ -0,0 +1,57 @@ +From ed34c23325270b3eada8202f5478b8d53fb5846a Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 28 Aug 2022 23:21:37 +0200 +Subject: [PATCH] gdb: Fix native build on xtensa +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Apply a similar fix than for Alpha architecture on gdb 9: +https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=7a27b85f6d9b5eea9bd1493f903158fbea4b2231 + +Fixes: + +../../gdb/xtensa-linux-nat.c: In function ‘void fill_gregset(const regcache*, elf_greg_t (*)[128], int)’: +../../gdb/xtensa-linux-nat.c:66:17: error: ‘gdbarch_pc_regnum’ was not declared in this scope + 66 | if (regnum == gdbarch_pc_regnum (gdbarch) || regnum == -1) + | ^~~~~~~~~~~~~~~~~ + CXX complaints.o +../../gdb/xtensa-linux-nat.c:68:17: error: ‘gdbarch_ps_regnum’ was not declared in this scope + 68 | if (regnum == gdbarch_ps_regnum (gdbarch) || regnum == -1) + | ^~~~~~~~~~~~~~~~~ +../../gdb/xtensa-linux-nat.c:71:38: error: no matching function for call to ‘gdbarch_tdep::gdbarch_tdep(gdbarch*&)’ + 71 | if (regnum == gdbarch_tdep (gdbarch)->wb_regnum || regnum == -1) + | ^ +In file included from ../../gdb/xtensa-linux-nat.c:38: +../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘gdbarch_tdep::gdbarch_tdep()’ + 160 | struct gdbarch_tdep + | ^~~~~~~~~~~~ +../../gdb/xtensa-tdep.h:160:8: note: candidate expects 0 arguments, 1 provided +../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘constexpr gdbarch_tdep::gdbarch_tdep(const gdbarch_tdep&)’ +../../gdb/xtensa-tdep.h:160:8: note: no known conversion for argument 1 from ‘gdbarch*’ to ‘const gdbarch_tdep&’ +../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘constexpr gdbarch_tdep::gdbarch_tdep(gdbarch_tdep&&)’ +../../gdb/xtensa-tdep.h:160:8: note: no known conversion for argument 1 from ‘gdbarch*’ to ‘gdbarch_tdep&&’ +../../gdb/xtensa-linux-nat.c:72:49: error: no matching function for call to ‘gdbarch_tdep::gdbarch_tdep(gdbarch*&)’ + 72 | regcache->raw_collect (gdbarch_tdep (gdbarch)->wb_regnum, + | ^ + +Signed-off-by: Romain Naour +--- + gdb/xtensa-linux-nat.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c +index e3da3c6a7a5..61834bc28d0 100644 +--- a/gdb/xtensa-linux-nat.c ++++ b/gdb/xtensa-linux-nat.c +@@ -36,6 +36,7 @@ + + #include "gregset.h" + #include "xtensa-tdep.h" ++#include "gdbarch.h" + + /* Defines ps_err_e, struct ps_prochandle. */ + #include "gdb_proc_service.h" +-- +2.41.0 + diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index e8a34e083440..73aac0857e78 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -59,6 +59,9 @@ config BR2_GDB_VERSION_11 config BR2_GDB_VERSION_12 bool "gdb 12.x" +config BR2_GDB_VERSION_13 + bool "gdb 13.x" + endchoice endif @@ -70,4 +73,5 @@ config BR2_GDB_VERSION default "10.2" if BR2_GDB_VERSION_10 default "11.2" if BR2_GDB_VERSION_11 || (!BR2_PACKAGE_HOST_GDB && !BR2_or1k) default "12.1" if BR2_GDB_VERSION_12 || (!BR2_PACKAGE_HOST_GDB && BR2_or1k) + default "13.2" if BR2_GDB_VERSION_13 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 36e2685a25d7..ebe5647dab23 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -2,6 +2,7 @@ sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz sha512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d gdb-12.1.tar.xz +sha512 8185d3e11ab60dafff5860a5016577bfe7dd7547ef01ebc867bc247603d82b74ff74c4f29492c7d2aee57076f52be33e289f4c6b414a4b870d4b3004909f4c34 gdb-13.2.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz From 8568bcd38a4e83ad1a2827b8362278ec73a4feb1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 2 Aug 2023 23:49:47 +0200 Subject: [PATCH 1473/2890] package/gdb: make version 12.x the default We can remove the quirk around BR2_or1k: it was there to make sure that 11.x was the default when no target gdb is selected for all architectures except or1k, and that 12.x would be used by default on or1k, as 11.x is not available/broken. Now that 12.x is the default for everybody, this quirk is no longer needed. 11.x was already no selectable for or1k, and remains not selectable. Signed-off-by: Thomas Petazzoni --- package/gdb/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 73aac0857e78..14efb10c7631 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -41,7 +41,7 @@ config BR2_PACKAGE_HOST_GDB_SIM choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_11 + default BR2_GDB_VERSION_12 depends on !BR2_arc help Select the version of gdb you wish to use. @@ -71,7 +71,7 @@ config BR2_GDB_VERSION string default "arc-2020.09-release-gdb" if BR2_arc default "10.2" if BR2_GDB_VERSION_10 - default "11.2" if BR2_GDB_VERSION_11 || (!BR2_PACKAGE_HOST_GDB && !BR2_or1k) - default "12.1" if BR2_GDB_VERSION_12 || (!BR2_PACKAGE_HOST_GDB && BR2_or1k) + default "11.2" if BR2_GDB_VERSION_11 + default "12.1" if BR2_GDB_VERSION_12 || !BR2_PACKAGE_HOST_GDB default "13.2" if BR2_GDB_VERSION_13 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB From 809fdb3a7a3e4da8e7734a0d7cec48a4b3b99ec5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 2 Aug 2023 23:49:48 +0200 Subject: [PATCH 1474/2890] package/gdb: remove gdb 10.x Now that gdb 13.x has been added, and 12.x made the default, follow our usual logic of dropping the oldest gdb version: 10.x. Only the special ARC release still needs some special handling of the GMP dependency. Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 9 --- Config.in.legacy | 6 ++ ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 55 ---------------- ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 43 ------------- package/gdb/10.2/0003-use-asm-sgidefs.h.patch | 40 ------------ .../0004-gdbserver-fix-build-for-m68k.patch | 63 ------------------- ...fork-inferior-include-linux-ptrace.h.patch | 53 ---------------- ...getrandom-compile-for-uclibc-v1.0.35.patch | 39 ------------ .../10.2/0007-fix-musl-build-on-riscv.patch | 60 ------------------ ...-gdbserver-Makefile.in-fix-NLS-build.patch | 38 ----------- .../0009-gdb-Fix-native-build-on-xtensa.patch | 57 ----------------- package/gdb/Config.in | 2 +- package/gdb/Config.in.host | 6 -- package/gdb/gdb.mk | 8 +-- 14 files changed, 11 insertions(+), 468 deletions(-) delete mode 100644 package/gdb/10.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch delete mode 100644 package/gdb/10.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch delete mode 100644 package/gdb/10.2/0003-use-asm-sgidefs.h.patch delete mode 100644 package/gdb/10.2/0004-gdbserver-fix-build-for-m68k.patch delete mode 100644 package/gdb/10.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch delete mode 100644 package/gdb/10.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch delete mode 100644 package/gdb/10.2/0007-fix-musl-build-on-riscv.patch delete mode 100644 package/gdb/10.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch delete mode 100644 package/gdb/10.2/0009-gdb-Fix-native-build-on-xtensa.patch diff --git a/.checkpackageignore b/.checkpackageignore index 75da7fa92336..1d96ae5ca05a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -495,15 +495,6 @@ package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsaniti package/gcc/arc-2020.09-release/0100-uclibc-conf.patch Upstream package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch Upstream package/gdal/0001-fix-uclibc-build-without-NPTL.patch Upstream -package/gdb/10.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream -package/gdb/10.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream -package/gdb/10.2/0003-use-asm-sgidefs.h.patch Upstream -package/gdb/10.2/0004-gdbserver-fix-build-for-m68k.patch Upstream -package/gdb/10.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch Upstream -package/gdb/10.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream -package/gdb/10.2/0007-fix-musl-build-on-riscv.patch Upstream -package/gdb/10.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream -package/gdb/10.2/0009-gdb-Fix-native-build-on-xtensa.patch Upstream package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream package/gdb/11.2/0003-use-asm-sgidefs.h.patch Upstream diff --git a/Config.in.legacy b/Config.in.legacy index d32ff09216c9..d5bf4f08f303 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.08" +config BR2_GDB_VERSION_10 + bool "gdb 10.x removed" + select BR2_LEGACY + help + gdb 10.x has been removed, use a newer version. + config BR2_BINUTILS_VERSION_2_38_X bool "binutils 2.38.x has been removed" select BR2_LEGACY diff --git a/package/gdb/10.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/10.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch deleted file mode 100644 index 9369a14d2cfd..000000000000 --- a/package/gdb/10.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 64b8ab56118d2fea027adfb7ebbc01668b29528e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 6 Aug 2016 17:32:50 -0700 -Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -Signed-off-by: Thomas Petazzoni -[Rebase on gdb 8.3] -Signed-off-by: Romain Naour ---- - gdb/nat/ppc-linux.h | 6 ++++++ - gdbserver/linux-ppc-low.cc | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index d937a65b69c..1fd54b4a0e0 100644 ---- a/gdb/nat/ppc-linux.h -+++ b/gdb/nat/ppc-linux.h -@@ -18,7 +18,13 @@ - #ifndef NAT_PPC_LINUX_H - #define NAT_PPC_LINUX_H - -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - #include - - /* This sometimes isn't defined. */ -diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc -index 337d555aee7..5d518f37268 100644 ---- a/gdbserver/linux-ppc-low.cc -+++ b/gdbserver/linux-ppc-low.cc -@@ -23,7 +23,13 @@ - #include "elf/common.h" - #include - #include -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - - #include "arch/ppc-linux-common.h" - #include "arch/ppc-linux-tdesc.h" --- -2.29.2 - diff --git a/package/gdb/10.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/10.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch deleted file mode 100644 index 2f96d2982023..000000000000 --- a/package/gdb/10.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d205f398e1e36f9673f50f368a3f29fd1dfaa794 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 3 Jun 2017 21:23:52 +0200 -Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC - systems - -Fixes a pt_{dsp,}regs redefinition when building with the musl C library -on SuperH. - -Inspired by -http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch, -adapted for SuperH. - -Signed-off-by: Thomas Petazzoni -[Rebase on gdb 8.0] -Signed-off-by: Romain Naour ---- - gdbserver/linux-sh-low.cc | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/gdbserver/linux-sh-low.cc b/gdbserver/linux-sh-low.cc -index a6d3fc60047..b83cce6b9fe 100644 ---- a/gdbserver/linux-sh-low.cc -+++ b/gdbserver/linux-sh-low.cc -@@ -76,7 +76,15 @@ extern const struct target_desc *tdesc_sh; - #include - #endif - -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+# define pt_dspregs uapi_pt_dspregs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+# undef pt_dspregs -+#endif - - #define sh_num_regs 41 - --- -2.29.2 - diff --git a/package/gdb/10.2/0003-use-asm-sgidefs.h.patch b/package/gdb/10.2/0003-use-asm-sgidefs.h.patch deleted file mode 100644 index e04ebd1dd53a..000000000000 --- a/package/gdb/10.2/0003-use-asm-sgidefs.h.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH] use - -Build fix for MIPS with musl libc - -The MIPS specific header is provided by glibc and uclibc -but not by musl. Regardless of the libc, the kernel headers provide - which provides the same definitions, so use that -instead. - -Upstream-Status: Pending - -[Vincent: -Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] - -Signed-off-by: Andre McCurdy -Signed-off-by: Khem Raj -Signed-off-by: Vicente Olivert Riera ---- - gdb/mips-linux-nat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 38ff461a35b..b6cf194b2bf 100644 ---- a/gdb/mips-linux-nat.c -+++ b/gdb/mips-linux-nat.c -@@ -31,7 +31,7 @@ - #include "gdb_proc_service.h" - #include "gregset.h" - --#include -+#include - #include "nat/gdb_ptrace.h" - #include - #include "inf-ptrace.h" --- -2.29.2 - diff --git a/package/gdb/10.2/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/10.2/0004-gdbserver-fix-build-for-m68k.patch deleted file mode 100644 index 846f7ed2930b..000000000000 --- a/package/gdb/10.2/0004-gdbserver-fix-build-for-m68k.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 90ebe548922538b854de52e8b687384f44360984 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 22 Jun 2018 22:40:26 +0200 -Subject: [PATCH] gdbserver: fix build for m68k -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As for strace [1], when is included after , -the build fails on m68k with the following diagnostics: - -In file included from ./../nat/linux-ptrace.h:28:0, - from linux-low.h:27, - from linux-m68k-low.c:20: -[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant - PT_D1 = 0, - ^ -[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant -[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant -In file included from linux-m68k-low.c:27:0: -[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token - }; - ^ - -Fix this by moving on top of "linux-low.h". - -[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 - -Signed-off-by: Romain Naour ---- - gdbserver/linux-m68k-low.cc | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/gdbserver/linux-m68k-low.cc b/gdbserver/linux-m68k-low.cc -index 838ba353b0b..36679682b9a 100644 ---- a/gdbserver/linux-m68k-low.cc -+++ b/gdbserver/linux-m68k-low.cc -@@ -17,6 +17,11 @@ - along with this program. If not, see . */ - - #include "server.h" -+ -+#ifdef HAVE_SYS_REG_H -+#include -+#endif -+ - #include "linux-low.h" - - /* Linux target op definitions for the m68k architecture. */ -@@ -80,10 +85,6 @@ m68k_target::low_decr_pc_after_break () - void init_registers_m68k (void); - extern const struct target_desc *tdesc_m68k; - --#ifdef HAVE_SYS_REG_H --#include --#endif -- - #define m68k_num_regs 29 - #define m68k_num_gregs 18 - --- -2.29.2 - diff --git a/package/gdb/10.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/10.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch deleted file mode 100644 index 33dce4d9407e..000000000000 --- a/package/gdb/10.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c8454711eca2e79437e17ed1e1e68b48b4c8d927 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 24 Jun 2018 23:33:55 +0200 -Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h - -To decide whether fork() or vfork() should be used, fork-inferior.c -uses the following test: - - #if !(defined(__UCLIBC__) && defined(HAS_NOMMU)) - -However, HAS_NOMMU is never defined, because it gets defined in -linux-ptrace.h, which is not included by fork-inferior.c. Due to this, -gdbserver fails to build on noMMU architectures. This commit fixes -that by simply including linux-ptrace.h. - -This bug was introduced by commit -2090129c36c7e582943b7d300968d19b46160d84 ("Share fork_inferior et al -with gdbserver"). Indeed, the same fork()/vfork() selection was done, -but in another file where linux-ptrace.h was included. - -Fixes the following build issue: - -../nat/fork-inferior.c: In function 'pid_t fork_inferior(const char*, const string&, char**, void (*)(), void (*)(int), void (*)(), const char*, void (*)(const char*, char* const*, char* const*))': -../nat/fork-inferior.c:376:11: error: 'fork' was not declared in this scope - pid = fork (); - ^~~~ -../nat/fork-inferior.c:376:11: note: suggested alternative: 'vfork' - pid = fork (); - ^~~~ - vfork - -Signed-off-by: Thomas Petazzoni -[Romain: rebase on gdb 8.3] -Signed-off-by: Romain Naour ---- - gdb/nat/fork-inferior.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c -index 7ba0126871d..53e1ec72f09 100644 ---- a/gdb/nat/fork-inferior.c -+++ b/gdb/nat/fork-inferior.c -@@ -27,6 +27,7 @@ - #include "gdbsupport/pathstuff.h" - #include "gdbsupport/signals-state-save-restore.h" - #include "gdbsupport/gdb_tilde_expand.h" -+#include "linux-ptrace.h" - #include - - extern char **environ; --- -2.29.2 - diff --git a/package/gdb/10.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/10.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch deleted file mode 100644 index 4b212e2d03ee..000000000000 --- a/package/gdb/10.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bb894a9cfb1c3cf0e0a174c496ad848f589ee7da Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 6 Nov 2021 10:06:25 +0100 -Subject: [PATCH] Fix getrandom compile for uclibc < v1.0.35 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- fix getrandom compile for uclibc < v1.0.35, add missing stddef.h - include (fixed in uclibc since v1.0.35, see [1]) - -Fixes: - - .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name ‘size_t’ - 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) - | ^~~~~~ - -[1] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=00972c02c2b6e0a95d5def4a71bdfb188e091782t - -Signed-off-by: Peter Seiderer ---- - gnulib/import/getrandom.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gnulib/import/getrandom.c b/gnulib/import/getrandom.c -index 030a78b..7b24350 100644 ---- a/gnulib/import/getrandom.c -+++ b/gnulib/import/getrandom.c -@@ -19,6 +19,7 @@ - - #include - -+#include - #include - - #include --- -2.33.1 - diff --git a/package/gdb/10.2/0007-fix-musl-build-on-riscv.patch b/package/gdb/10.2/0007-fix-musl-build-on-riscv.patch deleted file mode 100644 index 34ab08a97a5e..000000000000 --- a/package/gdb/10.2/0007-fix-musl-build-on-riscv.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c3fdbc0a24c83246f951ba79c7167547da979ae5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 10 Nov 2021 23:14:54 +0100 -Subject: [PATCH] fix musl build on riscv - -Fix the following build failure raised with musl: - -../../gdbserver/linux-riscv-low.cc: In function 'void riscv_fill_fpregset(regcache*, void*)': -../../gdbserver/linux-riscv-low.cc:140:19: error: 'ELF_NFPREG' was not declared in this scope; did you mean 'ELF_NGREG'? - 140 | for (i = 0; i < ELF_NFPREG - 1; i++, regbuf += flen) - | ^~~~~~~~~~ - | ELF_NGREG - -musl fixed the issue with -https://git.musl-libc.org/cgit/musl/commit/?id=e5d2823631bbfebacf48e1a34ed28f28d7cb2570 - -Fixes: - - http://autobuild.buildroot.org/results/16b19198980ce9c81a618b3f6e8dc9fe28247a28 - -Signed-off-by: Fabrice Fontaine ---- - gdb/nat/riscv-linux-tdesc.c | 5 +++++ - gdbserver/linux-riscv-low.cc | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/gdb/nat/riscv-linux-tdesc.c b/gdb/nat/riscv-linux-tdesc.c -index 837b1707e0f..667c013006a 100644 ---- a/gdb/nat/riscv-linux-tdesc.c -+++ b/gdb/nat/riscv-linux-tdesc.c -@@ -31,6 +31,11 @@ - # define NFPREG 33 - #endif - -+/* Work around musl breakage since version 1.1.24. */ -+#ifndef ELF_NFPREG -+# define ELF_NFPREG 33 -+#endif -+ - /* See nat/riscv-linux-tdesc.h. */ - - struct riscv_gdbarch_features -diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc -index 8bf97ea4aa3..1142dbc7b16 100644 ---- a/gdbserver/linux-riscv-low.cc -+++ b/gdbserver/linux-riscv-low.cc -@@ -30,6 +30,11 @@ - # define NFPREG 33 - #endif - -+/* Work around musl breakage since version 1.1.24. */ -+#ifndef ELF_NFPREG -+# define ELF_NFPREG 33 -+#endif -+ - /* Linux target op definitions for the RISC-V architecture. */ - - class riscv_target : public linux_process_target --- -2.33.0 - diff --git a/package/gdb/10.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/10.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch deleted file mode 100644 index 3d7534a48a11..000000000000 --- a/package/gdb/10.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c098500aee945ee7a3021649eb0a2655b004103c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 18 Nov 2021 22:52:08 +0100 -Subject: [PATCH] gdbserver/Makefile.in: fix NLS build - -Fix the following build failure raised since gdb version 10.1 and -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=9a665d62266e75f0519f3a663784c458885b5c63: - - CXXLD libinproctrace.so -/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: gdbsupport/tdesc-ipa.o: in function `print_xml_feature::visit(tdesc_type_builtin const*)': -/home/buildroot/autobuild/instance-2/output-1/build/gdb-10.2/build/gdbserver/../../gdbserver/../gdbsupport/tdesc.cc:310: undefined reference to `libintl_gettext' - -Fixes: - - http://autobuild.buildroot.org/results/faacc874fe9d32b74cb3d3dea988ef661cb0e3d0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://sourceware.org/pipermail/gdb-patches/2021-November/183580.html] ---- - gdbserver/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in -index 71c3c4ad959..e69fbc4dae4 100644 ---- a/gdbserver/Makefile.in -+++ b/gdbserver/Makefile.in -@@ -383,7 +383,7 @@ $(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS} - $(SILENCE) rm -f $(IPA_LIB) - $(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \ - -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ -- -o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread -+ -o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread $(INTL) - - # Put the proper machine-specific files first, so M-. on a machine - # specific routine gets the one for the correct machine. --- -2.33.0 - diff --git a/package/gdb/10.2/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/10.2/0009-gdb-Fix-native-build-on-xtensa.patch deleted file mode 100644 index 927bf20de560..000000000000 --- a/package/gdb/10.2/0009-gdb-Fix-native-build-on-xtensa.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 02d9e6a3bc47dfe138ef4511aaeeae26b7dbd1ba Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 28 Aug 2022 23:21:37 +0200 -Subject: [PATCH] gdb: Fix native build on xtensa -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Apply a similar fix than for Alpha architecture on gdb 9: -https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=7a27b85f6d9b5eea9bd1493f903158fbea4b2231 - -Fixes: - -../../gdb/xtensa-linux-nat.c: In function ‘void fill_gregset(const regcache*, elf_greg_t (*)[128], int)’: -../../gdb/xtensa-linux-nat.c:66:17: error: ‘gdbarch_pc_regnum’ was not declared in this scope - 66 | if (regnum == gdbarch_pc_regnum (gdbarch) || regnum == -1) - | ^~~~~~~~~~~~~~~~~ - CXX complaints.o -../../gdb/xtensa-linux-nat.c:68:17: error: ‘gdbarch_ps_regnum’ was not declared in this scope - 68 | if (regnum == gdbarch_ps_regnum (gdbarch) || regnum == -1) - | ^~~~~~~~~~~~~~~~~ -../../gdb/xtensa-linux-nat.c:71:38: error: no matching function for call to ‘gdbarch_tdep::gdbarch_tdep(gdbarch*&)’ - 71 | if (regnum == gdbarch_tdep (gdbarch)->wb_regnum || regnum == -1) - | ^ -In file included from ../../gdb/xtensa-linux-nat.c:38: -../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘gdbarch_tdep::gdbarch_tdep()’ - 160 | struct gdbarch_tdep - | ^~~~~~~~~~~~ -../../gdb/xtensa-tdep.h:160:8: note: candidate expects 0 arguments, 1 provided -../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘constexpr gdbarch_tdep::gdbarch_tdep(const gdbarch_tdep&)’ -../../gdb/xtensa-tdep.h:160:8: note: no known conversion for argument 1 from ‘gdbarch*’ to ‘const gdbarch_tdep&’ -../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘constexpr gdbarch_tdep::gdbarch_tdep(gdbarch_tdep&&)’ -../../gdb/xtensa-tdep.h:160:8: note: no known conversion for argument 1 from ‘gdbarch*’ to ‘gdbarch_tdep&&’ -../../gdb/xtensa-linux-nat.c:72:49: error: no matching function for call to ‘gdbarch_tdep::gdbarch_tdep(gdbarch*&)’ - 72 | regcache->raw_collect (gdbarch_tdep (gdbarch)->wb_regnum, - | ^ - -Signed-off-by: Romain Naour ---- - gdb/xtensa-linux-nat.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c -index b2b3db182bc..b230e08b69f 100644 ---- a/gdb/xtensa-linux-nat.c -+++ b/gdb/xtensa-linux-nat.c -@@ -36,6 +36,7 @@ - - #include "gregset.h" - #include "xtensa-tdep.h" -+#include "gdbarch.h" - - /* Defines ps_err_e, struct ps_prochandle. */ - #include "gdb_proc_service.h" --- -2.37.2 - diff --git a/package/gdb/Config.in b/package/gdb/Config.in index d1813fd7b969..20fd262c938a 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -59,7 +59,7 @@ config BR2_PACKAGE_GDB_DEBUGGER bool "full debugger" depends on BR2_USE_WCHAR depends on !BR2_sh - select BR2_PACKAGE_GMP if !BR2_GDB_VERSION_10 && !BR2_arc + select BR2_PACKAGE_GMP if !BR2_arc select BR2_PACKAGE_NCURSES comment "full gdb on target needs a toolchain w/ wchar" diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 14efb10c7631..9ba987222acb 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -46,11 +46,6 @@ choice help Select the version of gdb you wish to use. -config BR2_GDB_VERSION_10 - bool "gdb 10.x" - # gdbserver support missing - depends on !BR2_or1k - config BR2_GDB_VERSION_11 bool "gdb 11.x" # gdbserver support missing @@ -70,7 +65,6 @@ endif config BR2_GDB_VERSION string default "arc-2020.09-release-gdb" if BR2_arc - default "10.2" if BR2_GDB_VERSION_10 default "11.2" if BR2_GDB_VERSION_11 default "12.1" if BR2_GDB_VERSION_12 || !BR2_PACKAGE_HOST_GDB default "13.2" if BR2_GDB_VERSION_13 diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 4b9c5c6b7075..ec4cc2413712 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -59,7 +59,7 @@ endif # All newer versions of GDB need host-gmp, so it's only for older # versions that the dependency can be avoided. -ifeq ($(BR2_GDB_VERSION_10)$(BR2_arc),) +ifeq ($(BR2_arc),) HOST_GDB_DEPENDENCIES += host-gmp endif @@ -149,9 +149,9 @@ GDB_CONF_OPTS += \ endif # Starting from GDB 11.x, gmp is needed as a dependency to build full -# gdb. So we avoid the dependency only for GDB 10.x and the special -# version used on ARC. -ifeq ($(BR2_GDB_VERSION_10)$(BR2_arc):$(BR2_PACKAGE_GDB_DEBUGGER),:y) +# gdb. So we avoid the dependency only for the special version used on +# ARC. +ifeq ($(BR2_arc):$(BR2_PACKAGE_GDB_DEBUGGER),:y) GDB_CONF_OPTS += \ --with-libgmp-prefix=$(STAGING_DIR)/usr GDB_DEPENDENCIES += gmp From 8b1bc64d924e386466d715637a4a09228322beef Mon Sep 17 00:00:00 2001 From: Nicolas Carrier Date: Wed, 2 Aug 2023 08:22:39 +0200 Subject: [PATCH 1475/2890] less: use default "make install" behavior The less package currently installs only the "less" binary, rather than running the default "make install" behavior from the autotools build system. However, at least another binary, "lessecho" is needed for the "s" command in less to work properly: so in that sense this commit is fixing a broken behavior. Since the less installation only installs 3 programs, "less", "lessopen" and "lesskey", there is no good reason to not use the default installation command, which we do in this commit. Signed-off-by: Nicolas Carrier [Thomas: rework commit message] Signed-off-by: Thomas Petazzoni --- package/less/less.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/less/less.mk b/package/less/less.mk index 91ce08f4f0de..f7211ef1122e 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -11,8 +11,4 @@ LESS_LICENSE_FILES = COPYING LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses -define LESS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less -endef - $(eval $(autotools-package)) From 8aa64eecb0da4dfee7da41a66589d7b46c6730e5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 2 Aug 2023 00:37:41 +0200 Subject: [PATCH 1476/2890] package/luvi: bump 2.14 lua-openssl (0.7.8-0) bundled in luvi 2.13 fail to build with openssl-3.x test-output/TestLuvi/build/luvi-2.13.0/deps/lua-openssl/src/lbn.c:28:27: error: expected ')' before 'SHLIB_VERSION_NUMBER' 28 | "based on OpenSSL " SHLIB_VERSION_NUMBER | ^~~~~~~~~~~~~~~~~~~~ Luvi 2.14 include an lua-openssl update to 0.8.2-0 fixing TestLuvi. See: https://github.com/luvit/luvi/releases/tag/v2.14.0 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561386 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/luvi/luvi.hash | 2 +- package/luvi/luvi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash index 9621ef4d03ab..3518a2dc8567 100644 --- a/package/luvi/luvi.hash +++ b/package/luvi/luvi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 da25c74a30a3fe2fc75e9797a6fa0717ebb05ceb7e6ccb61301f80c7dd436b73 luvi-src-v2.13.0.tar.gz +sha256 4be4468d01657100967a9c696f503aa3c30de6f23af39050c1aae909fbf0aaf2 luvi-src-v2.14.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index 5266281ffc8e..4a8072dee585 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUVI_VERSION = 2.13.0 +LUVI_VERSION = 2.14.0 LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) LUVI_LICENSE = Apache-2.0 From 78039eb59acfb2c3051ca81e7e161d9e281d3983 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Wed, 2 Aug 2023 06:55:46 +0100 Subject: [PATCH 1477/2890] configs/zynqmp: bump to xilinx-v2023.1 This patch bumps the zynqmp defconfigs to xilinx-v2023.1 which includes the following updates: - Linux v6.1.5 - U-Boot v2023.01 - ATF v2.8 (including mainline buildroot patches) - PMUFW xilinx_v2023.1 - Updated pm_cfg_obj.c from Vitis v2023.1 - Removed kria u-boot patch which is included with xilinx-v2023.1 Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - board/zynqmp/kria/kv260/pm_cfg_obj.c | 69 ++----------------- ...-0001-makefile-add-multi_dtb_fit-dep.patch | 32 --------- ...dd-support-for-new-binutils-versions.patch | 2 +- ...2-build-tools-avoid-unnecessary-link.patch | 1 + board/zynqmp/zcu102/pm_cfg_obj.c | 51 ++------------ board/zynqmp/zcu106/pm_cfg_obj.c | 51 ++------------ configs/zynqmp_kria_kv260_defconfig | 15 ++-- configs/zynqmp_zcu102_defconfig | 13 ++-- configs/zynqmp_zcu106_defconfig | 13 ++-- 10 files changed, 39 insertions(+), 209 deletions(-) delete mode 100644 board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch create mode 120000 board/zynqmp/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch diff --git a/.checkpackageignore b/.checkpackageignore index 1d96ae5ca05a..d7fab118a917 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -101,7 +101,6 @@ board/udoo/common/post-build.sh Shellcheck board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch Upstream board/versal/post-build.sh Shellcheck board/versal/post-image.sh Shellcheck TrailingSpace -board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch ApplyOrder Upstream boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch Upstream boot/at91bootstrap/0001-eabi-fix.patch Upstream boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch Upstream diff --git a/board/zynqmp/kria/kv260/pm_cfg_obj.c b/board/zynqmp/kria/kv260/pm_cfg_obj.c index 019df6e2371b..fc6c4024c639 100644 --- a/board/zynqmp/kria/kv260/pm_cfg_obj.c +++ b/board/zynqmp/kria/kv260/pm_cfg_obj.c @@ -30,6 +30,9 @@ #define SUSPEND_TIMEOUT 0xFFFFFFFFU +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + #define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 #define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 #define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 @@ -51,7 +54,7 @@ __root const u32 XPm_ConfigObject[] = /* HEADER */ 2, /* Number of remaining words in the header */ 8, /* Number of sections included in config object */ - 1U, /* Type of config object as base */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ /**********************************************************************/ /* MASTER SECTION */ PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ @@ -81,7 +84,7 @@ __root const u32 XPm_ConfigObject[] = PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ - 49, /* Number of slaves */ + 34, /* Number of slaves */ NODE_OCM_BANK_0, PM_SLAVE_FLAG_IS_SHAREABLE, @@ -131,10 +134,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_USB_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_TTC_0, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -151,54 +150,22 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_SATA, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_ETH_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_ETH_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_ETH_2, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_ETH_3, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_UART_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_UART_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_SPI_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_SPI_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_I2C_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_I2C_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_SD_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_SD_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -215,10 +182,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_NAND, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_QSPI, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -227,14 +190,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_CAN_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_CAN_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_EXTERN, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -259,22 +214,10 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_PCIE, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_PCAP, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_RTC, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_VCU, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_PL, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -545,8 +488,6 @@ __root const u32 XPm_ConfigObject[] = /**********************************************************************/ /* GPO SECTION */ PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ - PM_CONFIG_GPO1_BIT_2_MASK | - PM_CONFIG_GPO1_MIO_PIN_34_MAP | PM_CONFIG_GPO1_MIO_PIN_35_MAP | 0, /* State of GPO pins */ }; diff --git a/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch b/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch deleted file mode 100644 index ddc04cacacc7..000000000000 --- a/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8b181bf582c17cf709a62cf499f9709c94f49d33 Mon Sep 17 00:00:00 2001 -From: Neal Frager -Date: Wed, 21 Dec 2022 07:51:42 +0000 -Subject: [PATCH v1 1/1] makefile: add multi_dtb_fit dep - -With certain gcc compilers, the u-boot.itb is built immediately after dtb -generation. If CONFIG_MULTI_DTB_FIT is used, it is possible that the -fit-dtb.blob is not finished in time. - -This patch adds a necessary dependency to guarantee that the fit-dtb.blob -is built before attempting to build the u-boot.itb. - -Signed-off-by: Neal Frager ---- - Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile b/Makefile -index b96e2ffa15..682a5d94fd 100644 ---- a/Makefile -+++ b/Makefile -@@ -1425,6 +1425,7 @@ MKIMAGEFLAGS_u-boot.itb += -B 0x8 - ifdef U_BOOT_ITS - u-boot.itb: u-boot-nodtb.bin \ - $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX),dts/dt.dtb) \ -+ $(if $(CONFIG_MULTI_DTB_FIT),$(FINAL_DTB_CONTAINER)) \ - $(U_BOOT_ITS) FORCE - $(call if_changed,mkfitimage) - $(BOARD_SIZE_CHECK) --- -2.17.1 - diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch index 695cc80b9441..8ad996914b4d 120000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch +++ b/board/zynqmp/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -1 +1 @@ -../../../../boot/arm-trusted-firmware/v2.6/0001-feat-build-add-support-for-new-binutils-versions.patch \ No newline at end of file +../../../../boot/arm-trusted-firmware/v2.8/0001-feat-build-add-support-for-new-binutils-versions.patch \ No newline at end of file diff --git a/board/zynqmp/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch b/board/zynqmp/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch new file mode 120000 index 000000000000..fecdee544930 --- /dev/null +++ b/board/zynqmp/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1 @@ +../../../../boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch \ No newline at end of file diff --git a/board/zynqmp/zcu102/pm_cfg_obj.c b/board/zynqmp/zcu102/pm_cfg_obj.c index 68557c4cb439..04bfb16e35c8 100644 --- a/board/zynqmp/zcu102/pm_cfg_obj.c +++ b/board/zynqmp/zcu102/pm_cfg_obj.c @@ -30,6 +30,9 @@ #define SUSPEND_TIMEOUT 0xFFFFFFFFU +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + #define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 #define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 #define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 @@ -51,7 +54,7 @@ __root const u32 XPm_ConfigObject[] = /* HEADER */ 2, /* Number of remaining words in the header */ 8, /* Number of sections included in config object */ - 1U, /* Type of config object as base */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ /**********************************************************************/ /* MASTER SECTION */ PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ @@ -81,7 +84,7 @@ __root const u32 XPm_ConfigObject[] = PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ - 49, /* Number of slaves */ + 38, /* Number of slaves */ NODE_OCM_BANK_0, PM_SLAVE_FLAG_IS_SHAREABLE, @@ -131,10 +134,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_USB_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_TTC_0, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -155,18 +154,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_ETH_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_ETH_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_ETH_2, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_ETH_3, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -179,14 +166,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_SPI_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_SPI_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_I2C_0, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -195,10 +174,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_SD_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_SD_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -215,10 +190,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_NAND, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_QSPI, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -227,10 +198,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_CAN_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_CAN_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -263,18 +230,10 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_PCAP, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_RTC, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_VCU, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_PL, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ diff --git a/board/zynqmp/zcu106/pm_cfg_obj.c b/board/zynqmp/zcu106/pm_cfg_obj.c index 6d15d510e945..54a1afa902e7 100644 --- a/board/zynqmp/zcu106/pm_cfg_obj.c +++ b/board/zynqmp/zcu106/pm_cfg_obj.c @@ -30,6 +30,9 @@ #define SUSPEND_TIMEOUT 0xFFFFFFFFU +#define PM_CONFIG_OBJECT_TYPE_BASE 0x1U + + #define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 #define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 #define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 @@ -51,7 +54,7 @@ __root const u32 XPm_ConfigObject[] = /* HEADER */ 2, /* Number of remaining words in the header */ 8, /* Number of sections included in config object */ - 1U, /* Type of config object as base */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ /**********************************************************************/ /* MASTER SECTION */ PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ @@ -81,7 +84,7 @@ __root const u32 XPm_ConfigObject[] = PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ - 49, /* Number of slaves */ + 38, /* Number of slaves */ NODE_OCM_BANK_0, PM_SLAVE_FLAG_IS_SHAREABLE, @@ -131,10 +134,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_USB_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_TTC_0, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -155,18 +154,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_ETH_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_ETH_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_ETH_2, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_ETH_3, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -179,14 +166,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_SPI_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_SPI_1, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_I2C_0, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -195,10 +174,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_SD_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_SD_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -215,10 +190,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_NAND, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_QSPI, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -227,10 +198,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_CAN_0, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_CAN_1, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ @@ -259,14 +226,6 @@ __root const u32 XPm_ConfigObject[] = PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ - NODE_PCIE, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - - NODE_PCAP, - PM_SLAVE_FLAG_IS_SHAREABLE, - 0U, /* IPI Mask */ - NODE_RTC, PM_SLAVE_FLAG_IS_SHAREABLE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 8ceaa6983d46..78b62a9ff854 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -1,12 +1,12 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kv260/kv260.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -15,27 +15,28 @@ 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.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" 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_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/kv260/kv260_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.1/kv260-kria/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches board/zynqmp/patches" +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index f4789b9d886e..18230cf89ba3 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -1,12 +1,12 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,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_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -15,21 +15,22 @@ 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.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" 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_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/zcu102/zcu102_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.1/zcu102-zynqmp/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 516f1143ce51..21f41a2d8fda 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,12 +1,12 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,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_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -15,21 +15,22 @@ 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.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" 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_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/zcu106/zcu106_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.1/zcu106-zynqmp/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From 7efd8e3c0b584a1d743db2c0005bf9b85f521ae9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 2 Aug 2023 00:37:41 +0200 Subject: [PATCH 1478/2890] package/luvi: bump 2.14 lua-openssl (0.7.8-0) bundled in luvi 2.13 fail to build with openssl-3.x test-output/TestLuvi/build/luvi-2.13.0/deps/lua-openssl/src/lbn.c:28:27: error: expected ')' before 'SHLIB_VERSION_NUMBER' 28 | "based on OpenSSL " SHLIB_VERSION_NUMBER | ^~~~~~~~~~~~~~~~~~~~ Luvi 2.14 include an lua-openssl update to 0.8.2-0 fixing TestLuvi. See: https://github.com/luvit/luvi/releases/tag/v2.14.0 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561386 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/luvi/luvi.hash | 2 +- package/luvi/luvi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash index 9621ef4d03ab..3518a2dc8567 100644 --- a/package/luvi/luvi.hash +++ b/package/luvi/luvi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 da25c74a30a3fe2fc75e9797a6fa0717ebb05ceb7e6ccb61301f80c7dd436b73 luvi-src-v2.13.0.tar.gz +sha256 4be4468d01657100967a9c696f503aa3c30de6f23af39050c1aae909fbf0aaf2 luvi-src-v2.14.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index 5266281ffc8e..4a8072dee585 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUVI_VERSION = 2.13.0 +LUVI_VERSION = 2.14.0 LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) LUVI_LICENSE = Apache-2.0 From 0d8c70e93d1835c97d797ce1f390e6acc0adb225 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 19 Jul 2023 00:11:20 +0200 Subject: [PATCH 1479/2890] package/kodi: fix filenames of kodi host utils The variables WITH_JSONSCHEMABUILDER & WITH_TEXTUREPACKER are defined as directories: https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindJsonSchemaBuilder.cmake https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindTexturePacker.cmake and during configure kodi searches these directories for usable binaries with the name scheme. ${APP_NAME_LC}-JsonSchemaBuilder ${APP_NAME_LC}-TexturePacker which translates to kodi-JsonSchemaBuilder and kodi-TexturePacker. This is an improvement to follow upstream's expections and it does neither fix a build nor a runtime error. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-skin-confluence/kodi-skin-confluence.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.mk | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 569bde8cd24e..e017aa8d9cf2 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -20,7 +20,7 @@ HOST_KODI_JSONSCHEMABUILDER_CONF_OPTS = \ define HOST_KODI_JSONSCHEMABUILDER_INSTALL_CMDS $(INSTALL) -m 755 -D \ $(@D)/tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \ - $(HOST_DIR)/bin/JsonSchemaBuilder + $(HOST_DIR)/bin/kodi-JsonSchemaBuilder endef $(eval $(host-cmake-package)) diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.mk b/package/kodi-skin-confluence/kodi-skin-confluence.mk index 43d0c4bff689..58e51ffc8a13 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.mk +++ b/package/kodi-skin-confluence/kodi-skin-confluence.mk @@ -11,7 +11,7 @@ KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt KODI_SKIN_CONFLUENCE_DEPENDENCIES = kodi define KODI_SKIN_CONFLUENCE_BUILD_CMDS - $(HOST_DIR)/bin/TexturePacker -input $(@D)/media/ -output $(@D)/media/Textures.xbt -dupecheck -use_none + $(HOST_DIR)/bin/kodi-TexturePacker -input $(@D)/media/ -output $(@D)/media/Textures.xbt -dupecheck -use_none endef define KODI_SKIN_CONFLUENCE_INSTALL_TARGET_CMDS diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 44eba85d75fc..c0bc767dd4f4 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -35,7 +35,7 @@ HOST_KODI_TEXTUREPACKER_CONF_OPTS += \ define HOST_KODI_TEXTUREPACKER_INSTALL_CMDS $(INSTALL) -m 755 -D \ $(@D)/tools/depends/native/TexturePacker/TexturePacker \ - $(HOST_DIR)/bin/TexturePacker + $(HOST_DIR)/bin/kodi-TexturePacker endef $(eval $(host-cmake-package)) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index aff272d01409..4fe6ea46ccd9 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -88,8 +88,8 @@ KODI_CONF_OPTS += \ -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ - -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ - -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ + -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/ \ + -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/ \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ -DLIBDVDNAV_URL=$(KODI_DL_DIR)/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ -DLIBDVDREAD_URL=$(KODI_DL_DIR)/kodi-libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz From 1cc378b004ddbb1bc351f12ab374a19fe6c8d90c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:30 +0200 Subject: [PATCH 1480/2890] package/python-aiologstash: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-aiologstash/python-aiologstash.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-aiologstash/python-aiologstash.mk b/package/python-aiologstash/python-aiologstash.mk index be1c40b71412..de0ed820a0e5 100644 --- a/package/python-aiologstash/python-aiologstash.mk +++ b/package/python-aiologstash/python-aiologstash.mk @@ -7,7 +7,7 @@ PYTHON_AIOLOGSTASH_VERSION = 2.0.0 PYTHON_AIOLOGSTASH_SOURCE = aiologstash-$(PYTHON_AIOLOGSTASH_VERSION).tar.gz PYTHON_AIOLOGSTASH_SITE = https://files.pythonhosted.org/packages/1c/dc/382861d5d25ccc976d02118922598fc4547f74f3287793e270ed614d8176 -PYTHON_AIOLOGSTASH_SETUP_TYPE = distutils +PYTHON_AIOLOGSTASH_SETUP_TYPE = setuptools PYTHON_AIOLOGSTASH_LICENSE = MIT PYTHON_AIOLOGSTASH_LICENSE_FILES = LICENSE From 77fc07c9804d802acad27c7e8734549af54135dd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:31 +0200 Subject: [PATCH 1481/2890] package/python-backcall: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-backcall/python-backcall.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-backcall/python-backcall.mk b/package/python-backcall/python-backcall.mk index 2ead3421a83f..ea9ffb863ca4 100644 --- a/package/python-backcall/python-backcall.mk +++ b/package/python-backcall/python-backcall.mk @@ -7,7 +7,7 @@ PYTHON_BACKCALL_VERSION = 0.2.0 PYTHON_BACKCALL_SOURCE = backcall-$(PYTHON_BACKCALL_VERSION).tar.gz PYTHON_BACKCALL_SITE = https://files.pythonhosted.org/packages/a2/40/764a663805d84deee23043e1426a9175567db89c8b3287b5c2ad9f71aa93 -PYTHON_BACKCALL_SETUP_TYPE = distutils +PYTHON_BACKCALL_SETUP_TYPE = setuptools PYTHON_BACKCALL_LICENSE = BSD-3-Clause PYTHON_BACKCALL_LICENSE_FILES = LICENSE From 2504365e1ef5684497ca20c266a9c7847ee57ca6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:32 +0200 Subject: [PATCH 1482/2890] package/python-crc16: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-crc16/python-crc16.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-crc16/python-crc16.mk b/package/python-crc16/python-crc16.mk index 9809f1ed84a5..86e6f2ecf241 100644 --- a/package/python-crc16/python-crc16.mk +++ b/package/python-crc16/python-crc16.mk @@ -8,6 +8,6 @@ PYTHON_CRC16_VERSION = 0.1.1 PYTHON_CRC16_SITE = $(call github,gennady,pycrc16,v$(PYTHON_CRC16_VERSION)) PYTHON_CRC16_LICENSE = LGPL-3.0+ PYTHON_CRC16_LICENSE_FILES = COPYING.txt -PYTHON_CRC16_SETUP_TYPE = distutils +PYTHON_CRC16_SETUP_TYPE = setuptools $(eval $(python-package)) From 19c12a521701035c166917919c220c33bf71ced0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:33 +0200 Subject: [PATCH 1483/2890] package/python-crcmod: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-crcmod/python-crcmod.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-crcmod/python-crcmod.mk b/package/python-crcmod/python-crcmod.mk index 1aab7f508429..c97f8808c195 100644 --- a/package/python-crcmod/python-crcmod.mk +++ b/package/python-crcmod/python-crcmod.mk @@ -7,7 +7,7 @@ PYTHON_CRCMOD_VERSION = 1.7 PYTHON_CRCMOD_SOURCE = crcmod-$(PYTHON_CRCMOD_VERSION).tar.gz PYTHON_CRCMOD_SITE = https://pypi.python.org/packages/6b/b0/e595ce2a2527e169c3bcd6c33d2473c1918e0b7f6826a043ca1245dd4e5b -PYTHON_CRCMOD_SETUP_TYPE = distutils +PYTHON_CRCMOD_SETUP_TYPE = setuptools PYTHON_CRCMOD_LICENSE = MIT PYTHON_CRCMOD_LICENSE_FILES = LICENSE From 31a12000486d17d7009668ef4732892e581c4dc9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:34 +0200 Subject: [PATCH 1484/2890] package/python-dicttoxml: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-dicttoxml/python-dicttoxml.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-dicttoxml/python-dicttoxml.mk b/package/python-dicttoxml/python-dicttoxml.mk index c26c16b72a3d..eb0049fd03cb 100644 --- a/package/python-dicttoxml/python-dicttoxml.mk +++ b/package/python-dicttoxml/python-dicttoxml.mk @@ -7,7 +7,7 @@ PYTHON_DICTTOXML_VERSION = 1.7.16 PYTHON_DICTTOXML_SOURCE = dicttoxml-$(PYTHON_DICTTOXML_VERSION).tar.gz PYTHON_DICTTOXML_SITE = https://files.pythonhosted.org/packages/ee/c9/3132427f9e64d572688e6a1cbe3d542d1a03f676b81fb600f3d1fd7d2ec5 -PYTHON_DICTTOXML_SETUP_TYPE = distutils +PYTHON_DICTTOXML_SETUP_TYPE = setuptools PYTHON_DICTTOXML_LICENSE = GPL-2.0 PYTHON_DICTTOXML_LICENSE_FILES = LICENCE.txt From 464c37e350d85a97d1fb7c68ebf20eb0d4aa6956 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:35 +0200 Subject: [PATCH 1485/2890] package/python-hwdata: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-hwdata/python-hwdata.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-hwdata/python-hwdata.mk b/package/python-hwdata/python-hwdata.mk index 8eeec6efa820..5e968ce847f9 100644 --- a/package/python-hwdata/python-hwdata.mk +++ b/package/python-hwdata/python-hwdata.mk @@ -7,7 +7,7 @@ PYTHON_HWDATA_VERSION = 2.3.7 PYTHON_HWDATA_SOURCE = hwdata-$(PYTHON_HWDATA_VERSION).tar.gz PYTHON_HWDATA_SITE = https://files.pythonhosted.org/packages/15/26/f5bc1b42129fbcbd1c99c29714af1685fc89e2cf37680a9930d4fcac1808 -PYTHON_HWDATA_SETUP_TYPE = distutils +PYTHON_HWDATA_SETUP_TYPE = setuptools PYTHON_HWDATA_LICENSE = GPL-2.0+ PYTHON_HWDATA_LICENSE_FILES = LICENSE From 5c9e66d87517bd2fadd33993741bb03b9b79a50d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:36 +0200 Subject: [PATCH 1486/2890] package/python-iowait: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-iowait/python-iowait.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-iowait/python-iowait.mk b/package/python-iowait/python-iowait.mk index e327053e8ecb..028001d7f30c 100644 --- a/package/python-iowait/python-iowait.mk +++ b/package/python-iowait/python-iowait.mk @@ -7,7 +7,7 @@ PYTHON_IOWAIT_VERSION = 0.2 PYTHON_IOWAIT_SOURCE = iowait-$(PYTHON_IOWAIT_VERSION).tar.gz PYTHON_IOWAIT_SITE = https://pypi.python.org/packages/65/30/e953673fe9619938e9c74408401cf865f37716da89f61f6e5d9328c0f71e -PYTHON_IOWAIT_SETUP_TYPE = distutils +PYTHON_IOWAIT_SETUP_TYPE = setuptools PYTHON_IOWAIT_LICENSE = LGPL-3.0+ PYTHON_IOWAIT_LICENSE_FILES = COPYING.LESSER From 6f372eb8ecb00a06be53ab3c131e57e2d8d6e24b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:37 +0200 Subject: [PATCH 1487/2890] package/python-ipy: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-ipy/python-ipy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-ipy/python-ipy.mk b/package/python-ipy/python-ipy.mk index 2a01daf4cac2..ec03adcb6031 100644 --- a/package/python-ipy/python-ipy.mk +++ b/package/python-ipy/python-ipy.mk @@ -9,6 +9,6 @@ PYTHON_IPY_SOURCE = IPy-$(PYTHON_IPY_VERSION).tar.gz PYTHON_IPY_SITE = https://files.pythonhosted.org/packages/64/a4/9c0d88d95666ff1571d7baec6c5e26abc08051801feb6e6ddf40f6027e22 PYTHON_IPY_LICENSE = BSD-3-Clause PYTHON_IPY_LICENSE_FILES = COPYING -PYTHON_IPY_SETUP_TYPE = distutils +PYTHON_IPY_SETUP_TYPE = setuptools $(eval $(python-package)) From 52c87da4a4cbc9bd78460d0227e1b1fbf95f4844 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:38 +0200 Subject: [PATCH 1488/2890] package/python-ipython-genutils: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-ipython-genutils/python-ipython-genutils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-ipython-genutils/python-ipython-genutils.mk b/package/python-ipython-genutils/python-ipython-genutils.mk index 4e8cc287fe93..08a0b8ba9aee 100644 --- a/package/python-ipython-genutils/python-ipython-genutils.mk +++ b/package/python-ipython-genutils/python-ipython-genutils.mk @@ -9,6 +9,6 @@ PYTHON_IPYTHON_GENUTILS_SOURCE = ipython_genutils-$(PYTHON_IPYTHON_GENUTILS_VERS PYTHON_IPYTHON_GENUTILS_SITE = https://pypi.python.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399 PYTHON_IPYTHON_GENUTILS_LICENSE = BSD-3-Clause PYTHON_IPYTHON_GENUTILS_LICENSE_FILES = COPYING.md -PYTHON_IPYTHON_GENUTILS_SETUP_TYPE = distutils +PYTHON_IPYTHON_GENUTILS_SETUP_TYPE = setuptools $(eval $(python-package)) From 6fea0598255cfe2aaff094876fa1c65756662496 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:39 +0200 Subject: [PATCH 1489/2890] package/python-logstash: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-logstash/python-logstash.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-logstash/python-logstash.mk b/package/python-logstash/python-logstash.mk index a78b6e6590d3..6cdbe2009bee 100644 --- a/package/python-logstash/python-logstash.mk +++ b/package/python-logstash/python-logstash.mk @@ -6,7 +6,7 @@ PYTHON_LOGSTASH_VERSION = 0.4.8 PYTHON_LOGSTASH_SITE = https://files.pythonhosted.org/packages/f7/3b/c3a957bbdd23859f07905fc3d1adfe89957217a347478c58409f0315cf1d -PYTHON_LOGSTASH_SETUP_TYPE = distutils +PYTHON_LOGSTASH_SETUP_TYPE = setuptools PYTHON_LOGSTASH_LICENSE = MIT PYTHON_LOGSTASH_LICENSE_FILES = LICENSE From bee32945ab82af5eb6c71930c9aa0d0842a7db0b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:40 +0200 Subject: [PATCH 1490/2890] package/python-mwscrape: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-mwscrape/python-mwscrape.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-mwscrape/python-mwscrape.mk b/package/python-mwscrape/python-mwscrape.mk index 3ffe9d688052..8b6c718c563c 100644 --- a/package/python-mwscrape/python-mwscrape.mk +++ b/package/python-mwscrape/python-mwscrape.mk @@ -8,6 +8,6 @@ PYTHON_MWSCRAPE_VERSION = 568ccbe6e12dd6391277df02adf724ba0e5f9197 PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION)) PYTHON_MWSCRAPE_LICENSE = MPL-2.0 PYTHON_MWSCRAPE_LICENSE_FILES = LICENSE.txt -PYTHON_MWSCRAPE_SETUP_TYPE = distutils +PYTHON_MWSCRAPE_SETUP_TYPE = setuptools $(eval $(python-package)) From cf05ac37ca0ba4efa11b46b07d3d7be1528c3dab Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:41 +0200 Subject: [PATCH 1491/2890] package/python-mwscrape2slob: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-mwscrape2slob/python-mwscrape2slob.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-mwscrape2slob/python-mwscrape2slob.mk b/package/python-mwscrape2slob/python-mwscrape2slob.mk index cd8ae35234eb..a99005ba7c78 100644 --- a/package/python-mwscrape2slob/python-mwscrape2slob.mk +++ b/package/python-mwscrape2slob/python-mwscrape2slob.mk @@ -7,6 +7,6 @@ PYTHON_MWSCRAPE2SLOB_VERSION = e01d3e92f0a372ebd0f57390e437a28f9d3c0438 PYTHON_MWSCRAPE2SLOB_SITE = $(call github,itkach,mwscrape2slob,$(PYTHON_MWSCRAPE2SLOB_VERSION)) PYTHON_MWSCRAPE2SLOB_LICENSE = GPL-3.0, Apache-2.0 (MathJax), GPL (MediaWiki monobook style sheet) -PYTHON_MWSCRAPE2SLOB_SETUP_TYPE = distutils +PYTHON_MWSCRAPE2SLOB_SETUP_TYPE = setuptools $(eval $(python-package)) From 2182ae07235b90bd08999a3b070f4186bac9f2a5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:42 +0200 Subject: [PATCH 1492/2890] package/python-pexpect: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pexpect/python-pexpect.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pexpect/python-pexpect.mk b/package/python-pexpect/python-pexpect.mk index 3efda2682580..d230b11338ac 100644 --- a/package/python-pexpect/python-pexpect.mk +++ b/package/python-pexpect/python-pexpect.mk @@ -9,6 +9,6 @@ PYTHON_PEXPECT_SOURCE = pexpect-$(PYTHON_PEXPECT_VERSION).tar.gz PYTHON_PEXPECT_SITE = https://files.pythonhosted.org/packages/e5/9b/ff402e0e930e70467a7178abb7c128709a30dfb22d8777c043e501bc1b10 PYTHON_PEXPECT_LICENSE = ISC PYTHON_PEXPECT_LICENSE_FILES = LICENSE -PYTHON_PEXPECT_SETUP_TYPE = distutils +PYTHON_PEXPECT_SETUP_TYPE = setuptools $(eval $(python-package)) From f902f95e87d9a4bf030a130a7f6d7d9c35fc0ba0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:43 +0200 Subject: [PATCH 1493/2890] package/python-ptyprocess: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-ptyprocess/python-ptyprocess.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-ptyprocess/python-ptyprocess.mk b/package/python-ptyprocess/python-ptyprocess.mk index d077fbb7799b..52660195624c 100644 --- a/package/python-ptyprocess/python-ptyprocess.mk +++ b/package/python-ptyprocess/python-ptyprocess.mk @@ -9,6 +9,6 @@ PYTHON_PTYPROCESS_SITE = https://files.pythonhosted.org/packages/20/e5/16ff212c1 PYTHON_PTYPROCESS_SOURCE = ptyprocess-$(PYTHON_PTYPROCESS_VERSION).tar.gz PYTHON_PTYPROCESS_LICENSE = ISC PYTHON_PTYPROCESS_LICENSE_FILES = LICENSE -PYTHON_PTYPROCESS_SETUP_TYPE = distutils +PYTHON_PTYPROCESS_SETUP_TYPE = setuptools $(eval $(python-package)) From 97688e4258862aa8b602f7ec51ec1bce7391e84c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:44 +0200 Subject: [PATCH 1494/2890] package/python-pyaes: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pyaes/python-pyaes.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pyaes/python-pyaes.mk b/package/python-pyaes/python-pyaes.mk index a738d3c76a05..77ec100058e7 100644 --- a/package/python-pyaes/python-pyaes.mk +++ b/package/python-pyaes/python-pyaes.mk @@ -7,7 +7,7 @@ PYTHON_PYAES_VERSION = 1.6.1 PYTHON_PYAES_SOURCE = pyaes-$(PYTHON_PYAES_VERSION).tar.gz PYTHON_PYAES_SITE = https://files.pythonhosted.org/packages/44/66/2c17bae31c906613795711fc78045c285048168919ace2220daa372c7d72 -PYTHON_PYAES_SETUP_TYPE = distutils +PYTHON_PYAES_SETUP_TYPE = setuptools PYTHON_PYAES_LICENSE = MIT PYTHON_PYAES_LICENSE_FILES = LICENSE.txt From 78ba3e6f2d26cdd488f9f845e1169d46b70f2912 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:45 +0200 Subject: [PATCH 1495/2890] package/python-pyalsa: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pyalsa/python-pyalsa.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pyalsa/python-pyalsa.mk b/package/python-pyalsa/python-pyalsa.mk index cc5e2ec9a05b..1661fe47b49f 100644 --- a/package/python-pyalsa/python-pyalsa.mk +++ b/package/python-pyalsa/python-pyalsa.mk @@ -7,7 +7,7 @@ PYTHON_PYALSA_VERSION = 1.2.7 PYTHON_PYALSA_SOURCE = pyalsa-$(PYTHON_PYALSA_VERSION).tar.bz2 PYTHON_PYALSA_SITE = https://www.alsa-project.org/files/pub/pyalsa -PYTHON_PYALSA_SETUP_TYPE = distutils +PYTHON_PYALSA_SETUP_TYPE = setuptools PYTHON_PYALSA_LICENSE = LGPL-2.1+ PYTHON_PYALSA_DEPENDENCIES = alsa-lib From 8ee5eb587e9bf7e718ec00625ddf7385cad05af1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:46 +0200 Subject: [PATCH 1496/2890] package/python-pyratemp: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pyratemp/python-pyratemp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pyratemp/python-pyratemp.mk b/package/python-pyratemp/python-pyratemp.mk index 055fb3049c13..6429729a7bc0 100644 --- a/package/python-pyratemp/python-pyratemp.mk +++ b/package/python-pyratemp/python-pyratemp.mk @@ -9,6 +9,6 @@ PYTHON_PYRATEMP_SOURCE = pyratemp-$(PYTHON_PYRATEMP_VERSION).tgz PYTHON_PYRATEMP_SITE = https://pypi.python.org/packages/source/p/pyratemp PYTHON_PYRATEMP_LICENSE = MIT PYTHON_PYRATEMP_LICENSE_FILES = LICENSE -PYTHON_PYRATEMP_SETUP_TYPE = distutils +PYTHON_PYRATEMP_SETUP_TYPE = setuptools $(eval $(python-package)) From d3996b49397decd782621330f4009d5c6f0728e0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:47 +0200 Subject: [PATCH 1497/2890] package/python-sdnotify: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-sdnotify/python-sdnotify.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-sdnotify/python-sdnotify.mk b/package/python-sdnotify/python-sdnotify.mk index 1b0f2276dcd3..4e250eee95e5 100644 --- a/package/python-sdnotify/python-sdnotify.mk +++ b/package/python-sdnotify/python-sdnotify.mk @@ -7,7 +7,7 @@ PYTHON_SDNOTIFY_VERSION = 0.3.2 PYTHON_SDNOTIFY_SOURCE = sdnotify-$(PYTHON_SDNOTIFY_VERSION).tar.gz PYTHON_SDNOTIFY_SITE = https://files.pythonhosted.org/packages/ce/d8/9fdc36b2a912bf78106de4b3f0de3891ff8f369e7a6f80be842b8b0b6bd5 -PYTHON_SDNOTIFY_SETUP_TYPE = distutils +PYTHON_SDNOTIFY_SETUP_TYPE = setuptools PYTHON_SDNOTIFY_LICENSE = MIT PYTHON_SDNOTIFY_LICENSE_FILES = LICENSE.txt From 77eba3436d3fbd0aaf0318774b66d30c098edf01 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:48 +0200 Subject: [PATCH 1498/2890] package/python-slob: switch from distutils to setuptools distutils will be dropped with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-slob/python-slob.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-slob/python-slob.mk b/package/python-slob/python-slob.mk index 2db393221624..4a0d1a7e1ca4 100644 --- a/package/python-slob/python-slob.mk +++ b/package/python-slob/python-slob.mk @@ -8,6 +8,6 @@ PYTHON_SLOB_VERSION = 31ad0e769360a5b10a4893f686587bb8e48c3895 PYTHON_SLOB_SITE = $(call github,itkach,slob,$(PYTHON_SLOB_VERSION)) PYTHON_SLOB_LICENSE = GPL-3.0 PYTHON_SLOB_LICENSE_FILES = LICENSE -PYTHON_SLOB_SETUP_TYPE = distutils +PYTHON_SLOB_SETUP_TYPE = setuptools $(eval $(python-package)) From 2bd1d9d812d529071e1ab9d8ed8344f8077286d3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Aug 2023 19:37:49 +0200 Subject: [PATCH 1499/2890] package/python-stack-data: switch from setuptools to pep517 Needed for building with python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-stack-data/python-stack-data.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-stack-data/python-stack-data.mk b/package/python-stack-data/python-stack-data.mk index 494ce8f4546d..1a85938311ec 100644 --- a/package/python-stack-data/python-stack-data.mk +++ b/package/python-stack-data/python-stack-data.mk @@ -7,8 +7,9 @@ PYTHON_STACK_DATA_VERSION = 0.6.2 PYTHON_STACK_DATA_SOURCE = stack_data-$(PYTHON_STACK_DATA_VERSION).tar.gz PYTHON_STACK_DATA_SITE = https://files.pythonhosted.org/packages/db/18/aa7f2b111aeba2cd83503254d9133a912d7f61f459a0c8561858f0d72a56 -PYTHON_STACK_DATA_SETUP_TYPE = setuptools +PYTHON_STACK_DATA_SETUP_TYPE = pep517 PYTHON_STACK_DATA_LICENSE = MIT PYTHON_STACK_DATA_LICENSE_FILES = LICENSE.txt +PYTHON_STACK_DATA_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From aa17849e8ba216022fff15f2fafb669317c4b237 Mon Sep 17 00:00:00 2001 From: Stefan Nickl Date: Mon, 24 Jul 2023 21:16:34 +0200 Subject: [PATCH 1500/2890] package/freescale-imx/firmware-imx: bump version to 8.20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both the COPYING and EULA files have changed, with the following main changes: - update to copyright years (2022 -> 2023) - switch from ASCCI double quotes to fancy Unicode ones ("" -> “”) - reflow the license text - identify new third-parties and their conditions Signed-off-by: Stefan Nickl Signed-off-by: Thomas Petazzoni --- package/freescale-imx/firmware-imx/firmware-imx.hash | 6 +++--- package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash index eb0c387af3cc..0b3561a927ee 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 937e196476b8e95b4b7f2501a14c8326d8a0649f8a3f9228b72373770a08deb3 firmware-imx-8.15.bin -sha256 35188e65dbb9c7da4bbcb77c7726e835607f9f41b8b44149806ea51429ca9a31 COPYING -sha256 30f61825583b4c26d29a798ad7e4c8ef2f2f390b1e964af302d2dc40e93cb0a4 EULA +sha256 f6dc6a5c8fd9b913a15360d3ccd53d188db05a08a8594c518e57622478c72383 firmware-imx-8.20.bin +sha256 913ba38d4be97361c3d0fa9bf2f6dbe7b1c0c41213dd268fb6738db9704dbe32 COPYING +sha256 4fd8bb45a2ec22117d20cfea84370e2a3a2cd99e8e177138bed0938137b1aeb3 EULA sha256 40d02f6d6b4e94d9307529408f372f5a9908cf3d156ec533a4e54274b40f271e SCR.txt diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 4cceb670193d..66ef8c3930be 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = 8.15 +FIRMWARE_IMX_VERSION = 8.20 FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin From b1c4e46c1ebdd2b200fc67acd0b59de238499106 Mon Sep 17 00:00:00 2001 From: Stefan Nickl Date: Mon, 24 Jul 2023 21:16:35 +0200 Subject: [PATCH 1501/2890] package/freescale-imx/imx-seco: bump version to 5.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The COPYING and EULA files have changed, with various changes, mainly: - update to copyright years - switch from ASCCI double quotes to fancy Unicode ones ("" -> “”) - reflow the license text - identify new third-parties and their conditions Signed-off-by: Stefan Nickl Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-seco/imx-seco.hash | 6 +++--- package/freescale-imx/imx-seco/imx-seco.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/imx-seco/imx-seco.hash b/package/freescale-imx/imx-seco/imx-seco.hash index 378c24bc5494..e02e30886f7a 100644 --- a/package/freescale-imx/imx-seco/imx-seco.hash +++ b/package/freescale-imx/imx-seco/imx-seco.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 08cf25a4be6841ca7264a50b29c311b386eae1c02fced8a3b55fd04213acb4bc imx-seco-3.7.5.bin -sha256 72edc2072c86d93aa1993d15d4d19d96270af3749b0108995ad50c81d1461f52 EULA -sha256 9c16421e7c702f56756650b8ac954d34556327e598a8666e6e8f4eb3a1aa95f1 COPYING +sha256 c3bd761f457e939035b01a0ab36e79064a2a1bc6c3cdb3cd847f7f38df0964df imx-seco-5.9.0.bin +sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA +sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk index 987f24658d4b..3788f1e404e5 100644 --- a/package/freescale-imx/imx-seco/imx-seco.mk +++ b/package/freescale-imx/imx-seco/imx-seco.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_SECO_VERSION = 3.7.5 +IMX_SECO_VERSION = 5.9.0 IMX_SECO_SITE = $(FREESCALE_IMX_SITE) IMX_SECO_SOURCE = imx-seco-$(IMX_SECO_VERSION).bin From 89d39912f9520ac542a5936574be434546cf3421 Mon Sep 17 00:00:00 2001 From: Stefan Nickl Date: Mon, 24 Jul 2023 21:16:36 +0200 Subject: [PATCH 1502/2890] package/freescale-imx/imx-sc-firmware: bump version to 1.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The COPYING and EULA files have changed, with the following main changes: - update to copyright years - switch from ASCCI double quotes to fancy Unicode ones ("" -> “”) - reflow the license text - identify new third-parties and their conditions Signed-off-by: Stefan Nickl Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash | 6 +++--- package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash index ed83e757afd8..a5bbe1126879 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 24a647237c0077ce0172563d67fcbc5e8f231bad7cf55a2436848c89579c5a06 imx-sc-firmware-1.8.0.bin -sha256 a07e8df685161553d7e0b78b8b93ebe9086d95bb8635abff0ed3247992181e85 EULA -sha256 4f3cc2dcbe3b7369bd4a51df749f432b69d8189fc2bde88f9fadbec73c686683 COPYING +sha256 1272ac5c31a88017ef548721f3acf930a7eda6ac73aa9f41b5f0cade9d5c0e5f imx-sc-firmware-1.15.0.bin +sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA +sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk index 6a304c0c8c39..3452e8b0ebd6 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_SC_FIRMWARE_VERSION = 1.8.0 +IMX_SC_FIRMWARE_VERSION = 1.15.0 IMX_SC_FIRMWARE_SITE = $(FREESCALE_IMX_SITE) IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION).bin From beb74069ef890a0874e06be98690949492d83f3a Mon Sep 17 00:00:00 2001 From: Stefan Nickl Date: Mon, 24 Jul 2023 21:16:38 +0200 Subject: [PATCH 1503/2890] package/freescale-imx: add BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL This commit adds support for the i.MX8DXL SoC from NXP, by adding a new BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL and propagate its support in the affected packages. Signed-off-by: Stefan Nickl Signed-off-by: Thomas Petazzoni --- board/freescale/common/imx/imx8-bootloader-prepare.sh | 2 ++ board/freescale/common/imx/post-image.sh | 2 ++ package/freescale-imx/Config.in | 7 ++++++- package/freescale-imx/firmware-imx/Config.in | 1 + package/freescale-imx/imx-sc-firmware/Config.in | 3 ++- package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk | 4 ++++ package/freescale-imx/imx-seco/Config.in | 6 ++++-- 7 files changed, 21 insertions(+), 4 deletions(-) diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index ace0f6d6102c..7ebf15b6ffe8 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -63,6 +63,8 @@ main () dd if=${BINARIES_DIR}/u-boot-hash.bin of=${BINARIES_DIR}/u-boot-atf.bin bs=1K seek=128 if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then ${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" ${BR2_CONFIG}; then + ${HOST_DIR}/bin/mkimage_imx8 -soc DXL -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8dxl-evk-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin else ${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin fi diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index d36f82917ecc..c359ef6032a6 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -46,6 +46,8 @@ genimage_type() echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_no_boot_part_spl" diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 13d611b696d6..fe3f265941a8 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -57,6 +57,10 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X bool "imx8x" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL + bool "imx8dxl" + endchoice config BR2_PACKAGE_FREESCALE_IMX_PLATFORM @@ -100,7 +104,8 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL source "package/freescale-imx/imx-alsa-plugins/Config.in" source "package/freescale-imx/imx-codec/Config.in" diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 0c1913e2273e..087ddef8771b 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -34,6 +34,7 @@ config BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME default "imx6" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q default "imx8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 default "imx8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + default "imx8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_HDMI_FW bool diff --git a/package/freescale-imx/imx-sc-firmware/Config.in b/package/freescale-imx/imx-sc-firmware/Config.in index 4932e62dd23f..016f9739bf83 100644 --- a/package/freescale-imx/imx-sc-firmware/Config.in +++ b/package/freescale-imx/imx-sc-firmware/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_IMX_SC_FIRMWARE bool "imx-sc-firmware" depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL help System Control Unit Firmware blobs for the Freescale i.MX8 SoCs. diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk index 3452e8b0ebd6..55b6fb00e33e 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -25,6 +25,10 @@ define IMX_SC_FIRMWARE_INSTALL_IMAGES_CMDS cp $(@D)/mx8qx-mek-scfw-tcm.bin $(BINARIES_DIR)/mx8qx-mek-scfw-tcm.bin cp $(@D)/mx8qx-val-scfw-tcm.bin $(BINARIES_DIR)/mx8qx-val-scfw-tcm.bin endef +else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL),y) +define IMX_SC_FIRMWARE_INSTALL_IMAGES_CMDS + cp $(@D)/mx8dxl-evk-scfw-tcm.bin $(BINARIES_DIR)/ +endef else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y) define IMX_SC_FIRMWARE_INSTALL_IMAGES_CMDS cp $(@D)/mx8qm-*-scfw-tcm.bin $(BINARIES_DIR)/ diff --git a/package/freescale-imx/imx-seco/Config.in b/package/freescale-imx/imx-seco/Config.in index 41f84446511f..7abdd7eb0dd0 100644 --- a/package/freescale-imx/imx-seco/Config.in +++ b/package/freescale-imx/imx-seco/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_IMX_SECO bool "imx-seco" depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL help Firmware file for the i.MX8 and i.MX8X Security Controller. @@ -14,6 +15,7 @@ choice prompt "i.MX Seco Firmware Release" default BR2_PACKAGE_IMX_SECO_MX8QMB0 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 default BR2_PACKAGE_IMX_SECO_MX8QXC0 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + default BR2_PACKAGE_IMX_SECO_MX8DXLB0 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL help Select the appropriate ahab container image to install to match the iMX asics revision. @@ -30,7 +32,7 @@ config BR2_PACKAGE_IMX_SECO_MX8DXLA1 config BR2_PACKAGE_IMX_SECO_MX8DXLB0 bool "imx-seco-mx8dxlb0" - depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL config BR2_PACKAGE_IMX_SECO_MX8QMB0 bool "imx-seco-mx8qmb0" From 03b228fd1a0bcc1905cd62c8f9167facdad2cd5a Mon Sep 17 00:00:00 2001 From: Stefan Nickl Date: Mon, 24 Jul 2023 21:16:37 +0200 Subject: [PATCH 1504/2890] configs/freescale_imx8dxlevk: new defconfig Signed-off-by: Stefan Nickl Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++ board/freescale/imx8dxlevk/readme.txt | 69 ++++++++++++++++++++++++++ configs/freescale_imx8dxlevk_defconfig | 39 +++++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 board/freescale/imx8dxlevk/readme.txt create mode 100644 configs/freescale_imx8dxlevk_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c9117146ea8a..0ae5f89d8819 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2730,6 +2730,10 @@ F: package/libvpx/ F: package/mesa3d-demos/ F: package/ti-gfx/ +N: Stefan Nickl +F: board/freescale/imx8dxlevk/ +F: configs/freescale_imx8dxlevk_defconfig + N: Stefan Ott F: package/unbound/ diff --git a/board/freescale/imx8dxlevk/readme.txt b/board/freescale/imx8dxlevk/readme.txt new file mode 100644 index 000000000000..33ceb6693184 --- /dev/null +++ b/board/freescale/imx8dxlevk/readme.txt @@ -0,0 +1,69 @@ +****************************** +Freescale i.MX8DXL WEVK board +****************************** + +This file documents the Buildroot support for the Freescale i.MX8DXL WEVK +board. + +Build +===== + +First, configure Buildroot for the i.MX8DXL WEVK board: + + make freescale_imx8dxlevk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - ahab-container.img + - bl31.bin + - boot.vfat + - Image + - imx8-boot-sd.bin + - imx8dxl-evk.dtb + - mkimg.commit + - mx8dxl-ddr3-evk-scfw-tcm.bin + - mx8dxl-evk-scfw-tcm.bin + - mx8dxl-phantom-mek-scfw-tcm.bin + - mx8dxl-val-scfw-tcm.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot-atf.bin + - u-boot.bin + - u-boot-hash.bin + +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_imx8. + +Boot the i.MX8DXL WEVK board +============================ + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- Configure the boot switch as follows: +SW1: ON ON OFF OFF +- 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! diff --git a/configs/freescale_imx8dxlevk_defconfig b/configs/freescale_imx8dxlevk_defconfig new file mode 100644 index 000000000000..bf59e6443096 --- /dev/null +++ b/configs/freescale_imx8dxlevk_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_cortex_a35=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8dxl-evk.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.1.22-2.0.0)/linux-imx-lf-6.1.22-2.0.0.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8dxl-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_IMX_SC_FIRMWARE=y +BR2_PACKAGE_IMX_SECO=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.1.22-2.0.0)/imx-atf-lf-6.1.22-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8dxl" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=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,nxp-imx,uboot-imx,lf-6.1.22-2.0.0)/uboot-imx-lf-6.1.22-2.0.0.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8dxl_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y From be08ba35698991ca0f42c7c11c70690caab3e378 Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Wed, 5 Oct 2022 11:10:29 +0200 Subject: [PATCH 1505/2890] package/mpd: fix reversed logic in tcp disable In commit 54b9008d482923131191da75f09966483f4ecac1 ("package/mpd: bump to version 0.21.11"), mpd was migrated from using the autotools build system to the meson build system. As part of this, the BR2_PACKAGE_MPD_TCP was incorrectly modified, leading BR2_PACKAGE_MPD_TCP disabled to actually enable TCP, and BR2_PACKAGE_MPD_TCP enabled to not explicitly enable TCP support. This commit fixes that by handling this option in the common way. Signed-off-by: Andreas Ziegler Signed-off-by: Thomas Petazzoni --- package/mpd/mpd.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index d73072a439be..b599e320e0fb 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -285,8 +285,10 @@ else MPD_CONF_OPTS += -Dsqlite=disabled endif -ifneq ($(BR2_PACKAGE_MPD_TCP),y) +ifeq ($(BR2_PACKAGE_MPD_TCP),y) MPD_CONF_OPTS += -Dtcp=true +else +MPD_CONF_OPTS += -Dtcp=false endif ifeq ($(BR2_PACKAGE_MPD_TREMOR),y) From 876a365ea2a1c48477eabfe3ae600a9d48f1b4ab Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Wed, 5 Oct 2022 11:10:31 +0200 Subject: [PATCH 1506/2890] package/mpd: introduce id3tag feature dependency id3tag is a sub-feature that is needed to extract information from mp3 files. It selects the corresponding library and handles config settings. Two other features need this sub-feature, but handle all library selections themselves and omit enabling the id3tag feature. In consequence, users have to remember to select both mp3 library and id3tag, otherwise the mpd executable will not process mp3 files. Reflect feature dependency in mpd Config.in to make id3tag selection automatic. Signed-off-by: Andreas Ziegler Signed-off-by: Thomas Petazzoni --- package/mpd/Config.in | 4 ++-- package/mpd/mpd.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 8f0af7b2d36b..f350b7e72a5f 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -127,7 +127,7 @@ config BR2_PACKAGE_MPD_LIBSNDFILE config BR2_PACKAGE_MPD_MAD bool "mad" default y - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_LIBMAD help Enable mad input support. @@ -141,7 +141,7 @@ config BR2_PACKAGE_MPD_MODPLUG config BR2_PACKAGE_MPD_MPG123 bool "mpg123" - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_MPG123 help Enable mpg123 input support. diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index b599e320e0fb..0205208946d2 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -190,7 +190,7 @@ MPD_CONF_OPTS += -Dsoxr=disabled endif ifeq ($(BR2_PACKAGE_MPD_MAD),y) -MPD_DEPENDENCIES += libid3tag libmad +MPD_DEPENDENCIES += libmad MPD_CONF_OPTS += -Dmad=enabled else MPD_CONF_OPTS += -Dmad=disabled @@ -204,7 +204,7 @@ MPD_CONF_OPTS += -Dmodplug=disabled endif ifeq ($(BR2_PACKAGE_MPD_MPG123),y) -MPD_DEPENDENCIES += libid3tag mpg123 +MPD_DEPENDENCIES += mpg123 MPD_CONF_OPTS += -Dmpg123=enabled else MPD_CONF_OPTS += -Dmpg123=disabled From 6cdb48a0482a093dcdf73d0d748f5435262515ab Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Sun, 6 Aug 2023 22:08:29 +0200 Subject: [PATCH 1507/2890] package/mpd: ensure expat is enabled when BR2_PACKAGE_MPD_UPNP_NPUPNP=y Just like BR2_PACKAGE_MPD_UPNP_PUPNP needs expat and curl support, BR2_PACKAGE_MPD_UPNP_NPUPNP also needs expat and curl. curl was already selected, but not expat. It didn't cause any visible issue, as BR2_PACKAGE_MPD_UPNP_NPUPNP selects BR2_PACKAGE_LIBNPUPNP, which itself select BR2_PACKAGE_EXPAT. But as mpd directly checks for the availability of expat, it makes sense to also select it directly. Signed-off-by: Andreas Ziegler [Thomas: extracted from a larger patch at https://patchwork.ozlabs.org/project/buildroot/patch/20221005091032.3014-5-br015@umbiko.net/] Signed-off-by: Thomas Petazzoni --- package/mpd/Config.in | 1 + package/mpd/mpd.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index f350b7e72a5f..902a3da77951 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -407,6 +407,7 @@ config BR2_PACKAGE_MPD_UPNP_PUPNP config BR2_PACKAGE_MPD_UPNP_NPUPNP bool "npupnp" + select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBNPUPNP select BR2_PACKAGE_MPD_CURL help diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 0205208946d2..4b737c715c6f 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -312,6 +312,7 @@ MPD_DEPENDENCIES += \ MPD_CONF_OPTS += -Dupnp=pupnp else ifeq ($(BR2_PACKAGE_MPD_UPNP_NPUPNP),y) MPD_DEPENDENCIES += \ + expat \ libnpupnp MPD_CONF_OPTS += -Dupnp=npupnp else ifeq ($(BR2_PACKAGE_MPD_UPNP_DISABLED),y) From 3693462a1f8bd328c1a4f8fb68f00ce9127c31cd Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Sun, 6 Aug 2023 22:11:45 +0200 Subject: [PATCH 1508/2890] package/mpd: handle expat and yajl explicitly mpd's Config.in selects expat and/or yajl depending on which sub-options is enabled, and adds build dependencies, but does not pass -D
                  -

                  Latest release candidate: 2023.08-rc1

                  +

                  Latest release candidate: 2023.08-rc2

                  - +
                  - +
                  -

                  buildroot-2023.08-rc1.tar.gz

                  -

                  PGP signature

                  +

                  buildroot-2023.08-rc2.tar.gz

                  +

                  PGP signature

                  - +
                  - +
                  -

                  buildroot-2023.08-rc1.tar.xz

                  -

                  PGP signature

                  +

                  buildroot-2023.08-rc2.tar.xz

                  +

                  PGP signature

                  diff --git a/docs/website/news.html b/docs/website/news.html index a338b15acffd..8c7cc8a8c260 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

                  News

                    +
                  • +
                    +
                    +
                    +

                    2023.08-rc2 released

                    +

                    20 August 2023

                    +
                    +
                    +

                    2023.08-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

                    + +

                    Head to the downloads page to pick up the + 2023.08-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

                    +
                    +
                    +
                    • +
                  • From ef4eea32261ed3f21af119936a080cb2fc8897fa Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 18 Aug 2023 01:08:41 +0200 Subject: [PATCH 1669/2890] configs/sipeed_maix_{bit, dock}_sdcard_defconfig: fix build with binutils >= 2.38 Backport an upstream patch fixing the build with binutils >= 2.38 for riscv's for Zicsr and Zifencei. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4839060608 https://gitlab.com/buildroot.org/buildroot/-/jobs/4839060605 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...iscv-Fix-build-against-binutils-2.38.patch | 58 +++++++++++++++++++ configs/sipeed_maix_bit_sdcard_defconfig | 1 + configs/sipeed_maix_dock_sdcard_defconfig | 1 + 3 files changed, 60 insertions(+) create mode 100644 board/canaan/k210-soc/patches/uboot/0001-riscv-Fix-build-against-binutils-2.38.patch diff --git a/board/canaan/k210-soc/patches/uboot/0001-riscv-Fix-build-against-binutils-2.38.patch b/board/canaan/k210-soc/patches/uboot/0001-riscv-Fix-build-against-binutils-2.38.patch new file mode 100644 index 000000000000..52b496f05475 --- /dev/null +++ b/board/canaan/k210-soc/patches/uboot/0001-riscv-Fix-build-against-binutils-2.38.patch @@ -0,0 +1,58 @@ +From 0cf11f3c0478f4286adcfb09bf9137f8b00212e3 Mon Sep 17 00:00:00 2001 +From: Alexandre Ghiti +Date: Mon, 3 Oct 2022 18:07:54 +0200 +Subject: [PATCH] riscv: Fix build against binutils 2.38 + +The following description is copied from the equivalent patch for the +Linux Kernel proposed by Aurelien Jarno: + +>From version 2.38, binutils default to ISA spec version 20191213. This +means that the csr read/write (csrr*/csrw*) instructions and fence.i +instruction has separated from the `I` extension, become two standalone +extensions: Zicsr and Zifencei. As the kernel uses those instruction, +this causes the following build failure: + +arch/riscv/cpu/mtrap.S: Assembler messages: +arch/riscv/cpu/mtrap.S:65: Error: unrecognized opcode `csrr a0,scause' +arch/riscv/cpu/mtrap.S:66: Error: unrecognized opcode `csrr a1,sepc' +arch/riscv/cpu/mtrap.S:67: Error: unrecognized opcode `csrr a2,stval' +arch/riscv/cpu/mtrap.S:70: Error: unrecognized opcode `csrw sepc,a0' + +Signed-off-by: Alexandre Ghiti +Reviewed-by: Bin Meng +Tested-by: Heinrich Schuchardt +Tested-by: Heiko Stuebner +Tested-by: Christian Stewart +Reviewed-by: Rick Chen +(cherry picked from commit 1dde977518f13824b847e23275001191139bc384) +Upstream: https://gitlab.com/u-boot/u-boot/-/commit/1dde977518f13824b847e23275001191139bc384 +Signed-off-by: Romain Naour +--- + arch/riscv/Makefile | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 0b80eb8d864..53d1194ffb6 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y) + CMODEL = medany + endif + +-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \ ++RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C) ++ ++# Newer binutils versions default to ISA spec version 20191213 which moves some ++# instructions from the I extension to the Zicsr and Zifencei extensions. ++toolchain-need-zicsr-zifencei := $(call cc-option-yn, -mabi=$(ABI) -march=$(RISCV_MARCH)_zicsr_zifencei) ++ifeq ($(toolchain-need-zicsr-zifencei),y) ++ RISCV_MARCH := $(RISCV_MARCH)_zicsr_zifencei ++endif ++ ++ARCH_FLAGS = -march=$(RISCV_MARCH) -mabi=$(ABI) \ + -mcmodel=$(CMODEL) + + PLATFORM_CPPFLAGS += $(ARCH_FLAGS) +-- +2.41.0 + diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig index 34769eeca847..0cfff2633764 100644 --- a/configs/sipeed_maix_bit_sdcard_defconfig +++ b/configs/sipeed_maix_bit_sdcard_defconfig @@ -17,6 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y BR2_BINFMT_FLAT=y BR2_BINFMT_FLAT_ONE=y # BR2_TARGET_ENABLE_ROOT_LOGIN is not set +BR2_GLOBAL_PATCH_DIR="board/canaan/k210-soc/patches" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig index 62f6a0e0b847..db075360cc09 100644 --- a/configs/sipeed_maix_dock_sdcard_defconfig +++ b/configs/sipeed_maix_dock_sdcard_defconfig @@ -17,6 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y BR2_BINFMT_FLAT=y BR2_BINFMT_FLAT_ONE=y # BR2_TARGET_ENABLE_ROOT_LOGIN is not set +BR2_GLOBAL_PATCH_DIR="board/canaan/k210-soc/patches" # Kernel BR2_LINUX_KERNEL=y From b661f635b5cc08ded6ab14c19f2370c9f478e52e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 18 Aug 2023 01:08:42 +0200 Subject: [PATCH 1670/2890] configs/pc_x86_64_{bios, efi}_defconfig: add midding libelf kernel dependency objtool built by the kernel requires libelf ldd output/build/linux-6.1.24/tools/objtool/objtool linux-vdso.so.1 libelf.so.1 => output/host/lib/libelf.so.1 While updating the kernel [1] we forgot to select BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF to provide Buildroot's host-libelf. Using host-libelf avoid linking with libelf installed on the host or failing to build objtool if libelf is not installed. [1] d45538f2e7acc1b330b191d559a81e8c1a961648 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4889436869 https://gitlab.com/buildroot.org/buildroot/-/jobs/4889436872 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/pc_x86_64_bios_defconfig | 1 + configs/pc_x86_64_efi_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig index a057ddd2598d..6032544d2d41 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -32,6 +32,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # Firmware BR2_PACKAGE_LINUX_FIRMWARE=y diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index efa603f0c009..afb652f3fc1c 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -33,6 +33,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # Firmware BR2_PACKAGE_LINUX_FIRMWARE=y From 486a3ba4c3a78668eee1dd4f4b312a75a1b029c5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 18 Aug 2023 01:08:43 +0200 Subject: [PATCH 1671/2890] configs/ci20_defconfig: bump to kernel 5.4.254 Bump the kernel to the latest release of 5.4 kernel series to fix an issue with gcc 12. arch/mips/jz4740/setup.c: In function 'plat_mem_setup': arch/mips/jz4740/setup.c:64:25: error: comparison between two arrays [-Werror=array-compare] 64 | if (__dtb_start != __dtb_end) | ^~ arch/mips/jz4740/setup.c:64:25: note: use '&__dtb_start[0] != &__dtb_end[0]' to compare the addresses CC fs/debugfs/file.o cc1: all warnings being treated as errors Fixed in v5.4.195: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a60def7568216684f62b117c199429c4a9a89570 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4889436573 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/ci20_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index 09eddc4e68ab..7e119376e153 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci20/genimage.cfg" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.254" BR2_LINUX_KERNEL_DEFCONFIG="ci20" BR2_LINUX_KERNEL_INSTALL_TARGET=y From 27bf08e4addb78d30fb68992e35c5d8335d4e7c6 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 18 Aug 2023 01:08:44 +0200 Subject: [PATCH 1672/2890] configs/avenger96_defconfig: bump ATF version to 2.9 for binutils 2.39+ support This new binutils version break the ATF build due to new linker warnings: ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions From [1] "Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces of a new warning when linking the bl*.elf in the form: ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions These new warnings are enbaled by default to secure elf binaries: - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 " Bump the ATF custom version to 2.9 for binutils 2.39+ support. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4889436283 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/avenger96_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 1f8e7a50d1e7..adfd7585c40f 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb" BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y From a78241af67cc3c6f26d5f82f9504bd15506df0b5 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 20 Aug 2023 13:35:27 +0200 Subject: [PATCH 1673/2890] package/perftest: bump to version 23.07.0-0.27 For change log, see: https://github.com/linux-rdma/perftest/releases/tag/23.07.0-0.27 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/perftest/perftest.hash | 2 +- package/perftest/perftest.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/perftest/perftest.hash b/package/perftest/perftest.hash index a9ea10ef4443..e771d4f46345 100644 --- a/package/perftest/perftest.hash +++ b/package/perftest/perftest.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c76f0fd5524a3486c335897357c596d0a6d4f82680f93fc1bc7120670fabd5f9 perftest-23.04.0-0.23.tar.gz +sha256 c5b437734b7f9d31dac0b044cd8510b5580eb932080871b470aeae7309884d3b perftest-23.07.0-0.27.tar.gz sha256 763adb7d5094f2127b026adea8701f042d28d4b1f6fb8b6e828989227a9cf7f5 COPYING diff --git a/package/perftest/perftest.mk b/package/perftest/perftest.mk index 7101e318aabb..d3259face547 100644 --- a/package/perftest/perftest.mk +++ b/package/perftest/perftest.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERFTEST_VERSION = 23.04.0-0.23 +PERFTEST_VERSION = 23.07.0-0.27 PERFTEST_SITE = $(call github,linux-rdma,perftest,$(PERFTEST_VERSION)) PERFTEST_LICENSE = GPL-2.0 or BSD-2-Clause PERFTEST_LICENSE_FILES = COPYING From 8f1418b5dd80809dc90196d967d8d9665b794c8e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 20 Aug 2023 16:56:59 +0200 Subject: [PATCH 1674/2890] package/gnupg2: bump to version 2.4.3 See release announce: https://lists.gnupg.org/pipermail/gnupg-announce/2023q3/000480.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnupg2/gnupg2.hash | 4 ++-- package/gnupg2/gnupg2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index aa71881f419b..4b770fa520d4 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 3efd495a94dc81fd0ea8788bef6c69d1f13cedd7 gnupg-2.4.2.tar.bz2 -sha256 97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49 gnupg-2.4.2.tar.bz2 +sha1 79a60c8e415e3daaa33d0546398174252a56f7ac gnupg-2.4.3.tar.bz2 +sha256 a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d gnupg-2.4.3.tar.bz2 # Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 760af3b05e3c..d21c1e242d47 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.2 +GNUPG2_VERSION = 2.4.3 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From 90031397ed65078e88145397ec434b6574ff3459 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 20 Aug 2023 11:58:21 +0200 Subject: [PATCH 1675/2890] package/opencsd: bump to version 1.4.1 For change log, see: https://github.com/Linaro/OpenCSD/blob/v1.4.1/README.md?plain=1#L294 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/opencsd/opencsd.hash | 2 +- package/opencsd/opencsd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opencsd/opencsd.hash b/package/opencsd/opencsd.hash index 84a762fb36d9..a3534976b515 100644 --- a/package/opencsd/opencsd.hash +++ b/package/opencsd/opencsd.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 e1bb6d8d09e87974cb5ca6db2a13b0e1ba9e51117ca2ed71879df07ff7af4de2 opencsd-1.4.0.tar.gz +sha256 159a611535fd7d3bf179bcbdab3791852c6e7199401a6e59cdeef3ba2072edc4 opencsd-1.4.1.tar.gz sha256 980eef4b0744e63834e3ec0d50c2a4ff6d81d7ec62dd8ba8c66acae0ec5a2e88 LICENSE diff --git a/package/opencsd/opencsd.mk b/package/opencsd/opencsd.mk index 680364d01de9..76135bf0b00d 100644 --- a/package/opencsd/opencsd.mk +++ b/package/opencsd/opencsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCSD_VERSION = 1.4.0 +OPENCSD_VERSION = 1.4.1 OPENCSD_SITE = $(call github,Linaro,OpenCSD,v$(OPENCSD_VERSION)) OPENCSD_LICENSE = BSD-3-Clause OPENCSD_LICENSE_FILES = LICENSE From 57ff5f7d2a9d2cf49e76a0c1e874fc1698eb7778 Mon Sep 17 00:00:00 2001 From: Maksim Kiselev Date: Sun, 20 Aug 2023 12:58:33 +0300 Subject: [PATCH 1676/2890] package/ledmon: new package Enclosure LED Utilities ledmon and ledctl are userspace tools designed to control storage enclosure LEDs. The user must have root privileges to use these tools. These tools use the SGPIO and SES-2 protocols to monitor and control LEDs. They been verified to work with Intel(R) storage controllers (i.e. the Intel(R) AHCI controller) and have not been tested with storage controllers of other vendors (especially SAS/SCSI controllers). For backplane enclosures attached to ISCI controllers, support is limited to Intel(R) Intelligent Backplanes. Signed-off-by: Maksim Kiselev Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 + package/Config.in | 1 + ...nstandard-on_exit-function-by-atexit.patch | 223 ++++++++++++++++++ ...-Fix-unknown-type-name-ssize_t-error.patch | 44 ++++ .../ledmon/0003-Add-disable-doc-option.patch | 63 +++++ package/ledmon/Config.in | 15 ++ package/ledmon/ledmon.hash | 3 + package/ledmon/ledmon.mk | 19 ++ 8 files changed, 371 insertions(+) create mode 100644 package/ledmon/0001-Replace-nonstandard-on_exit-function-by-atexit.patch create mode 100644 package/ledmon/0002-Fix-unknown-type-name-ssize_t-error.patch create mode 100644 package/ledmon/0003-Add-disable-doc-option.patch create mode 100644 package/ledmon/Config.in create mode 100644 package/ledmon/ledmon.hash create mode 100644 package/ledmon/ledmon.mk diff --git a/DEVELOPERS b/DEVELOPERS index 705aae95010b..10a16b03c569 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2123,6 +2123,9 @@ F: package/python-txaio/ F: package/python-ujson/ F: package/python-wsaccel/ +N: Maksim Kiselev +F: package/ledmon/ + N: Max Filippov F: arch/Config.in.xtensa diff --git a/package/Config.in b/package/Config.in index 15b186663013..0378566305f7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -527,6 +527,7 @@ endmenu source "package/iucode-tool/Config.in" source "package/kbd/Config.in" source "package/lcdproc/Config.in" + source "package/ledmon/Config.in" source "package/libiec61850/Config.in" source "package/libmanette/Config.in" source "package/libubootenv/Config.in" diff --git a/package/ledmon/0001-Replace-nonstandard-on_exit-function-by-atexit.patch b/package/ledmon/0001-Replace-nonstandard-on_exit-function-by-atexit.patch new file mode 100644 index 000000000000..7a89c3f1a429 --- /dev/null +++ b/package/ledmon/0001-Replace-nonstandard-on_exit-function-by-atexit.patch @@ -0,0 +1,223 @@ +From e57ad4c71cce734de7f8aa75e84fce97bc148c2b Mon Sep 17 00:00:00 2001 +From: Maksim Kiselev +Date: Mon, 15 May 2023 14:46:56 +0300 +Subject: [PATCH] Replace nonstandard on_exit() function by atexit() + +on_exit() is not portable and not available on the C libraries musl +and uClibc. + +So let's replace it with standard atexit() function. + +Upstream: https://github.com/intel/ledmon/pull/139 + +Signed-off-by: Maksim Kiselev +--- + src/ledctl.c | 12 ++++------- + src/ledmon.c | 59 +++++++++++++++++++++++++++------------------------- + 2 files changed, 35 insertions(+), 36 deletions(-) + +diff --git a/src/ledctl.c b/src/ledctl.c +index 7a89a24..10fd57a 100644 +--- a/src/ledctl.c ++++ b/src/ledctl.c +@@ -214,15 +214,11 @@ static void ibpi_state_fini(struct ibpi_state *p) + * + * This is internal function of ledctl utility. The function cleans up a memory + * allocated for the application and closes all opened handles. This function is +- * design to be registered as on_exit() handler function. +- * +- * @param[in] status exit status of the ledctl application. +- * @param[in] ignored function ignores this argument. ++ * design to be registered as atexit() handler function. + * + * @return The function does not return a value. + */ +-static void _ledctl_fini(int status __attribute__ ((unused)), +- void *ignore __attribute__ ((unused))) ++static void _ledctl_fini(void) + { + sysfs_reset(); + list_erase(&ibpi_list); +@@ -948,7 +944,7 @@ static char *ledctl_strstatus(ledctl_status_code_t s) + * @brief Application's entry point. + * + * This is the entry point of ledctl utility. This function does all the work. +- * It allocates and initializes all used structures. Registers on_exit() ++ * It allocates and initializes all used structures. Registers atexit() + * handlers. + * Then the function parses command line options and commands given and scans + * sysfs tree for controllers, block devices and RAID devices. If no error is +@@ -983,7 +979,7 @@ int main(int argc, char *argv[]) + status = _init_ledctl_conf(); + if (status != LEDCTL_STATUS_SUCCESS) + return status; +- if (on_exit(_ledctl_fini, progname)) ++ if (atexit(_ledctl_fini)) + exit(LEDCTL_STATUS_ONEXIT_ERROR); + slot_request_init(&slot_req); + status = _cmdline_parse(argc, argv, &slot_req); +diff --git a/src/ledmon.c b/src/ledmon.c +index 6f52fd6..1329295 100644 +--- a/src/ledmon.c ++++ b/src/ledmon.c +@@ -57,6 +57,19 @@ + #include "utils.h" + #include "vmdssd.h" + ++/** ++ * This macro is the alternative way to get exit status ++ * in atexit() callback function ++ */ ++#define EXIT(x) ((exit)(exit_status = (x))) ++ ++static int exit_status; ++ ++/** ++ * Flag to print exit status ++ */ ++static int ignore; ++ + /** + * @brief List of active block devices. + * +@@ -151,20 +164,16 @@ static int possible_params_size = ARRAY_SIZE(possible_params); + * + * This is internal function of monitor service. It is used to finalize daemon + * process i.e. free allocated memory, unlock and remove pidfile and close log +- * file and syslog. The function is registered as on_exit() handler. +- * +- * @param[in] status The function ignores this parameter. +- * @param[in] program_name The name of the binary file. This argument +- * is passed via on_exit() function. ++ * file and syslog. The function is registered as atexit() handler. + * + * @return The function does not return a value. + */ +-static void _ledmon_fini(int __attribute__ ((unused)) status, void *program_name) ++static void _ledmon_fini(void) + { + sysfs_reset(); + list_erase(&ledmon_block_list); + log_close(); +- pidfile_remove(program_name); ++ pidfile_remove(progname); + } + + typedef enum { +@@ -207,30 +216,25 @@ static char *ledmon_strstatus(ledmon_status_code_t s) + * + * This is internal function of monitor service. It is used to report an exit + * status of the monitor service. The message is logged in to syslog and to log +- * file. The function is registered as on_exit() hander. +- * +- * @param[in] status Status given in the last call to exit() +- * function. +- * @param[in] arg Argument passed to on_exit(). ++ * file. The function is registered as atexit() handler. + * + * @return The function does not return a value. + */ +-static void _ledmon_status(int status, void *arg) ++static void _ledmon_status(void) + { + int log_level; + char message[4096]; +- int ignore = *((int *)arg); + + if (ignore) + return; + +- if (status == LEDMON_STATUS_SUCCESS) ++ if (exit_status == LEDMON_STATUS_SUCCESS) + log_level = LOG_LEVEL_INFO; + else + log_level = LOG_LEVEL_ERROR; + + snprintf(message, sizeof(message), "exit status is %s.", +- ledmon_strstatus(status)); ++ ledmon_strstatus(exit_status)); + + if (get_log_fd() >= 0) + _log(log_level, message); +@@ -364,10 +368,10 @@ static ledmon_status_code_t _cmdline_parse_non_daemonise(int argc, char *argv[]) + break; + case 'h': + _ledmon_help(); +- exit(EXIT_SUCCESS); ++ EXIT(EXIT_SUCCESS); + case 'v': + _ledmon_version(); +- exit(EXIT_SUCCESS); ++ EXIT(EXIT_SUCCESS); + case ':': + case '?': + return LEDMON_STATUS_CMDLINE_ERROR; +@@ -890,14 +894,13 @@ static void _close_parent_fds(void) + int main(int argc, char *argv[]) + { + ledmon_status_code_t status = LEDMON_STATUS_SUCCESS; +- static int ignore; + + setup_options(&longopt, &shortopt, possible_params, + possible_params_size); + set_invocation_name(argv[0]); + openlog(progname, LOG_PID | LOG_PERROR, LOG_DAEMON); + +- if (on_exit(_ledmon_status, &ignore)) ++ if (atexit(_ledmon_status)) + return LEDMON_STATUS_ONEXIT_ERROR; + + if (_cmdline_parse_non_daemonise(argc, argv) != LEDMON_STATUS_SUCCESS) +@@ -935,18 +938,18 @@ int main(int argc, char *argv[]) + + if (pid < 0) { + log_debug("main(): fork() failed (errno=%d).", errno); +- exit(EXIT_FAILURE); ++ EXIT(EXIT_FAILURE); + } + if (pid > 0) { + ignore = 1; /* parent: don't print exit status */ +- exit(EXIT_SUCCESS); ++ EXIT(EXIT_SUCCESS); + } + + pid_t sid = setsid(); + + if (sid < 0) { + log_debug("main(): setsid() failed (errno=%d).", errno); +- exit(EXIT_FAILURE); ++ EXIT(EXIT_FAILURE); + } + + _close_parent_fds(); +@@ -960,16 +963,16 @@ int main(int argc, char *argv[]) + + if (chdir("/") < 0) { + log_debug("main(): chdir() failed (errno=%d).", errno); +- exit(EXIT_FAILURE); ++ EXIT(EXIT_FAILURE); + } + if (pidfile_create(progname)) { + log_debug("main(): pidfile_creat() failed."); +- exit(EXIT_FAILURE); ++ EXIT(EXIT_FAILURE); + } + _ledmon_setup_signals(); + +- if (on_exit(_ledmon_fini, progname)) +- exit(LEDMON_STATUS_ONEXIT_ERROR); ++ if (atexit(_ledmon_fini)) ++ EXIT(LEDMON_STATUS_ONEXIT_ERROR); + list_init(&ledmon_block_list, (item_free_t)block_device_fini); + sysfs_init(); + log_info("monitor service has been started..."); +@@ -987,5 +990,5 @@ int main(int argc, char *argv[]) + } + ledmon_remove_shared_conf(); + stop_udev_monitor(); +- exit(EXIT_SUCCESS); ++ EXIT(EXIT_SUCCESS); + } +-- +2.39.2 + diff --git a/package/ledmon/0002-Fix-unknown-type-name-ssize_t-error.patch b/package/ledmon/0002-Fix-unknown-type-name-ssize_t-error.patch new file mode 100644 index 000000000000..4aeadbbbf8d1 --- /dev/null +++ b/package/ledmon/0002-Fix-unknown-type-name-ssize_t-error.patch @@ -0,0 +1,44 @@ +From b9f454cd29b6b5a0927b3c1e98807d54ffacd73e Mon Sep 17 00:00:00 2001 +From: Maksim Kiselev +Date: Mon, 15 May 2023 19:29:45 +0300 +Subject: [PATCH] Fix unknown type name ‘ssize_t’ error + +This error occurs for builds with musl libc. +Move include to utils header to +resolve this issue. + +Upstream: https://github.com/intel/ledmon/pull/139 + +Signed-off-by: Maksim Kiselev +--- + src/utils.c | 1 - + src/utils.h | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/utils.c b/src/utils.c +index 86b9593..0b83d5a 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -33,7 +33,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/src/utils.h b/src/utils.h +index 5d590b9..d02da8f 100644 +--- a/src/utils.h ++++ b/src/utils.h +@@ -22,6 +22,7 @@ + #define _UTILS_H_INCLUDED_ + + #include ++#include + #include "config_file.h" + #include "stdlib.h" + #include "stdint.h" +-- +2.39.2 + diff --git a/package/ledmon/0003-Add-disable-doc-option.patch b/package/ledmon/0003-Add-disable-doc-option.patch new file mode 100644 index 000000000000..ab7a242289e8 --- /dev/null +++ b/package/ledmon/0003-Add-disable-doc-option.patch @@ -0,0 +1,63 @@ +From 141628519d227b59be3977b16ebaab0feb22b295 Mon Sep 17 00:00:00 2001 +From: Maksim Kiselev +Date: Sun, 20 Aug 2023 11:35:57 +0300 +Subject: [PATCH] Add '--disable-doc' option + +Introduce a configure option to disable documentation installation +in case if it is not required. + +Upstream: https://github.com/intel/ledmon/pull/154 + +Signed-off-by: Maksim Kiselev +--- + Makefile.am | 8 ++++++-- + configure.ac | 11 ++++++++++- + 2 files changed, 16 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ddcd200..644a8d2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,6 +20,10 @@ if SYSTEMD_CONDITION + OPTIONAL_SUBDIR = systemd + endif + +-SUBDIRS = doc src $(OPTIONAL_SUBDIR) ++if WITH_DOC ++ DOC_SUBDIR = doc ++ dist_doc_DATA = README.md ++endif ++ ++SUBDIRS = src $(DOC_SUBDIR) $(OPTIONAL_SUBDIR) + EXTRA_DIST = config/config.h systemd/ledmon.service.in +-dist_doc_DATA = README.md +diff --git a/configure.ac b/configure.ac +index 05baa62..114957f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -74,6 +74,15 @@ AM_CONDITIONAL([SYSTEMD_CONDITION], [test "$SYSTEMD_STR" = yes]) + # target directory for ledmon service file + AC_SUBST([SYSTEMD_PATH], "$(pkg-config systemd --variable=systemdsystemunitdir)") + ++# Add configure option to disable documentation building ++AC_ARG_ENABLE([doc], ++ [AS_HELP_STRING([--disable-doc], ++ [do not install ledmon documentaion])], ++ [with_doc=${enableval}], ++ [with_doc=yes]) ++ ++AM_CONDITIONAL([WITH_DOC], [test "x$with_doc" = "xyes"]) ++ + AC_CONFIG_FILES([Makefile + doc/Makefile + src/Makefile +@@ -86,5 +95,5 @@ $PACKAGE_NAME $VERSION configuration: + Preprocessor flags: ${AM_CPPFLAGS} ${CPPFLAGS} + C compiler flags: ${AM_CFLAGS} ${CFLAGS} + Common install location: ${prefix} +- configure parameters: --enable-systemd=${SYSTEMD_STR} ++ configure parameters: --enable-systemd=${SYSTEMD_STR} --enable-doc=${with_doc} + ]) +-- +2.39.2 + diff --git a/package/ledmon/Config.in b/package/ledmon/Config.in new file mode 100644 index 000000000000..d08be715c3ea --- /dev/null +++ b/package/ledmon/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LEDMON + bool "ledmon" + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HAS_THREADS # sg3_utils + select BR2_PACKAGE_PCIUTILS + select BR2_PACKAGE_SG3_UTILS + help + Enclosure LED Utilities. The ledmon application is + a daemon process used to monitor a state of software + RAID devices (md only) or a state of block devices. + + https://github.com/intel/ledmon + +comment "ledmon needs udev and a toolchain w/ threads" + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ledmon/ledmon.hash b/package/ledmon/ledmon.hash new file mode 100644 index 000000000000..dfc5d742426d --- /dev/null +++ b/package/ledmon/ledmon.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 40ee7e462b78c77468cc2ef356a06c5b6db44747d596dc11532f7b6f378d2d4b ledmon-0.97.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/ledmon/ledmon.mk b/package/ledmon/ledmon.mk new file mode 100644 index 000000000000..473d0de7a32e --- /dev/null +++ b/package/ledmon/ledmon.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# ledmon +# +################################################################################ + +LEDMON_VERSION = 0.97 +LEDMON_SITE = $(call github,intel,ledmon,v$(LEDMON_VERSION)) +LEDMON_DEPENDENCIES = host-pkgconf pciutils sg3_utils udev +# The code base also include a COPYING.LIB file with the LGPL-2.1 text, +# and some source files are published under LGPL-2.1, but all of them are +# at some point linked with GPL-2.0 code, making the resulting binaries +# GPL-2.0 licensed +LEDMON_LICENSE = GPL-2.0 +LEDMON_LICENSE_FILES = COPYING +# 0002-Fix-unknown-type-name-ssize_t-error.patch +LEDMON_AUTORECONF = YES + +$(eval $(autotools-package)) From 2298de68530283f329147f0da9c5acd039ff561c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 21 Aug 2023 11:17:49 +0200 Subject: [PATCH 1677/2890] package/file: bump version to 5.45 Patch is included upstream. See here for Changes in 5.45: https://mailman.astron.com/pipermail/file/2023-July/001205.html See here for Changes in 5.44: https://mailman.astron.com/pipermail/file/2022-December/001042.html The hash of src/vasprintf.c, which is used as one of the license files, has been updated due to source code changes that do not affect the licensing terms. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...ile.c-fix-build-without-wide-support.patch | 39 ------------------- package/file/file.hash | 6 +-- package/file/file.mk | 2 +- 4 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 package/file/0001-src-file.c-fix-build-without-wide-support.patch diff --git a/.checkpackageignore b/.checkpackageignore index e4a60e7aef0c..09562431438f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -449,7 +449,6 @@ package/ffmpeg/0003-libavutil-Fix-mips-build.patch Upstream package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch Upstream package/ficl/0001-fix-Makefile.patch Upstream package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch Upstream -package/file/0001-src-file.c-fix-build-without-wide-support.patch Upstream package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch Upstream package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch Upstream package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch Upstream diff --git a/package/file/0001-src-file.c-fix-build-without-wide-support.patch b/package/file/0001-src-file.c-fix-build-without-wide-support.patch deleted file mode 100644 index 29be9fa2cd10..000000000000 --- a/package/file/0001-src-file.c-fix-build-without-wide-support.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f2ab09d0e1388657f6b7e62bacc383ebea91f5b9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 26 Oct 2022 00:23:32 +0200 -Subject: [PATCH] src/file.c: fix build without wide support - -Fix the following build failure without wide support (e.g. on uclibc) -raised since version 5.43 and -https://github.com/file/file/commit/c80065fe6900be5e794941e29b32440e9969b1c3: - -file.c: In function 'fname_print': -file.c:605:10: error: macro "putc" requires 2 arguments, but only 1 given - 605 | putc(c); - | ^ - -Fixes: - - http://autobuild.buildroot.org/results/7ff1dd9f79408d2e6286c005302b6f3c505ab259 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://bugs.astron.com/view.php?id=398] ---- - src/file.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/file.c b/src/file.c -index f5f46524..1c23defc 100644 ---- a/src/file.c -+++ b/src/file.c -@@ -615,7 +615,7 @@ fname_print(const char *inname) - for (i = 0; i < n; i++) { - unsigned char c = CAST(unsigned char, inname[i]); - if (isprint(c)) { -- putc(c); -+ putc(c, stdout); - continue; - } - file_octal(c); --- -2.35.1 - diff --git a/package/file/file.hash b/package/file/file.hash index 49fa9e1e1baa..08e8497471a5 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,7 +1,7 @@ # Locally calculated after verifying signature -# ftp://ftp.astron.com/pub/file/file-5.43.tar.gz.asc +# ftp://ftp.astron.com/pub/file/file-5.45.tar.gz.asc # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A -sha256 8c8015e91ae0e8d0321d94c78239892ef9dbc70c4ade0008c0e95894abfb1991 file-5.43.tar.gz +sha256 fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82 file-5.45.tar.gz sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h -sha256 cc3d8704489d08eaefcaee8c639cc6436c6f0f6b2b03986d3ba7521a1a1d2fc9 src/vasprintf.c +sha256 2e14b6fa9a74f952ebfde3c96527158df281c953cfaf35609eb854d4da30131c src/vasprintf.c diff --git a/package/file/file.mk b/package/file/file.mk index 9b751e269604..5fc540bc9dc1 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.43 +FILE_VERSION = 5.45 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c From 171977f4bf63a9a11da8c1b9b24269c6d73dd8c3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 17 Aug 2023 21:14:13 +0200 Subject: [PATCH 1678/2890] package/libks: bump version to 2.0.2 Updated license hash due to copyright year bump: https://github.com/signalwire/libks/commit/52a3f2a54663d7bb50a498153975d4dfe1f8fe63 Needed for freeswitch bump to 1.10.10: https://github.com/signalwire/freeswitch/commit/7c1faeff48aef815b4cc5f22eb9ead52726dbd95 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libks/libks.hash | 4 ++-- package/libks/libks.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libks/libks.hash b/package/libks/libks.hash index 998811bc90f9..f66798699f54 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c677c36a0d8ceca2e53e07d1de66b87045ac2784df458d012557e2432692528b libks-1.8.3.tar.gz -sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright +sha256 af94f9fcdb2022b8f09187309ac2d372a5a4cc639af77cd4375f2d5c88b4fd63 libks-2.0.2.tar.gz +sha256 3aba376a08bf91c95518532e627157f0ee3ab2712d1198463e2b1ac9186dd142 copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index b17812619d46..c8bcb3096114 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.3 +LIBKS_VERSION = 2.0.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From b9a864d03d66b1132f484060f3724182f51cdfbc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 17 Aug 2023 21:14:14 +0200 Subject: [PATCH 1679/2890] package/freeswitch: security bump version to 1.10.10 Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.10 "This is a major release containing critical security fixes, adding Debian 12 Bookworm, OpenSSL 3 and FFmpeg5 support." Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/freeswitch/freeswitch.hash | 4 ++-- package/freeswitch/freeswitch.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 3497a3283f04..504be1209003 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,5 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 -sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.10.-release.tar.xz.sha256 +sha256 d2c702c7f4bd6eca539c3981cf859ad5c1846d9283829e24cd75686f2322b9df freeswitch-1.10.10.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 7497cc496499..07d436cf0bd7 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.9 +FREESWITCH_VERSION = 1.10.10 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging From 80b56887006cfba50833881dc31f045d494af185 Mon Sep 17 00:00:00 2001 From: Jesse Taube Date: Fri, 18 Aug 2023 22:16:23 -0400 Subject: [PATCH 1680/2890] package/busybox: use minimal.config for no MMU By default, when Busybox is enabled, it uses the package/busybox/busybox.config configuration file, even on noMMU configurations. As this default configuration enables the 'ash' shell which isn't available for noMMU targets, Busybox falls back to enabling the 'hush' shell, but without enabling a number of its sub-options that are quite relevant. In particular, it doesn't enable umask, which is used in our startup scripts. In order to have a default configuration that is more sensible, this commit changes the Busybox package to use package/busybox/busybox-minimal.config by default for noMMU configurations. Signed-off-by: Jesse Taube Signed-off-by: Thomas Petazzoni --- package/busybox/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/busybox/Config.in b/package/busybox/Config.in index 5e5c5867621a..3c2aa515f845 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -13,6 +13,7 @@ if BR2_PACKAGE_BUSYBOX config BR2_PACKAGE_BUSYBOX_CONFIG string "BusyBox configuration file to use?" + default "package/busybox/busybox-minimal.config" if !BR2_USE_MMU default "package/busybox/busybox.config" help Some people may wish to use their own modified BusyBox From 875ab7d9e3d32990cd07fbab3c68f31dfa9927a4 Mon Sep 17 00:00:00 2001 From: Jamie Gibbons Date: Mon, 21 Aug 2023 12:30:33 +0100 Subject: [PATCH 1681/2890] board/microchip/mpfs_icicle: update post-image script The hss-payload-generator cannot find where u-boot.bin is when looking for it using the config.yaml. Update syntax issues and working directories. Fix the post image script to allow an image to get built. Signed-off-by: Jamie Gibbons Signed-off-by: Thomas Petazzoni --- board/microchip/mpfs_icicle/post-image.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/board/microchip/mpfs_icicle/post-image.sh b/board/microchip/mpfs_icicle/post-image.sh index 04b34bbd4092..596bb21d78d4 100755 --- a/board/microchip/mpfs_icicle/post-image.sh +++ b/board/microchip/mpfs_icicle/post-image.sh @@ -1,8 +1,13 @@ -#!/bin/sh -HSS_PAYLOAD_GENERATOR=${HOST_DIR}/bin/hss-payload-generator -MKIMAGE=${HOST_DIR}/bin/mkimage +#!/bin/bash +set -e -"${HSS_PAYLOAD_GENERATOR}" -c board/microchip/mpfs_icicle/config.yaml "${BINARIES_DIR}"/payload.bin -cp board/microchip/mpfs_icicle/mpfs_icicle.its "${BINARIES_DIR}"/mpfs_icicle.its -(cd "${BINARIES_DIR}" && "${MKIMAGE}" -f mpfs_icicle.its mpfs_icicle.itb) -support/scripts/genimage.sh -c board/microchip/mpfs_icicle/genimage.cfg +HSS_PAYLOAD_GENERATOR="${HOST_DIR}"/bin/hss-payload-generator +MKIMAGE="${HOST_DIR}"/bin/mkimage +BOARD_DIR="$(pwd)"/"${0%/*}" + +pushd "${BINARIES_DIR}" +"${HSS_PAYLOAD_GENERATOR}" -c "${BOARD_DIR}"/config.yaml payload.bin +cp "${BOARD_DIR}"/mpfs_icicle.its "${BINARIES_DIR}"/mpfs_icicle.its +"${MKIMAGE}" -f mpfs_icicle.its mpfs_icicle.itb +popd +support/scripts/genimage.sh -c "${BOARD_DIR}"/genimage.cfg From fd2fa74c5336d4efaaa3c9aabed625679d0e0265 Mon Sep 17 00:00:00 2001 From: Jamie Gibbons Date: Mon, 21 Aug 2023 12:30:34 +0100 Subject: [PATCH 1682/2890] configs/microchip_mpfs_icicle_defconfig: update RVC config option Update the RISCV_ISA_RVC config option to match updated RISCV kconfig instruction set options. Signed-off-by: Jamie Gibbons Signed-off-by: Thomas Petazzoni --- configs/microchip_mpfs_icicle_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/microchip_mpfs_icicle_defconfig b/configs/microchip_mpfs_icicle_defconfig index a3b3093982d9..54a4d55a5f3e 100644 --- a/configs/microchip_mpfs_icicle_defconfig +++ b/configs/microchip_mpfs_icicle_defconfig @@ -1,6 +1,6 @@ BR2_riscv=y BR2_riscv_g=y -BR2_RISCV_ISA_CUSTOM_RVC=y +BR2_RISCV_ISA_RVC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_HOSTNAME="mpfs_icicle" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/microchip/mpfs_icicle/post-image.sh" From c68987b9c429fce0abc977ed73cd2d744fe46846 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 18 Aug 2023 17:11:46 +0200 Subject: [PATCH 1683/2890] package/openvpn: bump version to 2.6.6 Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.6/ChangeLog https://github.com/OpenVPN/openvpn/blob/release/2.6/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 16bffb7e5702..b4fd3a964687 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 e34efdb9a3789a760cfc91d57349dfb1e31da169c98c06cb490c6a8a015638e2 openvpn-2.6.5.tar.gz +sha256 3b074f392818b31aa529b84f76e8b5e4ad03fca764924f46d906bceaaf421034 openvpn-2.6.6.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 7c2506870e9a..12c090ba3ede 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.5 +OPENVPN_VERSION = 2.6.6 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 From db46428e0ad00b6916fff2a41a33a45db8fb778f Mon Sep 17 00:00:00 2001 From: Clement Ramirez Date: Thu, 17 Aug 2023 14:52:36 +0200 Subject: [PATCH 1684/2890] package/cups: security bump version to 2.4.6 Fixes CVE-2023-34241 (see [0] for details) [0] https://github.com/OpenPrinting/cups/releases/tag/v2.4.6 The number of changes between 2.4.4 and 2.4.6 is really small, and limited to bug fixes: 9d614a4b3184205294c55355a1d2eb54d4532ccd (tag: v2.4.6) Update CHANGES.md 6f6da74ec284e28c156f0b9f62f3bd610e61aa78 Fix use-after-free in cupsdAcceptClient() (fixes CVE-2023-34241) 3f12185ca9cbb5350a6370d6046066907b8abc12 Merge pull request #735 from AtariDreams/Fixer f5281777c80cdf820a2a71c9e7f08b91f0e11160 Fix compilation on older macOS versions ee82c5b18409def3ec1424ce2eb343aabb0ff0d1 Merge pull request #730 from zdohnal/cupssinglefile_24x 1504527b2415a4b67b0e3e17593b053f3628746f cups/ppd-cache.c: Put cupsSingleFile into generated PPD 3be1d5da8fe9ee13aab5ee6ecc11b2f9387821a6 Prepare files for next release c1f54ec966ccc5d5564eed95dcb540842af7b5ca (tag: v2.4.5) cups/cups.h: Update for 2.4.5 70dba05b7511a96476ea0ef8fe1d92c6500c6e61 Finish hotfix release 2.4.5 87f5cb7d8f0da8fa2835bb0aa3ca48b5e5a66a3f Merge pull request #727 from AtariDreams/hotfix 61aa0b259183fe59124566f08ecf649bb806cd24 Regression: Certificate data is corrupted during base64 conversion 7362f41c45d834564f876ffac536f59eece843ec Prepare files for next release Signed-off-by: Clement Ramirez Signed-off-by: Thomas Petazzoni --- package/cups/cups.hash | 2 +- package/cups/cups.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cups/cups.hash b/package/cups/cups.hash index cc6fe254462d..501d8c12a622 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 209259e8fe8df9112af49f4e5765f50dad6da1f869296de41d6eaab1b98003cb cups-2.4.4-source.tar.gz +sha256 58e970cf1955e1cc87d0847c32526d9c2ccee335e5f0e3882b283138ba0e7262 cups-2.4.6-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 5320b6e3c252423e4153eb2dd63e57e3b630afb21139f44e43b02d85fe33e279 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 7bbea9a21898..a3bb2f8dfc49 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.4.4 +CUPS_VERSION = 2.4.6 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception From a0e69f70f6b6beb6f0de31e28adc9fbffb4bac56 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 17 Aug 2023 21:15:32 +0200 Subject: [PATCH 1685/2890] package/cmake: bump version to 3.27.3 Changelog: https://cmake.org/cmake/help/v3.27/release/3.27.html#updates Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index e5a047e7d315..35f25c00663f 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.27/cmake-3.27.1-SHA-256.txt -sha256 b1a6b0135fa11b94476e90f5b32c4c8fad480bf91cf22d0ded98ce22c5132004 cmake-3.27.1.tar.gz +# From https://cmake.org/files/v3.27/cmake-3.27.3-SHA-256.txt +sha256 66afdc0f181461b70b6fedcde9ecc4226c5cd184e7203617c83b7d8e47f49521 cmake-3.27.3.tar.gz # Locally calculated sha256 4a01ccf2dc580ba570d02bc015bbe0ec92f1f318717aae9540ba841ba7946756 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 1e29e2547112..a0c775e37cdb 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -6,7 +6,7 @@ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y CMAKE_VERSION_MAJOR = 3.27 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt From 619b5585d92c8f701cd92e0e26c0883a753125ad Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 17 Aug 2023 21:14:55 +0200 Subject: [PATCH 1686/2890] package/fmt: bump version to 10.1.0 Changelog: https://github.com/fmtlib/fmt/blob/master/ChangeLog.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/fmt/fmt.hash | 2 +- package/fmt/fmt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index 279f07126258..688c86243a3c 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4943cb165f3f587f26da834d3056ee8733c397e024145ca7d2a8a96bb71ac281 fmt-10.0.0.zip +sha256 d725fa83a8b57a3cedf238828fa6b167f963041e8f9f7327649bddc68ae316f4 fmt-10.1.0.zip sha256 07580f2a3b35709ce703d523f447b242f6dfec7582a8c0df102c7fa2849375f8 LICENSE.rst diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index f2c94b8231c6..8332b89605da 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 10.0.0 +FMT_VERSION = 10.1.0 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception From 31ddf22ff6466f54817c944eaeca67cfc028a50b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 17 Aug 2023 18:22:49 +0200 Subject: [PATCH 1687/2890] package/postgresql: security bump version to 15.4 Release notes: https://www.postgresql.org/about/news/postgresql-154-149-1312-1216-1121-and-postgresql-16-beta-3-released-2689/ Fixes CVE-2023-39417 & CVE-2023-39418. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index da6ec7f31178..0640f883a753 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v15.3/postgresql-15.3.tar.bz2.sha256 -sha256 ffc7d4891f00ffbf5c3f4eab7fbbced8460b8c0ee63c5a5167133b9e6599d932 postgresql-15.3.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v15.4/postgresql-15.4.tar.bz2.sha256 +sha256 baec5a4bdc4437336653b6cb5d9ed89be5bd5c0c58b94e0becee0a999e63c8f9 postgresql-15.4.tar.bz2 # License file, Locally calculated sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index ca11a8191ff4..b951b14aa090 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.3 +POSTGRESQL_VERSION = 15.4 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 20c5bae6fa0acbb18124959e35d19d0780ffd57a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 16 Aug 2023 22:14:31 +0200 Subject: [PATCH 1688/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 32940bc346b0..d3448ba7447e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.4.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.4.11" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 40ace29532b7..0177988c456b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b8b8a29852b999f337c4e93eff6c91fb7fd2d49a6614cbcbeb6fa171ba55cc9f linux-6.4.9.tar.xz -sha256 2e51d41fe11d082ae167cee05772bb07ca7f19448d2b46772d8ca2db7673a1a5 linux-6.1.44.tar.xz +sha256 546b68b5097d3c0d74722de62aae217729d98e45fbb6bd458b490ac21ea40918 linux-6.4.11.tar.xz +sha256 f5f67bcfccd47f8d9db2d5ba24e33af7778f40a777577d1fba424f4a1712a296 linux-6.1.46.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 150f3846b76cd23a6135f49cef71372bade5a06e851cb4f8558df8b862d8fec7 linux-5.15.125.tar.xz -sha256 4c03516ae1d417571faaef175932d0892710bcbe0173e40550014d043d9098c9 linux-5.10.189.tar.xz -sha256 3a78587523940374a7319089b63357c7dc412b90f5879d512265e59173588267 linux-5.4.252.tar.xz +sha256 add0a575341b263a06e93599fc220a5dd34cb4ca5b9d05097a5db2a061928f26 linux-5.15.127.tar.xz +sha256 cb54660ed4917cc4f9a9ab93d117defefd8bcbe745ec6082d909bbfd5ae962c2 linux-5.10.191.tar.xz +sha256 51608da961b5e34d6a9452a7b302699e109633f769a4253c74b1048abba8d9c7 linux-5.4.254.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 9fa5e24b7d791583f8cd001bcf02b52f569f261e276dc1dab2552974dca20ecf linux-4.19.290.tar.xz -sha256 d0e32bd47a547cc20e0ce09ff45514282742edb2af38df5dc0a03f22d4321715 linux-4.14.321.tar.xz +sha256 349728d3d143fcee484b34e34e536fe48dfb8bb71263f81a66fd572cc9162137 linux-4.19.292.tar.xz +sha256 6f0a9010b2451e7ab5b28e38c81b3c5149277ab5fe0e08059e60eb602b804ebc linux-4.14.323.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index c7d725aa131b..8a2506700396 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -400,13 +400,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.321" if BR2_KERNEL_HEADERS_4_14 - default "4.19.290" if BR2_KERNEL_HEADERS_4_19 - default "5.4.252" if BR2_KERNEL_HEADERS_5_4 - default "5.10.189" if BR2_KERNEL_HEADERS_5_10 - default "5.15.125" if BR2_KERNEL_HEADERS_5_15 - default "6.1.44" if BR2_KERNEL_HEADERS_6_1 - default "6.4.9" if BR2_KERNEL_HEADERS_6_4 + default "4.14.323" if BR2_KERNEL_HEADERS_4_14 + default "4.19.292" if BR2_KERNEL_HEADERS_4_19 + default "5.4.254" if BR2_KERNEL_HEADERS_5_4 + default "5.10.191" if BR2_KERNEL_HEADERS_5_10 + default "5.15.127" if BR2_KERNEL_HEADERS_5_15 + default "6.1.46" if BR2_KERNEL_HEADERS_6_1 + default "6.4.11" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From bfa4a7c8f243a0325573da6544543ffdd3ec6743 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 16 Aug 2023 22:21:47 +0200 Subject: [PATCH 1689/2890] package/{mesa3d, mesa3d-headers}: bump version to 23.1.6 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-August/000727.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index e602953a3fb4..5dbf984735b2 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.1.5 +MESA3D_HEADERS_VERSION = 23.1.6 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 3606cca56d12..95133d3de995 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-August/000726.html -sha256 3cf88576fdebf24fc4047067936131c90cb6541c27365996b79b661dec1fb153 mesa-23.1.5.tar.xz -sha512 c5eac5a497561374eaf931214aebc9001820c5ab49f9b8c5634b62af081b03b2f21c169c936524b2953c8815eb27dfb5c8c12276b9b1c119722cd6fea0b22d85 mesa-23.1.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-August/000727.html +sha256 f4c7fd8e7b472a88da7d83e9a48f6f3bd17d4ea2cc4386f7231b796f3964157a mesa-23.1.6.tar.xz +sha512 24f1c626fa05a82bcdfb24b67b8e5f96f94d5748309631b83e8d7a62142853cd3be90b92c56bac3bc4d223bf40b424d6d6a9977537b899107295b7d45d7e2575 mesa-23.1.6.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index add9232d2fe2..8f3d2244176a 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.1.5 +MESA3D_VERSION = 23.1.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 2235ab809f5f081cf9d10be2c2470e472efed889 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 16 Aug 2023 22:06:00 +0200 Subject: [PATCH 1690/2890] package/samba4: security bump version to 4.18.6 Release notes: https://www.samba.org/samba/history/samba-4.18.6.html Includes a mitigation for CVE-2007-4559. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 1901707f3b94..fb278c112405 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.18.5.tar.asc -sha256 095256ac332e1d9fbf9b7ff7823f92a3233d3ed658ce7fc9b33905c2243f447f samba-4.18.5.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.18.6.tar.asc +sha256 284c8a994ce989c87cd6808c390fcb9d00c36b21a0dc1a8a75474b67c9e715e7 samba-4.18.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index edc0fee286ff..7b9e320012e9 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.18.5 +SAMBA4_VERSION = 4.18.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From f1a048cc0a2a33bc72a9cfa1930274d19b9951e3 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Tue, 15 Aug 2023 22:34:47 +0200 Subject: [PATCH 1691/2890] package/mawk: bump version to 1.3.4-20230808 Signed-off-by: Ismael Luceno Signed-off-by: Thomas Petazzoni --- package/mawk/mawk.hash | 2 +- package/mawk/mawk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mawk/mawk.hash b/package/mawk/mawk.hash index 69761f77df57..0a31675ac8e9 100644 --- a/package/mawk/mawk.hash +++ b/package/mawk/mawk.hash @@ -1,2 +1,2 @@ -sha256 7fd4cd1e1fae9290fe089171181bbc6291dfd9bca939ca804f0ddb851c8b8237 mawk-1.3.4-20200120.tgz +sha256 88f55a632e2736ff5c5f69944abc151734d89d8298d5005921180f39ab7ba6d0 mawk-1.3.4-20230808.tgz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mawk/mawk.mk b/package/mawk/mawk.mk index c4a486215d5d..d747f887ce39 100644 --- a/package/mawk/mawk.mk +++ b/package/mawk/mawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAWK_VERSION = 1.3.4-20200120 +MAWK_VERSION = 1.3.4-20230808 MAWK_SITE = https://invisible-mirror.net/archives/mawk MAWK_SOURCE = mawk-$(MAWK_VERSION).tgz MAWK_LICENSE = GPL-2.0 From c78799639b25ab1a90e699267ae821a279d87916 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 16 Aug 2023 22:03:10 +0200 Subject: [PATCH 1692/2890] package/clamav: security bump version to 1.0.2 Release notes: https://blog.clamav.net/2023/07/2023-08-16-releases.html Fixes CVE-2023-20197 & CVE-2023-20212. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index ad9d1c92643e..9a41806d1e01 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0872dc1b82ff4cd7e8e4323faf5ee41a1f66ae80865d05429085b946355d86ee clamav-1.0.1.tar.gz +sha256 71dd39fe0d3937747fc280ea07c15cc990269257c4abb12dc438b4409d1b44c7 clamav-1.0.2.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 68a1799bfc97..e677c3375a17 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 1.0.1 +CLAMAV_VERSION = 1.0.2 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = \ From c2612d918f460f1855121ca2ae845b2d18576332 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 16 Aug 2023 21:59:38 +0200 Subject: [PATCH 1693/2890] package/php: security bump version to 8.2.9 Changelog: https://www.php.net/ChangeLog-8.php#8.2.9 Release notes: https://www.php.net/releases/8_2_9.php Fixes CVE-2023-3823 & CVE-2023-3824. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 9fb4aebec14d..02cc1e6c7ae6 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 cfe1055fbcd486de7d3312da6146949aae577365808790af6018205567609801 php-8.2.8.tar.xz +sha256 1e6cb77f997613864ab3127fbfc6a8c7fdaa89a95e8ed6167617b913b4de4765 php-8.2.9.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 691436926bd6..836949a91747 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.8 +PHP_VERSION = 8.2.9 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From a9e36f73a76a079b6dde2eb4da776d7a3ddba677 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 21 Aug 2023 22:22:15 +0200 Subject: [PATCH 1694/2890] package/libassuan: update _SITE url to use https This new _SITE url matches the one published upstream at: https://gnupg.org/download/ Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libassuan/libassuan.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk index f98c13b59f2e..0f69d1ba6b45 100644 --- a/package/libassuan/libassuan.mk +++ b/package/libassuan/libassuan.mk @@ -5,7 +5,7 @@ ################################################################################ LIBASSUAN_VERSION = 2.5.5 -LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan +LIBASSUAN_SITE = https://gnupg.org/ftp/gcrypt/libassuan LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2 LIBASSUAN_LICENSE = LGPL-2.1+ (library), GPL-3.0 (tests, doc) LIBASSUAN_LICENSE_FILES = COPYING.LIB COPYING From 0e19425c774fdcc46c6e3ee4bcf13e88f637e5c4 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 21 Aug 2023 22:22:16 +0200 Subject: [PATCH 1695/2890] package/libassuan: bump to version 2.5.6 For change log, see [1] and [2]. This commit also moves the archive SHA256 hash to the section of hashes published upstream. libassuan 2.5.6 updated its gpg-error.m4 macro files to detect gpgrt-config. Its path needs to be forced in _CONF_ENV to make sure it will work in all host environments. See the log entry of commit d7f2d8403e "package/gnupg2: fix build failure when host provides an old gpgrt-config" [3] for a complete explanation. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libassuan.git;a=log;h=libassuan-2.5.6 [2] https://dev.gnupg.org/T6542 [3] https://git.buildroot.org/buildroot/commit/?id=d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libassuan/libassuan.hash | 6 +++--- package/libassuan/libassuan.mk | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/libassuan/libassuan.hash b/package/libassuan/libassuan.hash index c817a3af634f..89e3fea956f9 100644 --- a/package/libassuan/libassuan.hash +++ b/package/libassuan/libassuan.hash @@ -1,8 +1,8 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 ec4f67c0117ccd17007c748a392ded96dc1b1ae9 libassuan-2.5.5.tar.bz2 +sha1 b1e8754dbf89b3a3eb175f5df75048dbca1fce57 libassuan-2.5.6.tar.bz2 +sha256 e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426 libassuan-2.5.6.tar.bz2 # Locally calculated after checking signature -# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2.sig +# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.6.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 libassuan-2.5.5.tar.bz2 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk index 0f69d1ba6b45..fb95a6fd679f 100644 --- a/package/libassuan/libassuan.mk +++ b/package/libassuan/libassuan.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASSUAN_VERSION = 2.5.5 +LIBASSUAN_VERSION = 2.5.6 LIBASSUAN_SITE = https://gnupg.org/ftp/gcrypt/libassuan LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2 LIBASSUAN_LICENSE = LGPL-2.1+ (library), GPL-3.0 (tests, doc) @@ -15,4 +15,8 @@ LIBASSUAN_CONF_OPTS = \ --with-gpg-error-prefix=$(STAGING_DIR)/usr LIBASSUAN_CONFIG_SCRIPTS = libassuan-config +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +LIBASSUAN_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config + $(eval $(autotools-package)) From 36e26a50673a6e394a317b09c662fa36a0af400d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 15 Aug 2023 20:40:11 +0200 Subject: [PATCH 1696/2890] package/kodi-pvr-mythtv: bump version to 20.4.0-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index d0d6331364bd..ce8f68d3b55b 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b1ad428bec882d3e852240cbef2378803635b530545a08421ff3baf0611a29e7 kodi-pvr-mythtv-20.3.2-Nexus.tar.gz +sha256 344750ba617b261a4559ba8314107b7e90e9a37b6b1a6cccb9077e5b2f63694d kodi-pvr-mythtv-20.4.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index f67457480c5a..2038b9016e95 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 20.3.2-Nexus +KODI_PVR_MYTHTV_VERSION = 20.4.0-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From f1ddc9177723f8126b460a85bc48de03c742d0d5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 15 Aug 2023 20:40:12 +0200 Subject: [PATCH 1697/2890] package/kodi-peripheral-joystick: bump version to 20.1.11-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 6a128604b0bc..ba9932c9e454 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b72277358df77ed79a0e7f3ae7e9799d02692fb30408cf6e5325ce7e5a34f597 kodi-peripheral-joystick-20.1.10-Nexus.tar.gz +sha256 d916506695d71385fe32d9b640e354b895c7a76ae9a9127a76c180f2a3ed8028 kodi-peripheral-joystick-20.1.11-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index e55c92b1214f..2f2cd05a1288 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.10-Nexus +KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.11-Nexus KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From 64024ec57ea8249014e90aedb30533ddc6905e68 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 15 Aug 2023 14:56:51 +0200 Subject: [PATCH 1698/2890] package/libnftnl: bump to version 1.2.6 For change log, see: https://www.netfilter.org/projects/libnftnl/files/changes-libnftnl-1.2.6.txt This commit also adds comments in hash file: - that pgp signature was verified with links - that the license file hash was locally computed Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libnftnl/libnftnl.hash | 7 ++++++- package/libnftnl/libnftnl.mk | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 0cb3917f2d35..5d1aad15d19f 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,3 +1,8 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html -sha256 966de0a8120c8a53db859889749368bfb2cba0c4f0b4c1a30d264eccc45f1226 libnftnl-1.2.5.tar.xz +# Checked pgp signature: +# https://www.netfilter.org/projects/libnftnl/files/libnftnl-1.2.6.tar.xz.sig +# with key: +# https://www.netfilter.org/files/coreteam-gpg-key-0xD55D978A8A1420E4.txt +sha256 ceeaea2cd92147da19f13a35a7f1a4bc2767ff897e838e4b479cf54b59c777f4 libnftnl-1.2.6.tar.xz +# Locally computed: sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index a7045337d0d9..18be55a17d19 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.2.5 +LIBNFTNL_VERSION = 1.2.6 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.xz LIBNFTNL_LICENSE = GPL-2.0+ From 510c91244b0e66d0b39eacaf1a1c8fbd741bcbb1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 15 Aug 2023 14:56:52 +0200 Subject: [PATCH 1699/2890] package/nftables: bump to version 1.0.8 For change log, see: https://netfilter.org/projects/nftables/files/changes-nftables-1.0.8.txt This commit also adds comments in hash file: - that pgp signature was verified with links - that the license file hash was locally computed Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/nftables/nftables.hash | 7 ++++++- package/nftables/nftables.mk | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index 7e1e856229f5..c5ede1130aa9 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,3 +1,8 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 c12ac941fff9adaedf17367d5ce213789b98a0d314277bc22b3d71e10891f412 nftables-1.0.7.tar.xz +# Checked pgp signature: +# https://netfilter.org/projects/nftables/files/nftables-1.0.8.tar.xz.sig +# with key: +# https://netfilter.org/files/coreteam-gpg-key-0xD55D978A8A1420E4.txt +sha256 9373740de41a82dbc98818e0a46a073faeb8a8d0689fa4fa1a74399c32bf3d50 nftables-1.0.8.tar.xz +# Locally computed: sha256 4ee1e51baf5f3166712fa0c3e01338c7257e50ddef245d28bb14ad68f6070ba5 COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index d31df8afa469..20a7cd07ef97 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFTABLES_VERSION = 1.0.7 +NFTABLES_VERSION = 1.0.8 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.xz NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) From d6b2f14901b046fff443e32c52c9f24089277836 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 15 Aug 2023 09:57:02 +0200 Subject: [PATCH 1700/2890] package/libstrophe: bump to version 0.12.3 Signed-off-by: Michael Vetter Signed-off-by: Thomas Petazzoni --- package/libstrophe/libstrophe.hash | 2 +- package/libstrophe/libstrophe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index 3ccba06202d2..a6a529eb6c43 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b3c79b6deeafafc0f622ba3ee3ca67e9a8e7d75edb102588c6b6f52b38c9fa4b libstrophe-0.12.2.tar.xz +sha256 d82e9e8585b8fc68fb91791377fbfb0051b98259a0ec64cf31c8a09bb7e2621e libstrophe-0.12.3.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index 43d55592fa6c..de9012e67f92 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.12.2 +LIBSTROPHE_VERSION = 0.12.3 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf From a77db2f34c06ef6b20e301b476339103488326a8 Mon Sep 17 00:00:00 2001 From: Andreas Dannenberg Date: Thu, 15 Jun 2023 19:23:50 -0500 Subject: [PATCH 1701/2890] boot/ti-k3-r5-loader: allow for full build source customization The TI K3 R5 loader package essentially is a wrapper to build a special version of U-boot SPL used as part of a multi-stage boot flow on TI K3 devices, and as such needs full flexibility as to specifying the U-Boot sources used for the build. To accomodate this, add the same options as already available in the regular U-Boot package. For most use cases, the same source settings (repo URL, versions, etc.) should be used for both ti-k3-r5-loader and uboot packages. Signed-off-by: Andreas Dannenberg Signed-off-by: Thomas Petazzoni --- boot/ti-k3-r5-loader/Config.in | 65 ++++++++++++++++++++++++- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 25 +++++++++- 2 files changed, 87 insertions(+), 3 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 10602c8df32d..8c8368a1a5a8 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -2,13 +2,74 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 help - Separate U-Boot build for R5 cores on TI's k3 boards. + Separate U-Boot SPL build for R5 core on TI's K3 processors. Usually used to build tiboot3.bin with k3-image-gen. if BR2_TARGET_TI_K3_R5_LOADER choice - prompt "Configuration" + prompt "U-Boot Version" + help + Select the specific U-Boot version you want to use to build + the initial SPL running on the R5 core. Note that for most + use cases you will want to use the exact same version/source + here as it is used to build the main U-Boot package. + +config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + bool "2022.10" + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION + bool "Custom version" + help + This option allows to use a specific official versions + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL + bool "Custom tarball" + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT + bool "Custom Git repository" + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG + bool "Custom Mercurial repository" + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN + bool "Custom Subversion repository" + +endchoice + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE + string "U-Boot version" + depends on BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL_LOCATION + string "URL of custom U-Boot tarball" + depends on BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL + +if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT || BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG || BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL + string "URL of custom repository" + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_VERSION + string "Custom repository version" + help + Revision to use in the typical format used by + Git/Mercurial/Subversion E.G. a sha id, a tag, branch, .. + +endif + +config BR2_TARGET_TI_K3_R5_LOADER_VERSION + string + default "2022.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ + if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION + default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL + default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_VERSION \ + if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT || \ + BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG || \ + BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN +choice + prompt "U-Boot Configuration" default BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG config BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index afa309aa980a..0ffcb8235f2e 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -4,9 +4,32 @@ # ################################################################################ -TI_K3_R5_LOADER_VERSION = 2022.10 +TI_K3_R5_LOADER_VERSION = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_VERSION)) + +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL),y) +# Handle custom U-Boot tarballs as specified by the configuration +TI_K3_R5_LOADER_TARBALL = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL_LOCATION)) +TI_K3_R5_LOADER_SITE = $(patsubst %/,%,$(dir $(TI_K3_R5_LOADER_TARBALL))) +TI_K3_R5_LOADER_SOURCE = $(notdir $(TI_K3_R5_LOADER_TARBALL)) +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT),y) +TI_K3_R5_LOADER_SITE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL)) +TI_K3_R5_LOADER_SITE_METHOD = git +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG),y) +TI_K3_R5_LOADER_SITE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL)) +TI_K3_R5_LOADER_SITE_METHOD = hg +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN),y) +TI_K3_R5_LOADER_SITE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL)) +TI_K3_R5_LOADER_SITE_METHOD = svn +else +# Handle stable official U-Boot versions TI_K3_R5_LOADER_SITE = https://ftp.denx.de/pub/u-boot TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.bz2 +endif + +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER)$(BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(TI_K3_R5_LOADER_SOURCE) +endif + TI_K3_R5_LOADER_LICENSE = GPL-2.0+ TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt TI_K3_R5_LOADER_CPE_ID_VENDOR = denx From 2389c76a95725b91ba538b56fb7da70877c7d3ad Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 18 Aug 2023 22:40:16 +0200 Subject: [PATCH 1702/2890] boot/ti-k3-boot-firmware: new package This is extracted from a patch from Xuanhao Shi, Anand Gadiyar and Andreas Dannenberg submitted at https://patchwork.ozlabs.org/project/buildroot/patch/20230616002359.4139814-3-dannenberg@ti.com/. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ boot/Config.in | 1 + boot/ti-k3-boot-firmware/Config.in | 7 +++++++ .../ti-k3-boot-firmware.hash | 3 +++ .../ti-k3-boot-firmware.mk | 21 +++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 boot/ti-k3-boot-firmware/Config.in create mode 100644 boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash create mode 100644 boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk diff --git a/DEVELOPERS b/DEVELOPERS index abd633f84019..3b60189c773f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -132,6 +132,7 @@ F: package/libxmlrpc/ F: package/python-docopt/ N: Anand Gadiyar +F: boot/ti-k3-boot-firmware/ F: boot/ti-k3-r5-loader/ N: André Zwing @@ -3114,6 +3115,7 @@ N: Wojciech Niziński F: package/fwup/ N: Xuanhao Shi +F: boot/ti-k3-boot-firmware/ F: boot/ti-k3-r5-loader/ N: Yair Ben Avraham diff --git a/boot/Config.in b/boot/Config.in index 9d7f5c4cb971..87e1b7c00e35 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -19,6 +19,7 @@ source "boot/opensbi/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" +source "boot/ti-k3-boot-firmware/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3-boot-firmware/Config.in new file mode 100644 index 000000000000..d80bb4bdb382 --- /dev/null +++ b/boot/ti-k3-boot-firmware/Config.in @@ -0,0 +1,7 @@ +config BR2_TARGET_TI_K3_BOOT_FIRMWARE + bool "ti-k3-boot-firmware" + depends on BR2_aarch64 + help + This package downloads and installs the TI-specific ti-sysfw + and ti-dm firmware needed to boot TI K3 platforms (which + include AM62x, AM64x, AM65x and more). diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash new file mode 100644 index 000000000000..95131180ef40 --- /dev/null +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 ab20ffbe7bba7e94be246b3417d33a914b3f07c16c47ef5a7f7602349a666a61 LICENSE.ti +sha256 6032a258ce731d987576115f5de44c677a6b0cf8bddcd61a9a2852928bdfff92 ti-linux-firmware-08.06.00.006.tar.xz diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk new file mode 100644 index 000000000000..1f8ade207c13 --- /dev/null +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# ti-k3-boot-firmware +# +################################################################################ + +# The hash 340194800a581baf976360386dfc7b5acab8d948 defined in the +# Makefile of ti-k3-image-gen corresponds to the tag 08.06.00.006. +TI_K3_BOOT_FIRMWARE_VERSION = 08.06.00.006 +TI_K3_BOOT_FIRMWARE_SITE = https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/snapshot +TI_K3_BOOT_FIRMWARE_SOURCE = ti-linux-firmware-$(TI_K3_BOOT_FIRMWARE_VERSION).tar.xz +TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES = YES +TI_K3_BOOT_FIRMWARE_LICENSE = TI Proprietary +TI_K3_BOOT_FIRMWARE_LICENSE_FILES = LICENSE.ti + +define TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES_CMDS + cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ + cp -dpfr $(@D)/ti-dm $(BINARIES_DIR)/ +endef + +$(eval $(generic-package)) From 6134872d2878f46f8f2800c81baf917281bc79b0 Mon Sep 17 00:00:00 2001 From: Xuanhao Shi Date: Thu, 15 Jun 2023 19:23:51 -0500 Subject: [PATCH 1703/2890] boot/ti-k3-image-gen: new package This is the image generator that builds the initial boot binary, tiboot3.bin, for the R5 core on TI's K3 family of devices. This requires the R5 SPL output from the ti-k3-r5-loader package as well as some boot firmware from ti-k3-boot-firmware. Signed-off-by: Xuanhao Shi Signed-off-by: Anand Gadiyar Signed-off-by: Andreas Dannenberg Reviewed-by: Giulio Benetti Acked-by: Andrew Davis Tested-by: Bryan Brattlof Cc: Romain Naour Reviewed-by: Francois Perrad Reviewed-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + boot/Config.in | 1 + boot/ti-k3-image-gen/Config.in | 77 +++++++++++++++++++++++ boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 + boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ++++++++++++++++ 5 files changed, 137 insertions(+) create mode 100644 boot/ti-k3-image-gen/Config.in create mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash create mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3b60189c773f..2a10bb44cdc0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -133,6 +133,7 @@ F: package/python-docopt/ N: Anand Gadiyar F: boot/ti-k3-boot-firmware/ +F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ N: André Zwing @@ -3116,6 +3117,7 @@ F: package/fwup/ N: Xuanhao Shi F: boot/ti-k3-boot-firmware/ +F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ N: Yair Ben Avraham diff --git a/boot/Config.in b/boot/Config.in index 87e1b7c00e35..e5fdf7ad439e 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" source "boot/ti-k3-boot-firmware/Config.in" +source "boot/ti-k3-image-gen/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in new file mode 100644 index 000000000000..d76cef82e911 --- /dev/null +++ b/boot/ti-k3-image-gen/Config.in @@ -0,0 +1,77 @@ +config BR2_TARGET_TI_K3_IMAGE_GEN + bool "ti-k3-image-gen" + depends on BR2_TARGET_TI_K3_R5_LOADER + select BR2_TARGET_TI_K3_BOOT_FIRMWARE + # We need FIT support in uboot-tools, which is why we select a + # host package + select BR2_PACKAGE_HOST_UBOOT_TOOLS + select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT + help + Use TI's k3-image-gen to build a separate bare metal boot + binary from a separate SPL that is running on the R5 core. + + https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ + +if BR2_TARGET_TI_K3_IMAGE_GEN +choice + prompt "SoC family" + +config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX + bool "am62ax" + +config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + bool "am62x" + +config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X + bool "am64x" + +config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X + bool "am65x" + +endchoice + +choice + prompt "Security type" + help + The target SoC security type option for image gen. Valid + options are "gp" for General Purpose devices, "hs-fs" for + High Security - Field Securable devices, or "hs" for High + Security - Security Enforcing devices. Note for all High + Security device variants the TI_SECURE_DEV_PKG environmental + variable must be defined at build time pointing to a valid + core-secdev-k3 folder location, otherwise the build will + fail, see + https://git.ti.com/cgit/security-development-tools/core-secdev-k3 + +config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP + bool "gp" + +config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS + bool "hs-fs" + +config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + bool "hs" + +endchoice + +config BR2_TARGET_TI_K3_IMAGE_GEN_SOC + string + default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX + default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X + default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X + +config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE + string + default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX + default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X + default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X + +config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE + string + default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP + default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS + default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + +endif diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash b/boot/ti-k3-image-gen/ti-k3-image-gen.hash new file mode 100644 index 000000000000..c968c5648f71 --- /dev/null +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f89ea4b1f5c992455b1a682fde48359221b53f3294135df4bf20feea6aea90e4 k3-image-gen-08.06.00.007.tar.gz +sha256 f012e8d000d711d0539e5b4c812fc1d3a59c10fc1e3d6ea155556f5b78286845 LICENSE diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk new file mode 100644 index 000000000000..64be9a18f2c4 --- /dev/null +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# ti-k3-image-gen +# +################################################################################ + +TI_K3_IMAGE_GEN_VERSION = 08.06.00.007 +TI_K3_IMAGE_GEN_SITE = https://git.ti.com/cgit/k3-image-gen/k3-image-gen/snapshot +TI_K3_IMAGE_GEN_SOURCE = k3-image-gen-$(TI_K3_IMAGE_GEN_VERSION).tar.gz +TI_K3_IMAGE_GEN_LICENSE = BSD-3-Clause +TI_K3_IMAGE_GEN_LICENSE_FILES = LICENSE +TI_K3_IMAGE_GEN_INSTALL_IMAGES = YES + +# - ti-k3-image-gen is used to build tiboot3.bin, using the +# r5-u-boot-spl.bin file from the ti-k3-r5-loader package. Hence the +# dependency on ti-k3-r5-loader. +# - the ti-k3-image-gen makefiles seem to need some feature from Make +# v4.0, similar to u-boot. +TI_K3_IMAGE_GEN_DEPENDENCIES = \ + host-arm-gnu-toolchain \ + host-python3 \ + host-openssl \ + host-uboot-tools \ + ti-k3-r5-loader \ + ti-k3-boot-firmware \ + $(BR2_MAKE_HOST_DEPENDENCY) + +TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) + +TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin + +define TI_K3_IMAGE_GEN_CONFIGURE_CMDS + cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) +endef + +define TI_K3_IMAGE_GEN_BUILD_CMDS + $(TARGET_MAKE_ENV) \ + $(BR2_MAKE) -C $(@D) \ + SOC=$(TI_K3_IMAGE_GEN_SOC) \ + SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ + CONFIG=evm \ + CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ + SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ + O=$(@D)/tmp \ + BIN_DIR=$(@D) +endef + +define TI_K3_IMAGE_GEN_INSTALL_IMAGES_CMDS + cp $(@D)/tiboot3.bin $(BINARIES_DIR) +endef + +$(eval $(generic-package)) From 52ce606c05ee3ac869f8087292bc3dbb0d25b79b Mon Sep 17 00:00:00 2001 From: Andreas Dannenberg Date: Thu, 15 Jun 2023 19:23:52 -0500 Subject: [PATCH 1704/2890] boot/uboot: add support for building the TI K3 DM into U-Boot Certain TI K3 devices such as AM62x and AM62Ax require a Device Manager (DM) firmnware to be made available to the U-Boot build, which will get packaged into the "tispl.bin" image tree blob during A53 SPL build. Without that DM firmware U-Boot will not be functional. To support this, add a config option called BR2_TARGET_UBOOT_NEEDS_TI_K3_DM to enable this feature, and another option BR2_TARGET_UBOOT_TI_K3_DM_SOC to allow setting the name of the SOC which needs to match the corresponding folder name in the ti-linux-firmware Git repository. Signed-off-by: Andreas Dannenberg Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 19 +++++++++++++++++++ boot/uboot/uboot.mk | 6 ++++++ 2 files changed, 25 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 8b726eaa57d4..21f19db89016 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -240,6 +240,25 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE U-Boot, and that the TEE variable pointing to OPTEE's tee.elf, is passed during the Buildroot build. +config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM + bool "U-Boot needs TI K3 Device Manager (DM)" + # We use the SoC selection defined for the ti-k3-image-gen + # package + depends on BR2_TARGET_TI_K3_IMAGE_GEN + depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + help + Some TI K3 devices need the Device Manager (DM) firmware to + be available for the U-Boot build. + +if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM + +config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME + string + default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX + default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + +endif + config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9f81c0b84204..dda606a88059 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -186,6 +186,12 @@ UBOOT_DEPENDENCIES += optee-os UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) +UBOOT_DEPENDENCIES += ti-k3-boot-firmware +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) UBOOT_DEPENDENCIES += opensbi UBOOT_MAKE_OPTS += OPENSBI=$(BINARIES_DIR)/fw_dynamic.bin From 6b2329bb806b6eacc87a88d5a930d8c4d88b4984 Mon Sep 17 00:00:00 2001 From: Xuanhao Shi Date: Thu, 15 Jun 2023 19:23:53 -0500 Subject: [PATCH 1705/2890] configs/ti_am64x_sk: new defconfig Adds support for TI's SK-AM64 board by introducing the ti_am64x_sk_defconfig file and related support files. More information about the board can be found at: https://www.ti.com/tool/SK-AM64 Signed-off-by: Xuanhao Shi Signed-off-by: Anand Gadiyar Signed-off-by: Andreas Dannenberg Reviewed-by: Giulio Benetti Acked-by: Andrew Davis Tested-by: Bryan Brattlof Cc: Romain Naour Reviewed-by: Francois Perrad Reviewed-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++++ board/ti/am64x-sk/genimage.cfg | 27 ++++++++++++++++++++++ board/ti/am64x-sk/readme.txt | 34 +++++++++++++++++++++++++++ configs/ti_am64x_sk_defconfig | 42 ++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+) create mode 100644 board/ti/am64x-sk/genimage.cfg create mode 100644 board/ti/am64x-sk/readme.txt create mode 100644 configs/ti_am64x_sk_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 2a10bb44cdc0..679aeb89d508 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -132,9 +132,11 @@ F: package/libxmlrpc/ F: package/python-docopt/ N: Anand Gadiyar +F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ +F: configs/ti_am64x_sk_defconfig N: André Zwing F: package/libkrb5/ @@ -3116,9 +3118,11 @@ N: Wojciech Niziński F: package/fwup/ N: Xuanhao Shi +F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ +F: configs/ti_am64x_sk_defconfig N: Yair Ben Avraham F: package/casync/ diff --git a/board/ti/am64x-sk/genimage.cfg b/board/ti/am64x-sk/genimage.cfg new file mode 100644 index 000000000000..26304fe98f99 --- /dev/null +++ b/board/ti/am64x-sk/genimage.cfg @@ -0,0 +1,27 @@ +image boot.vfat { + vfat { + files = { + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + } + } + + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/ti/am64x-sk/readme.txt b/board/ti/am64x-sk/readme.txt new file mode 100644 index 000000000000..5ddbb836ed77 --- /dev/null +++ b/board/ti/am64x-sk/readme.txt @@ -0,0 +1,34 @@ +Texas Instuments SK-AM64 Test and Development Board + +Description +=========== + +This configuration will build a complete image for the TI SK-AM64 +board: https://www.ti.com/tool/SK-AM64. + +How to Build +============ + +Select the default configuration for the target: + +$ make am64x_sk_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +Build: + +$ make + +To copy the resultimg output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the SK-AM62 board, and power it up through the +USB Type-C connector. The system should come up. You can use a +micro-USB cable to connect to the connector labeled DEBUG CONSOLE to +communicate with the board. diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig new file mode 100644 index 000000000000..052c4400934a --- /dev/null +++ b/configs/ti_am64x_sk_defconfig @@ -0,0 +1,42 @@ +BR2_aarch64=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_TI_K3_IMAGE_GEN=y +BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y +BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y +BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="tispl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="TEE=$(BINARIES_DIR)/tee-pager_v2.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From 4b8fddb060fbc2b8d5e92b2065ec44de2f1ff3c2 Mon Sep 17 00:00:00 2001 From: Xuanhao Shi Date: Thu, 15 Jun 2023 19:23:54 -0500 Subject: [PATCH 1706/2890] configs/ti_am62x_sk: new defconfig Adds support for TI's SK-AM62 board by introducing the am62x_sk_defconfig file and related support files. More information about the board can be found at: https://www.ti.com/tool/SK-AM62 Signed-off-by: Xuanhao Shi Signed-off-by: Andreas Dannenberg Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++++ board/ti/am62x-sk/genimage.cfg | 27 +++++++++++++++++++++ board/ti/am62x-sk/readme.txt | 34 +++++++++++++++++++++++++++ configs/ti_am62x_sk_defconfig | 43 ++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+) create mode 100644 board/ti/am62x-sk/genimage.cfg create mode 100644 board/ti/am62x-sk/readme.txt create mode 100644 configs/ti_am62x_sk_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 679aeb89d508..c643469f1799 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -132,10 +132,12 @@ F: package/libxmlrpc/ F: package/python-docopt/ N: Anand Gadiyar +F: board/ti/am62x-sk/ F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ +F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig N: André Zwing @@ -3118,10 +3120,12 @@ N: Wojciech Niziński F: package/fwup/ N: Xuanhao Shi +F: board/ti/am62x-sk/ F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ +F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig N: Yair Ben Avraham diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg new file mode 100644 index 000000000000..26304fe98f99 --- /dev/null +++ b/board/ti/am62x-sk/genimage.cfg @@ -0,0 +1,27 @@ +image boot.vfat { + vfat { + files = { + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + } + } + + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/ti/am62x-sk/readme.txt b/board/ti/am62x-sk/readme.txt new file mode 100644 index 000000000000..f6251ea04a87 --- /dev/null +++ b/board/ti/am62x-sk/readme.txt @@ -0,0 +1,34 @@ +Texas Instuments SK-AM62 Test and Development Board + +Description +=========== + +This configuration will build a complete image for the TI SK-AM62 +board: https://www.ti.com/tool/SK-AM62. + +How to Build +============ + +Select the default configuration for the target: + +$ make am62x_sk_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +Build: + +$ make + +To copy the resultimg output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the SK-AM62 board, and power it up through the +USB Type-C connector. The system should come up. You can use a +micro-USB cable to connect to the connector labeled UART to +communicate with the board. diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig new file mode 100644 index 000000000000..b98a68ff153f --- /dev/null +++ b/configs/ti_am62x_sk_defconfig @@ -0,0 +1,43 @@ +BR2_aarch64=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_TI_K3_IMAGE_GEN=y +BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y +BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y +BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="tispl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="TEE=$(BINARIES_DIR)/tee-pager_v2.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From 67ff42ac4a98e4c0cbcb60c8e6cf7652f3c84027 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 22 Aug 2023 07:50:44 +0300 Subject: [PATCH 1707/2890] package/libassuan: remove stale hash comment Commit 0e19425c774fd ("package/libassuan: bump to version 2.5.6") moved the sha256 hash below a link that provides the hash directly. The key check comment now appears to refer to license hashes, which does not make sense. Remove the redundant key check comment. Cc: Julien Olivain Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libassuan/libassuan.hash | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/libassuan/libassuan.hash b/package/libassuan/libassuan.hash index 89e3fea956f9..084a09848c3c 100644 --- a/package/libassuan/libassuan.hash +++ b/package/libassuan/libassuan.hash @@ -1,8 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html sha1 b1e8754dbf89b3a3eb175f5df75048dbca1fce57 libassuan-2.5.6.tar.bz2 sha256 e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426 libassuan-2.5.6.tar.bz2 -# Locally calculated after checking signature -# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.6.tar.bz2.sig -# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 +# Locally calculated sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING From 06702c81d3ce70dbba1d6a733a95bf13a3cff0c3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 22 Aug 2023 06:57:34 +0200 Subject: [PATCH 1708/2890] package/gnupg2: fix build without ldap Buildroot commit 8f1418b5dd80809dc90196d967d8d9665b794c8e bumped the version of gnupg2 on the next branch causing a build error: server.c:(.text+0xbf8): undefined reference to `ks_ldap_help_variables' Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...he-call-of-ks_ldap_help_variables-wh.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch diff --git a/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch b/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch new file mode 100644 index 000000000000..53dd39cf474c --- /dev/null +++ b/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch @@ -0,0 +1,36 @@ +From dc13361524c1477b2106c7385f2059f9ea111b84 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Wed, 5 Jul 2023 09:29:54 +0900 +Subject: [PATCH] dirmngr: Enable the call of ks_ldap_help_variables when + USE_LDAP. + +* dirmngr/server.c [USE_LDAP] (cmd_ad_query): Conditionalize. + +-- + +Signed-off-by: NIIBE Yutaka + +Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=dc13361524c1477b2106c7385f2059f9ea111b84 + +Signed-off-by: Bernd Kuhls +--- + dirmngr/server.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dirmngr/server.c b/dirmngr/server.c +index 51a149cb2..ee61f63d6 100644 +--- a/dirmngr/server.c ++++ b/dirmngr/server.c +@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char *line) + + if (opt_help) + { ++#if USE_LDAP + ks_ldap_help_variables (ctrl); ++#endif + err = 0; + goto leave; + } +-- +2.11.0 + From 6d8deb4b23ee57a69308bcdc5ceafa02aacc1edd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 22 Aug 2023 09:45:11 +0200 Subject: [PATCH 1709/2890] package/gmp: fix compile error for riscv In commit 87b2a30319394c2cc79efae1af7833cad8c62b32 gmp got updated to 6.2.1, since then the compile error exist. Compile error looks like this: tmp-mul_1.s: Assembler messages: tmp-mul_1.s:55: Error: unrecognized opcode `mul a5,a7,a3' tmp-mul_1.s:57: Error: unrecognized opcode `mulhu a7,a7,a3' Patch should be backported to stable branches. Fixes: - http://autobuild.buildroot.net/results/2f2/2f2112bea73adbf49eabb62fe6cda6a9cd5d0567 - http://autobuild.buildroot.net/results/566/566a4945555b781ed127997176f73b3c17ecab5d Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/gmp/gmp.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 9b402767fd8e..3b732dfa715e 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -23,6 +23,11 @@ ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CP GMP_CONF_OPTS += --disable-assembly endif +# GMP needs M extension for riscv assembly +ifeq ($(BR2_RISCV_ISA_CUSTOM_RVM),) +GMP_CONF_OPTS += --disable-assembly +endif + ifeq ($(BR2_INSTALL_LIBSTDCPP),y) GMP_CONF_OPTS += --enable-cxx else From 97c06c5b593a05716a3bd8941d2e208fa592cb38 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 22 Aug 2023 09:45:11 +0200 Subject: [PATCH 1710/2890] package/gmp: fix compile error for riscv In commit 87b2a30319394c2cc79efae1af7833cad8c62b32 gmp got updated to 6.2.1, since then the compile error exist. Compile error looks like this: tmp-mul_1.s: Assembler messages: tmp-mul_1.s:55: Error: unrecognized opcode `mul a5,a7,a3' tmp-mul_1.s:57: Error: unrecognized opcode `mulhu a7,a7,a3' Patch should be backported to stable branches. Fixes: - http://autobuild.buildroot.net/results/2f2/2f2112bea73adbf49eabb62fe6cda6a9cd5d0567 - http://autobuild.buildroot.net/results/566/566a4945555b781ed127997176f73b3c17ecab5d Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/gmp/gmp.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index c52a5214a6bd..1a50b0bf6986 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -20,6 +20,11 @@ ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CP GMP_CONF_OPTS += --disable-assembly endif +# GMP needs M extension for riscv assembly +ifeq ($(BR2_RISCV_ISA_RVM),) +GMP_CONF_OPTS += --disable-assembly +endif + ifeq ($(BR2_INSTALL_LIBSTDCPP),y) GMP_CONF_OPTS += --enable-cxx else From 07c48f5cbafc28f185b12d7a08a7a51a1e9e1731 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 14 Aug 2023 16:21:06 +0200 Subject: [PATCH 1711/2890] package/uuu: bump to version 1.5.125 Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.125 The changes to README.md are not related to license modifications. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/uuu/uuu.hash | 4 ++-- package/uuu/uuu.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index f42e92a3793b..574cb48a3c28 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 6c99b82c55202f43583dc41198225dea7d5b050e33e13946751911e473aed4a5 uuu_source-uuu_1.5.109.tar.gz +sha256 085d7f6308ee6b77dfb131fac40704575525adf6da45cdc446c00a0b29e4c21a uuu_source-uuu_1.5.125.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE -sha256 f68fb8c8002c797a14e63f91963ac247034fdfd44275e4f4a3226111cd0423db README.md +sha256 52a715c7443f269ddeba360abd70694879e120213926553a000e9be9373ea731 README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 14a8a5ef025d..5f3271066f81 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.109 +UUU_VERSION = 1.5.125 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License From 8ed8f0031908087e524550a19613b7e93ee7fbc3 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Sat, 12 Aug 2023 23:54:46 +0200 Subject: [PATCH 1712/2890] package/libusb-compat: bump to 0.1.8 Removing upstreamed patch and force autoreconf Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-fix-a-build-issue-on-linux.patch | 32 ------------------- package/libusb-compat/libusb-compat.hash | 2 +- package/libusb-compat/libusb-compat.mk | 5 ++- 4 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 package/libusb-compat/0001-fix-a-build-issue-on-linux.patch diff --git a/.checkpackageignore b/.checkpackageignore index 88fe914d4a2b..356f181e7657 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -805,7 +805,6 @@ package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch Upstre package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch Upstream package/liburcu/0002-fix-don-t-use-C-thread_local-on-MacOs.patch Upstream package/liburcu/0003-Always-use-__thread-for-Thread-local-storage-except-on-MSVC.patch Upstream -package/libusb-compat/0001-fix-a-build-issue-on-linux.patch Upstream package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch Upstream package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch Upstream package/libuwsc/0002-fix-bad-indentation.patch Upstream diff --git a/package/libusb-compat/0001-fix-a-build-issue-on-linux.patch b/package/libusb-compat/0001-fix-a-build-issue-on-linux.patch deleted file mode 100644 index d2e26b321ce0..000000000000 --- a/package/libusb-compat/0001-fix-a-build-issue-on-linux.patch +++ /dev/null @@ -1,32 +0,0 @@ -From af07587e8775c25450cda8ba9e9a8b1a58072634 Mon Sep 17 00:00:00 2001 -From: Bartosz Golaszewski -Date: Mon, 3 Jul 2017 15:55:00 +0200 -Subject: [PATCH] fix a build issue on linux - -On linux PATH_MAX is defined in linux/limits.h. If we include usb.h -without previously having indirectly included it, the build fails. - -Signed-off-by: Bartosz Golaszewski ---- - libusb/usb.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libusb/usb.h b/libusb/usb.h -index d2c30aa..7ad9a66 100644 ---- a/libusb/usb.h -+++ b/libusb/usb.h -@@ -41,6 +41,11 @@ typedef unsigned __int32 uint32_t; - #include - #endif - -+/* On linux PATH_MAX is defined in linux/limits.h. */ -+#if defined(__linux__) -+#include -+#endif -+ - /* - * USB spec information - * --- -2.9.3 - diff --git a/package/libusb-compat/libusb-compat.hash b/package/libusb-compat/libusb-compat.hash index 3acf3c3408c7..a198e76058b9 100644 --- a/package/libusb-compat/libusb-compat.hash +++ b/package/libusb-compat/libusb-compat.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8259f8d5b084fe43c47823a939e955e0ba21942b8d112266c39d228cc14764d6 libusb-compat-0.1.7.tar.bz2 +sha256 698c76484f3dec1e0175067cbd1556c3021e94e7f2313ae3ea6a66d900e00827 libusb-compat-0.1.8.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk index 7c87b3c9d8cf..d49b75367036 100644 --- a/package/libusb-compat/libusb-compat.mk +++ b/package/libusb-compat/libusb-compat.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_COMPAT_VERSION_MAJOR = 0.1 -LIBUSB_COMPAT_VERSION = $(LIBUSB_COMPAT_VERSION_MAJOR).7 +LIBUSB_COMPAT_VERSION = $(LIBUSB_COMPAT_VERSION_MAJOR).8 LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2 LIBUSB_COMPAT_SITE = https://github.com/libusb/libusb-compat-0.1/releases/download/v$(LIBUSB_COMPAT_VERSION) LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb @@ -14,6 +14,9 @@ LIBUSB_COMPAT_INSTALL_STAGING = YES LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config LIBUSB_COMPAT_LICENSE = LGPL-2.1+ LIBUSB_COMPAT_LICENSE_FILES = COPYING +# 0.1.8 tarball was released without configure script by upstream +# discussed here: https://github.com/libusb/libusb-compat-0.1/issues/28 +LIBUSB_COMPAT_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),) LIBUSB_COMPAT_CONF_ENV += \ From be5e4a170823c94ebe3930b1a8069521d7fa96e7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Aug 2023 15:27:27 +0200 Subject: [PATCH 1713/2890] package/libxcrypt: bump version to 4.4.36 See the NEWS here: https://github.com/besser82/libxcrypt/blob/develop/NEWS Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/libxcrypt/libxcrypt.hash | 2 +- package/libxcrypt/libxcrypt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index c13685e46332..f021436b71a7 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0a0c06bcd028fd0f0467f89f6a451112e8ec97c36e0f58e7464449a4c04607ed libxcrypt-4.4.33.tar.gz +sha256 b979838d5f1f238869d467484793b72b8bca64c4eae696fdbba0a9e0b6c28453 libxcrypt-4.4.36.tar.gz sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 079445e48976..9ad030fbd21d 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.33 +LIBXCRYPT_VERSION = 4.4.36 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB From f5573b8a04a58ffd8154fc61632bd28641fc14e8 Mon Sep 17 00:00:00 2001 From: Yu Chien Peter Lin Date: Tue, 15 Aug 2023 13:43:27 +0800 Subject: [PATCH 1714/2890] configs/andes_ae350_45: enable RISC-V atomic extension Let's select the RVA option as Andes 45-series CPUs support IMAFDC extensions. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Thomas Petazzoni --- configs/andes_ae350_45_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig index 21b2d01a9aa1..a60c4b25a0e0 100644 --- a/configs/andes_ae350_45_defconfig +++ b/configs/andes_ae350_45_defconfig @@ -1,6 +1,7 @@ BR2_riscv=y BR2_riscv_custom=y BR2_RISCV_ISA_RVM=y +BR2_RISCV_ISA_RVA=y BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_RVC=y From d5ed5799713588acc2a4c40645909a01b770bedd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Aug 2023 18:26:44 +0200 Subject: [PATCH 1715/2890] configs/qemu*: bump kernel to 6.1.44 All defconfigs were runtime tested in Qemu 8.0.3. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- configs/qemu_aarch64_ebbr_defconfig | 2 +- configs/qemu_aarch64_sbsa_defconfig | 2 +- configs/qemu_aarch64_virt_defconfig | 2 +- configs/qemu_arm_ebbr_defconfig | 2 +- configs/qemu_arm_versatile_defconfig | 2 +- configs/qemu_arm_vexpress_defconfig | 2 +- configs/qemu_arm_vexpress_tz_defconfig | 2 +- configs/qemu_m68k_mcf5208_defconfig | 2 +- configs/qemu_m68k_q800_defconfig | 2 +- configs/qemu_microblazebe_mmu_defconfig | 2 +- configs/qemu_microblazeel_mmu_defconfig | 2 +- configs/qemu_mips32r2_malta_defconfig | 2 +- configs/qemu_mips32r2el_malta_defconfig | 2 +- configs/qemu_mips32r6_malta_defconfig | 2 +- configs/qemu_mips32r6el_malta_defconfig | 2 +- configs/qemu_mips64_malta_defconfig | 2 +- configs/qemu_mips64el_malta_defconfig | 2 +- configs/qemu_mips64r6_malta_defconfig | 2 +- configs/qemu_mips64r6el_malta_defconfig | 2 +- configs/qemu_nios2_10m50_defconfig | 2 +- configs/qemu_or1k_defconfig | 2 +- configs/qemu_ppc64_e5500_defconfig | 2 +- configs/qemu_ppc64_pseries_defconfig | 2 +- configs/qemu_ppc64le_powernv8_defconfig | 2 +- configs/qemu_ppc64le_pseries_defconfig | 2 +- configs/qemu_ppc_bamboo_defconfig | 2 +- configs/qemu_ppc_e500mc_defconfig | 2 +- configs/qemu_ppc_g3beige_defconfig | 2 +- configs/qemu_ppc_mac99_defconfig | 2 +- configs/qemu_ppc_mpc8544ds_defconfig | 2 +- configs/qemu_riscv32_virt_defconfig | 2 +- configs/qemu_riscv64_nommu_virt_defconfig | 2 +- configs/qemu_riscv64_virt_defconfig | 2 +- configs/qemu_s390x_defconfig | 2 +- configs/qemu_sh4_r2d_defconfig | 2 +- configs/qemu_sh4eb_r2d_defconfig | 2 +- configs/qemu_sparc64_sun4u_defconfig | 2 +- configs/qemu_x86_64_defconfig | 2 +- configs/qemu_x86_defconfig | 2 +- configs/qemu_xtensa_lx60_defconfig | 2 +- configs/qemu_xtensa_lx60_nommu_defconfig | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index 099934324c0b..c858572bbfba 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 1eff46893533..5acfaea77740 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -22,7 +22,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 74e6b8431a63..116706030835 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index dbdde892be9b..d6a92a1d6839 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 10290311826d..7c93ae3e7ec3 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 743dc0479a80..ccbcc8ea4efb 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -25,7 +25,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 3cd666fb4d0f..11a5c9817485 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -22,7 +22,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index d6dd8bd1b79e..e35f3546fed4 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch" diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index a6444103c9ce..a3a09ef775ae 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch" diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 96b9dce41cd5..e02b8dae2f7d 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 5c2e4ba3d422..146bbb67de35 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index bf4ce4f704f8..1fdc58899840 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index fadb94ad71e6..35d071010db0 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index e52b8a54080c..a57347d2a680 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index f9ed35eb9577..9fb82a76d2ef 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index 8616d689e668..f314b123a8eb 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index e7d1a730dfae..672c416a091c 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index e9bf26c08795..15dba14cc612 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 28de05345ba7..39b9c73bcd90 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index a9fbf4ce150c..698ff68e5eb7 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 37b980a9bd51..4f1030b35f13 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -18,7 +18,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 6839f2f0bac9..8e68fae3c25b 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -16,7 +16,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 896d2096759f..4bc9534166ad 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index e23fcd469592..4975a90bc6e3 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index fa8e2a09d3c6..1cca03053b3a 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index 83a657dcbdd2..284982cf2c08 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index 124f6f247aa4..e50484f5a3cc 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -16,7 +16,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index d2741d7dfb09..6c14a1ca9027 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index eda116afd60b..33b9ec0d63f7 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 6d8a214e05a3..efbc5fc81dda 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 03c871282e56..74a67400ea5f 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index 6d84844e8502..2a0aea01d703 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 666500d88913..52ad87fa7c46 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 4853cd0897ad..39dae4be2a75 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -18,7 +18,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index f07e352367f1..038a9763c3b5 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index 9753ebc951a5..a8988d44462d 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index ccc6cce3c163..8a6115541132 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 0d1955291c4d..9e99d9d2b251 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -21,7 +21,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 19eb9360df82..5c6bebd3e3c0 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -22,7 +22,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 6bfda227756b..8dcdced01be4 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -21,7 +21,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index 80d17d3e5a4e..c3224576f76b 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -25,7 +25,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From c66f26a12db322d9d40991098ba6d243bea47884 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 14 Aug 2023 19:00:13 +0200 Subject: [PATCH 1716/2890] package/chrony: bump to version 4.4 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/chrony/chrony.hash | 4 ++-- package/chrony/chrony.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash index 9c0e11757ba1..2cf6cca031b6 100644 --- a/package/chrony/chrony.hash +++ b/package/chrony/chrony.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://download.tuxfamily.org/chrony/chrony-4.3-tar-gz-asc.txt -sha256 9d0da889a865f089a5a21610ffb6713e3c9438ce303a63b49c2fb6eaff5b8804 chrony-4.3.tar.gz +# https://download.tuxfamily.org/chrony/chrony-4.4-tar-gz-asc.txt +sha256 eafb07e6daf92b142200f478856dfed6efc9ea2d146eeded5edcb09b93127088 chrony-4.4.tar.gz # Locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 86f23d906056..e7e6931a2a84 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHRONY_VERSION = 4.3 +CHRONY_VERSION = 4.4 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING From 5a4429a6dddafb6d6ed2aa3db5e4590bfae43d45 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Aug 2023 15:10:16 +0200 Subject: [PATCH 1717/2890] package/zlib-ng: handle power9 cpu, fix compile error Zlib-ng misdetects the powerpc cpu and the package fails to compile for non-power9 cpu's. Power9 support was added Upstream in commit: 02d10b252cc54159f7c33823048daec4b023fb22 So it was introduced in zlib-ng 2.1.3 and this was added to Buildroot in commit 0df456ea6e05306fb077e96064adf68f3863eeea. So there is no need to backport it to older Buildroot releases. Fixes: - http://autobuild.buildroot.net/results/a9f/a9f45486664b2d5b23a2f330a63955a06ae8189d Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/zlib-ng/zlib-ng.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index 23f1bd215872..fbb906503ac0 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -35,4 +35,10 @@ else ZLIB_NG_CONF_OPTS += -DWITH_POWER8=OFF endif +ifeq ($(BR2_powerpc_power9),y) +ZLIB_NG_CONF_OPTS += -DWITH_POWER9=ON +else +ZLIB_NG_CONF_OPTS += -DWITH_POWER9=OFF +endif + $(eval $(cmake-package)) From 290f3985ddea38887818bd982cdb153f5698cdb1 Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Mon, 14 Aug 2023 16:57:58 +0200 Subject: [PATCH 1718/2890] package/libiio: bump to version v0.25 The changelog is available here: https://github.com/analogdevicesinc/libiio/releases/tag/v0.25 Remove the 0001 patch as it is included in the v0.25 version. Signed-off-by: Paul Cercueil Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-iiod-serial.c-fix-sparc-build.patch | 76 ------------------- package/libiio/libiio.hash | 2 +- package/libiio/libiio.mk | 2 +- 4 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 package/libiio/0001-iiod-serial.c-fix-sparc-build.patch diff --git a/.checkpackageignore b/.checkpackageignore index 356f181e7657..5303a8f3d816 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -700,7 +700,6 @@ package/libhid/0002-no-newline-in-ldflags.patch Upstream package/libhid/0003-uclinux.patch Upstream package/libical/0001-no-tests.patch Upstream package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch Upstream -package/libiio/0001-iiod-serial.c-fix-sparc-build.patch Upstream package/libiio/S99iiod Shellcheck Variables package/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch Upstream package/libiqrf/0002-use-only-c-language.patch Upstream diff --git a/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch b/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch deleted file mode 100644 index 1c2d606e631f..000000000000 --- a/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 40ffc5d9b8f6e47866292bf1365ac3a5d22cf123 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 25 Sep 2022 11:19:18 +0200 -Subject: [PATCH] iiod/serial.c: fix sparc build - -Fix the following sparc build failure raised since version 0.24 and -https://github.com/analogdevicesinc/libiio/commit/2d3cae005f364742b3a9e7234d15b2fd2cbac664: - -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c: In function 'serial_configure': -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B2500000' undeclared (first use in this function); did you mean 'B1500000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:127:9: note: in expansion of macro 'CASE_BPS' - 127 | CASE_BPS(2500000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: note: each undeclared identifier is reported only once for each function it appears in - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:127:9: note: in expansion of macro 'CASE_BPS' - 127 | CASE_BPS(2500000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B3000000' undeclared (first use in this function); did you mean 'B1000000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:128:9: note: in expansion of macro 'CASE_BPS' - 128 | CASE_BPS(3000000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B3500000' undeclared (first use in this function); did you mean 'B1500000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:129:9: note: in expansion of macro 'CASE_BPS' - 129 | CASE_BPS(3500000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B4000000' undeclared (first use in this function); did you mean 'B1000000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:130:9: note: in expansion of macro 'CASE_BPS' - 130 | CASE_BPS(4000000, &tty_attrs); - | ^~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/8a9902f6eddaab812ebce3506ed6de686f647e02 - -Signed-off-by: Fabrice Fontaine -[yann.morin.1998@free.fr: actual backport now that upstream accepted it] -Signed-off-by: Yann E. MORIN ---- - iiod/serial.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/iiod/serial.c b/iiod/serial.c -index f829361d..b140d051 100644 ---- a/iiod/serial.c -+++ b/iiod/serial.c -@@ -124,10 +124,18 @@ static int serial_configure(int fd, unsigned int uart_bps, - CASE_BPS(1152000, &tty_attrs); - CASE_BPS(1500000, &tty_attrs); - CASE_BPS(2000000, &tty_attrs); -+#ifdef B2500000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(2500000, &tty_attrs); -+#endif -+#ifdef B3000000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(3000000, &tty_attrs); -+#endif -+#ifdef B3500000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(3500000, &tty_attrs); -+#endif -+#ifdef B4000000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(4000000, &tty_attrs); -+#endif - default: - IIO_ERROR("Invalid baud rate\n"); - return -EINVAL; --- -2.25.1 - diff --git a/package/libiio/libiio.hash b/package/libiio/libiio.hash index f497756eace0..0f024af78c58 100644 --- a/package/libiio/libiio.hash +++ b/package/libiio/libiio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a2b5d848531ea64fd9f95327dfd5a588bd227d9577281ec375e822702c6a52d5 libiio-0.24.tar.gz +sha256 21972599a3c143ab1f98002ad2b3f28f4aff927fde5f677478311cd4e517730c libiio-0.25.tar.gz sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 9e2cf454b531..733a0c90ed38 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIIO_VERSION = 0.24 +LIBIIO_VERSION = 0.25 LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION)) LIBIIO_INSTALL_STAGING = YES LIBIIO_LICENSE = LGPL-2.1+ From 6b3d0c5adb9a2d213b6e4dee2c412c2994649e60 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 13 Aug 2023 19:25:24 +0200 Subject: [PATCH 1719/2890] package/ramspeed: disable package if affected from gcc bug 43744 This package is affected by gcc bug 43744 and I have not found a work around for it(i.e. the common -O0 we use or other), so let's disable it if gcc has such bug. Fixes: http://autobuild.buildroot.net/results/ab289769c5fea435934ed260d38e0a4fdd2ba72d Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/ramspeed/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ramspeed/Config.in b/package/ramspeed/Config.in index b236329a84d1..bd0438ffe1e8 100644 --- a/package/ramspeed/Config.in +++ b/package/ramspeed/Config.in @@ -1,5 +1,9 @@ +comment "ramspeed needs a toolchain not affected by GCC bug 43744" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 + config BR2_PACKAGE_RAMSPEED bool "ramspeed" + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 help RAMspeed is a free open source command line utility to measure cache and memory performance. From 49a37916a8e1d60cfa763057927387d6f8d23998 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 12 Aug 2023 23:20:32 +0200 Subject: [PATCH 1720/2890] package/esp-hosted: fix build failure with missing CONFIG_SPI/MMC Depending on the interface chosen we need to enable Linux CONFIG_SPI or CONFIG_MMC, so let's do that according to BR2_PACKAGE_ESP_HOSTED_SPI. Fixes: http://autobuild.buildroot.net/results/cdf65ad07aba1d86f195576a2317c83aeb3dfce2 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/esp-hosted/esp-hosted.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index dcb0b3bd7032..7491c465127c 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -17,6 +17,9 @@ define ESP_HOSTED_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) $(call KCONFIG_ENABLE_OPT,CONFIG_MAC80211) $(call KCONFIG_ENABLE_OPT,CONFIG_BT) + $(if $(BR2_PACKAGE_ESP_HOSTED_SPI), + $(call KCONFIG_ENABLE_OPT,CONFIG_SPI), + $(call KCONFIG_ENABLE_OPT,CONFIG_MMC)) endef ifeq ($(BR2_PACKAGE_ESP_HOSTED_SPI),y) From c93788350aa04a19884638ffa3c24446572d8169 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 10 Aug 2023 00:05:14 +0200 Subject: [PATCH 1721/2890] package/swupdate: install headers at the standard location In commit eb2f2886b2364e5b6a0867f55106bf83acb064e7 ("package/swupdate: add staging install"), the swupdate package was changed to also be installed in the staging directory, as it provides an API to external programs, through libraries and headers. Back then the commit log said: This patch installs headers and libs to STAGING_DIR, to prevent a header name collision a subdirectory /usr/include/swupdate creates. And indeed a custom INCLUDEDIR was specified. However, installing swupdate headers in /usr/include/swupdate/ doesn't work well, as progress_ipc.h (installed by swupdate) does a #include , which doesn't work as swupdate_status.h is also in /usr/include/swupdate/ instead of /usr/include/. To address this Daniel Lang submitted a patch [0], which was proposed to upstream swupdate to fix this header inclusion. The patch was rejected by upstream saying that the swupdate header files should be installed in /usr/include. Currently, swupdate installs only 3 headers files: /usr/include/network_ipc.h /usr/include/swupdate_status.h /usr/include/progress_ipc.h To the best of our knowledge, this doesn't conflict with any other header files installed by other packages. A good proof of that is that even Debian (which has many more packages than Buildroot) also installs swupdate headers directly in /usr/include. In addition, the original submitter of eb2f2886b2364e5b6a0867f55106bf83acb064e7 said "I'm not remember what was a problem. Probably network_ipc.h but Im not sure now. I think it's safe to install this headers to /usr/include w/o subdir if this collision was met only in my environment. PS: currently I don't see any collisions with this files." So, we switch to installing swupdate into their standard location. [0] https://patchwork.ozlabs.org/project/buildroot/patch/VI1P190MB0493D233ECC579510F8C0FC69FB29@VI1P190MB0493.EURP190.PROD.OUTLOOK.COM/ Signed-off-by: Thomas Petazzoni Tested-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 11a394675314..84905d2e0a69 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -230,7 +230,7 @@ endef define SWUPDATE_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ $(SWUPDATE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) \ - INCLUDEDIR=/usr/include/swupdate install + install endef define SWUPDATE_INSTALL_TARGET_CMDS From 8789ea3ad0b91755223105b92808c9f90a38e85d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 9 Aug 2023 22:54:32 +0200 Subject: [PATCH 1722/2890] package/kmscube: bump to latest commit ea6c5d1e Changes since commit 4660a7dc, see: https://gitlab.freedesktop.org/mesa/kmscube/-/commits/ea6c5d1eeefbfb0a1c27ab74a6e4621f1d9adf4c Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/kmscube/kmscube.hash | 2 +- package/kmscube/kmscube.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kmscube/kmscube.hash b/package/kmscube/kmscube.hash index cb7abd48ea02..e5ca6e72ecd6 100644 --- a/package/kmscube/kmscube.hash +++ b/package/kmscube/kmscube.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ec135069d8bee7f4fe38cb9dc96fbbd56e0057290fa25eff8b5b314ee473c502 kmscube-4660a7dca6512b6e658759d00cff7d4ad2a2059d.tar.gz +sha256 c7e7fd7ebcd59a5a57b717ba309a25b73e8028ed4f6bc95bd87e3b7ad5732834 kmscube-ea6c5d1eeefbfb0a1c27ab74a6e4621f1d9adf4c.tar.gz sha256 f622099ab0d274133f6e62d5fccfe970b61134d80ed036f45f8cf1e90c3d5a05 COPYING diff --git a/package/kmscube/kmscube.mk b/package/kmscube/kmscube.mk index fc9a7f6f99a0..699af0b6c4f1 100644 --- a/package/kmscube/kmscube.mk +++ b/package/kmscube/kmscube.mk @@ -4,7 +4,7 @@ # ################################################################################ -KMSCUBE_VERSION = 4660a7dca6512b6e658759d00cff7d4ad2a2059d +KMSCUBE_VERSION = ea6c5d1eeefbfb0a1c27ab74a6e4621f1d9adf4c KMSCUBE_SITE = https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION) KMSCUBE_LICENSE = MIT KMSCUBE_LICENSE_FILES = COPYING From 29d8ce9c4130a3e4fb3fdf8ce0bfd896979072c8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 9 Aug 2023 22:54:33 +0200 Subject: [PATCH 1723/2890] package/kmscube: add optional dependency to libpng kmscube libpng support was added in: https://gitlab.freedesktop.org/mesa/kmscube/-/commit/a09d38f94e27dcc5fe52adf99404c821028e3e9d Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/kmscube/kmscube.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/kmscube/kmscube.mk b/package/kmscube/kmscube.mk index 699af0b6c4f1..a47df74f7bd3 100644 --- a/package/kmscube/kmscube.mk +++ b/package/kmscube/kmscube.mk @@ -10,4 +10,10 @@ KMSCUBE_LICENSE = MIT KMSCUBE_LICENSE_FILES = COPYING KMSCUBE_DEPENDENCIES = host-pkgconf libdrm libegl libgbm libgles +ifeq ($(BR2_PACKAGE_LIBPNG),y) +KMSCUBE_DEPENDENCIES += libpng +# libpng is automatically detected in meson, there is no build +# configuration option to pass. +endif + $(eval $(meson-package)) From d06ca392909d1c03e1e471dc7ae401b3ee73a5fc Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 9 Aug 2023 22:54:34 +0200 Subject: [PATCH 1724/2890] package/kmscube: add optional gstreamer support kmscube has a gstreamer video texture input since: https://gitlab.freedesktop.org/mesa/kmscube/-/commit/961c85f6eb42e4445513044c9944c83a0d9cb324 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/kmscube/Config.in | 14 ++++++++++++++ package/kmscube/kmscube.mk | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/package/kmscube/Config.in b/package/kmscube/Config.in index 7379675609d9..f68f38b7a826 100644 --- a/package/kmscube/Config.in +++ b/package/kmscube/Config.in @@ -11,6 +11,20 @@ config BR2_PACKAGE_KMSCUBE https://cgit.freedesktop.org/mesa/kmscube/ +if BR2_PACKAGE_KMSCUBE + +config BR2_PACKAGE_KMSCUBE_GSTREAMER + bool "Enable gstreamer video support" + depends on BR2_USE_WCHAR # glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + select BR2_PACKAGE_GSTREAMER1 + +endif + comment "kmscube needs EGL, GBM and OpenGL ES, and a toolchain w/ thread support" depends on \ !BR2_PACKAGE_HAS_LIBEGL || \ diff --git a/package/kmscube/kmscube.mk b/package/kmscube/kmscube.mk index a47df74f7bd3..eeb22061fb31 100644 --- a/package/kmscube/kmscube.mk +++ b/package/kmscube/kmscube.mk @@ -10,6 +10,13 @@ KMSCUBE_LICENSE = MIT KMSCUBE_LICENSE_FILES = COPYING KMSCUBE_DEPENDENCIES = host-pkgconf libdrm libegl libgbm libgles +ifeq ($(BR2_PACKAGE_KMSCUBE_GSTREAMER),y) +KMSCUBE_DEPENDENCIES += gst1-plugins-base gstreamer1 libglib2 +KMSCUBE_CONF_OPTS += -Dgstreamer=enabled +else +KMSCUBE_CONF_OPTS += -Dgstreamer=disabled +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) KMSCUBE_DEPENDENCIES += libpng # libpng is automatically detected in meson, there is no build From 9c61470c4bc0c88dbaba49468ee8cc4c983d2604 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 8 Aug 2023 08:54:49 +0200 Subject: [PATCH 1725/2890] package/mpg123: fix linking error due to undefined symbol This was introduced since commit f8af24707b196eb64121d29a829fc31b5506409c, which bumped mpg123 from 1.25.15 to 1.31.3. Patch was provided by upstream: https://sourceforge.net/p/mpg123/bugs/353/ Fixes: http://autobuild.buildroot.net/results/74e1522cc9328c98186ca730eeb7ce0cb5fbbcb5 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/mpg123/0001-mpg123-buildfix.patch | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 package/mpg123/0001-mpg123-buildfix.patch diff --git a/package/mpg123/0001-mpg123-buildfix.patch b/package/mpg123/0001-mpg123-buildfix.patch new file mode 100644 index 000000000000..cc731ea9679c --- /dev/null +++ b/package/mpg123/0001-mpg123-buildfix.patch @@ -0,0 +1,24 @@ +Signed-off-by: Waldemar Brodkorb +Upstream: https://sourceforge.net/p/mpg123/bugs/353/ + +diff -Nur mpg123-1.31.3.orig/src/libmpg123/getcpuflags.h mpg123-1.31.3/src/libmpg123/getcpuflags.h +--- mpg123-1.31.3.orig/src/libmpg123/getcpuflags.h 2023-03-15 09:02:58.000000000 +0100 ++++ mpg123-1.31.3/src/libmpg123/getcpuflags.h 2023-08-07 15:57:19.444106173 +0200 +@@ -44,6 +44,8 @@ + + unsigned int getcpuflags(struct cpuflags* cf); + ++#if ((defined OPT_X86) || (defined OPT_X86_64) || (defined OPT_NEON) || (defined OPT_NEON64)) && (defined OPT_MULTI) ++ + #ifdef WANT_GETCPUFLAGS + #include + // Wrapper needed for ignorant clang memory sanitizer that chokes +@@ -55,8 +57,6 @@ + } + #endif + +-#if ((defined OPT_X86) || (defined OPT_X86_64) || (defined OPT_NEON) || (defined OPT_NEON64)) && (defined OPT_MULTI) +- + // We really evaluate the CPU flags. + #define OPT_CPU_FLAGS + From 7b29c67e97072229fe5f836f51fa7a3a1f1db0aa Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 23 Aug 2023 08:25:38 +0200 Subject: [PATCH 1726/2890] package/util-linux: drop superfluous patch after merge In commit 2423d9f16b26 (Merge tag '2023.08-rc2' into next), we missed the fact that util-linux on next is a newer version than on master, version which includes the patch we backported on master. Unsurprisingly, that patch no longer applies; drop it. Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .../0001-libmount-ifdef-statx-call.patch | 57 ------------------- 1 file changed, 57 deletions(-) delete mode 100644 package/util-linux/0001-libmount-ifdef-statx-call.patch diff --git a/package/util-linux/0001-libmount-ifdef-statx-call.patch b/package/util-linux/0001-libmount-ifdef-statx-call.patch deleted file mode 100644 index ba44650bd3d0..000000000000 --- a/package/util-linux/0001-libmount-ifdef-statx-call.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c0136ac0c98b18208508fbcfac31a843e0bb8a37 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 3 Aug 2023 12:39:19 +0200 -Subject: [PATCH] libmount: ifdef statx() call - -In this case the statx() is use to get mount ID. It's optional and not -required. Let's #ifdef the statx() call and also check for stx_mnt_id -struct member. - -Fixes: https://github.com/util-linux/util-linux/issues/2415 -Signed-off-by: Karel Zak -Signed-off-by: Waldemar Brodkorb -Upstream: https://github.com/util-linux/util-linux/commit/c0136ac0c98b18208508fbcfac31a843e0bb8a37 ---- - configure.ac | 5 ++++- - libmount/src/hook_mount.c | 2 ++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a3cf330b5..ae721c7ac 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -525,7 +525,10 @@ AC_CHECK_MEMBERS([struct termios.c_line],,, - [[#include ]]) - - AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec],,, -- [#include ]) -+ [[#include ]]) -+ -+AC_CHECK_MEMBERS([struct statx.stx_mnt_id],,, -+ [[#include ]]) - - AC_CHECK_DECLS([_NL_TIME_WEEK_1STDAY],[],[],[[#include ]]) - -diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c -index d69a018ec..056338c49 100644 ---- a/libmount/src/hook_mount.c -+++ b/libmount/src/hook_mount.c -@@ -294,6 +294,7 @@ static int hook_create_mount(struct libmnt_context *cxt, - /* cleanup after fail (libmount may only try the FS type) */ - close_sysapi_fds(api); - -+#if defined(HAVE_STRUCT_STATX) && defined(HAVE_STRUCT_STATX_STX_MNT_ID) - if (!rc && cxt->fs) { - struct statx st; - -@@ -306,6 +307,7 @@ static int hook_create_mount(struct libmnt_context *cxt, - fs->id = cxt->fs->id; - } - } -+#endif - - done: - DBG(HOOK, ul_debugobj(hs, "create FS done [rc=%d, id=%d]", rc, cxt->fs ? cxt->fs->id : -1)); --- -2.39.2 - From 3f46db39e62a5b84ca4cd938d07ca7aa49edfc88 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 24 Aug 2023 07:02:26 +0200 Subject: [PATCH 1727/2890] package/gmp: guard riscv definition In commit 30997eaa65438a2ce726ad8a204ac5a36363f5c8 a mistake was made. Guard the definition correctly. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/gmp/gmp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 3b732dfa715e..a077c89d9277 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -24,7 +24,7 @@ GMP_CONF_OPTS += --disable-assembly endif # GMP needs M extension for riscv assembly -ifeq ($(BR2_RISCV_ISA_CUSTOM_RVM),) +ifeq ($(BR2_riscv):$(BR2_RISCV_ISA_CUSTOM_RVM),y:) GMP_CONF_OPTS += --disable-assembly endif From 670329f057b656be06b217fab411d90695988b41 Mon Sep 17 00:00:00 2001 From: Frank Vanbever Date: Wed, 23 Aug 2023 16:53:00 +0200 Subject: [PATCH 1728/2890] package/libmodsecurity: security bump to version 3.0.10 - Fixes CVE-2023-38285 [1] - Adapted 0001-configure.ac-drop-usage-of-git-at-configure-time.patch due to upstream moving to autoconf portable shell constructs. Signed-off-by: Frank Vanbever [1] https://www.trustwave.com/en-us/resources/blogs/spiderlabs-blog/modsecurity-v3-dos-vulnerability-in-four-transformations-cve-2023-38285/ Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- ...ac-drop-usage-of-git-at-configure-time.patch | 17 +++++++++-------- .../0002-modsecurity.pc.in-add-lstdc.patch | 5 +++-- package/libmodsecurity/libmodsecurity.hash | 4 ++-- package/libmodsecurity/libmodsecurity.mk | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch b/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch index 14767fb28eae..6853b19ccdb4 100644 --- a/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch +++ b/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch @@ -1,4 +1,4 @@ -From a2116312068b6b2c5732dfebde19b751cc81d4f3 Mon Sep 17 00:00:00 2001 +From d242b011a8f0d84781bbf7667a44a12646903ca4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Aug 2021 23:21:35 +0200 Subject: [PATCH] configure.ac: drop usage of git at configure time @@ -8,12 +8,13 @@ which is not very useful, and causes a significant number of warning when regenerating the configure script. Signed-off-by: Thomas Petazzoni +Signed-off-by: Frank Vanbever --- configure.ac | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/configure.ac b/configure.ac -index 20163e1e..14e5892a 100644 +index 66d6f4f2..746b1fb4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ @@ -46,7 +47,7 @@ index 20163e1e..14e5892a 100644 # Check for yajl -@@ -217,10 +208,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL]) +@@ -224,10 +215,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL]) MSC_VERSION=msc_version AC_SUBST([MSC_VERSION]) @@ -55,9 +56,9 @@ index 20163e1e..14e5892a 100644 - - AC_ARG_ENABLE(debug-logs, - [AC_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])], + [AS_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])], -@@ -412,16 +399,6 @@ AC_OUTPUT +@@ -419,16 +406,6 @@ AC_OUTPUT # Print a fancy summary @@ -66,14 +67,14 @@ index 20163e1e..14e5892a 100644 -echo "ModSecurity - ${MSC_GIT_VERSION} for $PLATFORM" -echo " " -echo " Mandatory dependencies" --echo -n " + libInjection ...." +-AS_ECHO_N(" + libInjection ....") -echo LIBINJECTION_VERSION --echo -n " + SecLang tests ...." +-AS_ECHO_N(" + SecLang tests ....") -echo SECLANG_TEST_VERSION - echo " " echo " Optional dependencies" -- -2.31.1 +2.39.2 diff --git a/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch b/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch index 6511e6f1e0b5..9e0b672c8dfe 100644 --- a/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch +++ b/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch @@ -1,4 +1,4 @@ -From 1a84881b280eb08852d5495c57e44351a40d3f91 Mon Sep 17 00:00:00 2001 +From 4129643d657b5d0cce83f9ec4ca27289fd69ec43 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 26 Jul 2021 00:24:57 +0200 Subject: [PATCH] modsecurity.pc.in: add -lstdc++ @@ -13,6 +13,7 @@ Fixes: - http://autobuild.buildroot.org/results/e5a9eb8448980f1c5cafe97180b7d1f48ddf02ca Signed-off-by: Fabrice Fontaine +Signed-off-by: Frank Vanbever --- modsecurity.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -28,5 +29,5 @@ index 96cdf5ca..7c895ddc 100644 -Libs.private: @CURL_LDADD@ @GEOIP_LDADD@ @MAXMIND_LDADD@ @GLOBAL_LDADD@ @LIBXML2_LDADD@ @LMDB_LDADD@ @LUA_LDADD@ @PCRE_LDADD@ @SSDEEP_LDADD@ @YAJL_LDADD@ +Libs.private: @CURL_LDADD@ @GEOIP_LDADD@ @MAXMIND_LDADD@ @GLOBAL_LDADD@ @LIBXML2_LDADD@ @LMDB_LDADD@ @LUA_LDADD@ @PCRE_LDADD@ @SSDEEP_LDADD@ @YAJL_LDADD@ -lstdc++ -- -2.30.2 +2.39.2 diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index c79ae1cf45d0..7bcf99e167a3 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.9/modsecurity-v3.0.9.tar.gz.sha256 -sha256 a5111ecd23e332a1d7c9652dbdb18517a96b21573315cb887a8e86761b95d3d8 modsecurity-v3.0.9.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.10/modsecurity-v3.0.10.tar.gz.sha256 +sha256 d5d459f7c2e57a69a405f3222d8e285de419a594b0ea8829058709962227ead0 modsecurity-v3.0.10.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 335f3a41e549..257f0a56df52 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.9 +LIBMODSECURITY_VERSION = 3.0.10 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES From 2b765178f41bed3720f16e9c850b0d0efc332531 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 23 Aug 2023 16:05:07 +0200 Subject: [PATCH 1729/2890] package/lua-silva: bump to version 0.2.0 diff COPYRIGHT: -Copyright (C) 2017-2021 Francois Perrad. +Copyright (C) 2017-2023 Francois Perrad Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-silva/lua-silva.hash | 4 ++-- package/lua-silva/lua-silva.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-silva/lua-silva.hash b/package/lua-silva/lua-silva.hash index 418c3e9e430d..3ceab6572bf6 100644 --- a/package/lua-silva/lua-silva.hash +++ b/package/lua-silva/lua-silva.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 0e656c42c71b64285d4a375fa7b8b1a910b05c4ab6d30f5b427b078fff204e1f lua-silva-0.1.8-1.src.rock -sha256 5b59ffbfc12d9d1cb907dd65b0f16d3453e1a43cc018c6128a00b00e08f6c485 lua-Silva-0.1.8/COPYRIGHT +sha256 fa838ed10b2e2c16f76fff9e47d52cde1f250efd73994865090d85218c2e5368 lua-silva-0.2.0-1.src.rock +sha256 638206532ac117ec92a04791045e274e6aa55c3d7f408cd2be993a00424c2f96 lua-Silva-0.2.0/COPYRIGHT diff --git a/package/lua-silva/lua-silva.mk b/package/lua-silva/lua-silva.mk index 91b1b7747676..809ac3dd2d77 100644 --- a/package/lua-silva/lua-silva.mk +++ b/package/lua-silva/lua-silva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_SILVA_VERSION = 0.1.8-1 +LUA_SILVA_VERSION = 0.2.0-1 LUA_SILVA_NAME_UPSTREAM = lua-Silva LUA_SILVA_LICENSE = MIT LUA_SILVA_LICENSE_FILES = $(LUA_SILVA_SUBDIR)/COPYRIGHT From bdaade3e34394aefe376d3578d598a863c2ba1a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Thu, 24 Aug 2023 17:09:48 +0200 Subject: [PATCH 1730/2890] package/network-manager: remove leftover comment about headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 0a8ef2f3f7bc211d38a5a37007bdeb489bd37aae bumped the headers version requirements, but did not update the associated comment. Remove the comment entirely, as it does not apply anymore. Signed-off-by: Raphaël Mélotte Signed-off-by: Thomas Petazzoni --- package/network-manager/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 37c4a79d1610..57d7543131a5 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_NETWORK_MANAGER depends on BR2_USE_MMU # dbus depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - # Tested with 3.2, but may even work with earlier versions depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_* depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 From 0389e298a65ae8d1bb96d55961a99d0cf1b4ee2a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 22 Aug 2023 21:16:34 +0200 Subject: [PATCH 1731/2890] package/libfuse3: bump to version 3.16.1 Let's drop local patch that has been upstreamed: https://github.com/libfuse/libfuse/commit/b58a0014bff619f1810af49441d987d732c4244e Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...est-applications-for-cross-compiler-.patch | 43 ------------------- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch diff --git a/package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch b/package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch deleted file mode 100644 index b99b4c23f4dc..000000000000 --- a/package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b58a0014bff619f1810af49441d987d732c4244e Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Tue, 13 Jun 2023 20:02:01 +1000 -Subject: [PATCH] Wrapper around test applications for cross compiler - environment in meson.build (#804) - -This enhances commit 7be56c57f93e3436b1fbd9ecc320de5c03a3e4b8 to allow build -fuse to be built using a cross compiler - -Fixes: -../meson.build:180:12: ERROR: Can not run test applications in this cross environment. - -Upstream: https://github.com/libfuse/libfuse/commit/b58a0014bff619f1810af49441d987d732c4244e - -Signed-off-by: Giulio Benetti ---- - meson.build | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index 7aa4e0d..9707ea3 100644 ---- a/meson.build -+++ b/meson.build -@@ -177,10 +177,12 @@ int main() - } - ''' - --result = cc.run(detect_getmntent_needs_unescape) --if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping' -- message('getmntent does not unescape') -- add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c') -+if not meson.is_cross_build() -+ result = cc.run(detect_getmntent_needs_unescape) -+ if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping' -+ message('getmntent does not unescape') -+ add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c') -+ endif - endif - - # Write private test results into fuse_config.h (stored in build directory) --- -2.34.1 - diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index 0397efc54295..e812bb81e821 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 cb93e170288804d2e83da9b69925d968655ed75883476773ba5268d08bb1d335 libfuse3-3.15.1.tar.gz +sha256 17c44c13f6a123c0c13d074fcf61c230a88531202a40c864187dee78f5851693 libfuse3-3.16.1.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index 32e35ff32ba9..a4b1f082662f 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.15.1 +LIBFUSE3_VERSION = 3.16.1 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE From 3cf1f2e6cb11a016bc8a569b001c535d351e7302 Mon Sep 17 00:00:00 2001 From: Yu Chien Peter Lin Date: Wed, 23 Aug 2023 11:07:45 +0800 Subject: [PATCH 1732/2890] configs/andes_ae350_45: use BR2_riscv_g As of upstream commit cbd91e89e43d600172c62fd1cbd33aa74d0a851a we can use the default BR2_riscv_g to select IMAFD extensions and still be able to enable additional extensions, such as the C extension in our cse. Suggested-by: Thomas Petazzoni Signed-off-by: Yu Chien Peter Lin Signed-off-by: Thomas Petazzoni --- configs/andes_ae350_45_defconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig index a60c4b25a0e0..fd8b7db0e74b 100644 --- a/configs/andes_ae350_45_defconfig +++ b/configs/andes_ae350_45_defconfig @@ -1,9 +1,4 @@ BR2_riscv=y -BR2_riscv_custom=y -BR2_RISCV_ISA_RVM=y -BR2_RISCV_ISA_RVA=y -BR2_RISCV_ISA_RVF=y -BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_RVC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" From ebe92f37a2c0db044a03d314da39eff8c237f909 Mon Sep 17 00:00:00 2001 From: Javad Rahimi Date: Tue, 15 Aug 2023 16:45:39 +0330 Subject: [PATCH 1733/2890] configs/orangepi_pc2: bump Linux version to 6.1.45 Signed-off-by: Thomas Petazzoni --- configs/orangepi_pc2_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig index 3de067ae54a2..753670494774 100644 --- a/configs/orangepi_pc2_defconfig +++ b/configs/orangepi_pc2_defconfig @@ -1,13 +1,13 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi PC2" BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.45" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-pc2" From 486664685d887773105ab323a4279b95411f683d Mon Sep 17 00:00:00 2001 From: Javad Rahimi Date: Tue, 15 Aug 2023 16:45:40 +0330 Subject: [PATCH 1734/2890] configs/orangepi_pc2: change /dev/ mangement to mdev This is needed to auto-load some kernel modules needed for the HW to work. Signed-off-by: Javad Rahimi Signed-off-by: Thomas Petazzoni --- configs/orangepi_pc2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig index 753670494774..a1fb9a112cc5 100644 --- a/configs/orangepi_pc2_defconfig +++ b/configs/orangepi_pc2_defconfig @@ -2,6 +2,7 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi PC2" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From d1c32c703bb730da2db7facf35c186fb1a6fe331 Mon Sep 17 00:00:00 2001 From: Javad Rahimi Date: Tue, 15 Aug 2023 16:45:41 +0330 Subject: [PATCH 1735/2890] configs/orangepi_pc2: bump ATF version to v2.9 Signed-off-by: Javad Rahimi Signed-off-by: Thomas Petazzoni --- configs/orangepi_pc2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig index a1fb9a112cc5..29939ea1fb2c 100644 --- a/configs/orangepi_pc2_defconfig +++ b/configs/orangepi_pc2_defconfig @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="128M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y From 037133271495159ccaeed9e9d53c4829b164ea9e Mon Sep 17 00:00:00 2001 From: Javad Rahimi Date: Tue, 15 Aug 2023 16:45:42 +0330 Subject: [PATCH 1736/2890] configs/orangepi_pc2: bump U-Boot version to 2023.04 Signed-off-by: Javad Rahimi Signed-off-by: Thomas Petazzoni --- configs/orangepi_pc2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig index 29939ea1fb2c..46d04b34c845 100644 --- a/configs/orangepi_pc2_defconfig +++ b/configs/orangepi_pc2_defconfig @@ -25,7 +25,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From 96a54b09074dfc7fc3c24997e1cfc50d6bd67015 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 22 Aug 2023 21:49:21 +0200 Subject: [PATCH 1737/2890] package/screen: security bump to version 4.9.1 See release announce: https://lists.gnu.org/archive/html/screen-users/2023-08/msg00000.html Fixes: CVE-2023-24626: https://www.cve.org/CVERecord?id=CVE-2023-24626 Note: Buildroot installs screen as setuid, so the described scenario in CVE applies. This commit also rebases all patches on this release. Patch were regenerated with 'git format-patch -N', so patch file name changed in this process. The file .checkpackageignore is also updated accordingly. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 12 +- ...-as-an-alternative-for-bcopy-memmov.patch} | 47 +++--- ...eate-backup-of-old-installed-binary.patch} | 9 +- ...ermission-flags-even-if-chown-fails.patch} | 11 +- ...g-SCREEN-to-get-a-non-versioned-bin.patch} | 11 +- ...0005-Renamed-sched.h-to-eventqueue.h.patch | 39 +++++ package/screen/0005-rename-sched_h.patch | 142 ------------------ ...> 0006-comm.h-now-depends-on-term.h.patch} | 20 +-- ...-needed-for-list_-display-generic-.o.patch | 10 +- package/screen/screen.hash | 4 +- package/screen/screen.mk | 2 +- 11 files changed, 112 insertions(+), 195 deletions(-) rename package/screen/{0001-no-memcpy-fallback.patch => 0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch} (77%) rename package/screen/{0002-install-no-backup-binary.patch => 0002-Do-not-create-backup-of-old-installed-binary.patch} (85%) rename package/screen/{0003-install-always-chmod.patch => 0003-Change-binary-permission-flags-even-if-chown-fails.patch} (73%) rename package/screen/{0004-install-nonversioned-binary.patch => 0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch} (72%) create mode 100644 package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch delete mode 100644 package/screen/0005-rename-sched_h.patch rename package/screen/{0006-comm-h-now-depends-on-term-h.patch => 0006-comm.h-now-depends-on-term.h.patch} (59%) diff --git a/.checkpackageignore b/.checkpackageignore index e5c06b1e0a44..f943153de9e0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1314,12 +1314,12 @@ package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch U package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch Upstream package/samba4/S91smb Indent Shellcheck Variables package/sane-backends/0001-sane_backend-add-missing-config.h.patch Upstream -package/screen/0001-no-memcpy-fallback.patch Upstream -package/screen/0002-install-no-backup-binary.patch Upstream -package/screen/0003-install-always-chmod.patch Upstream -package/screen/0004-install-nonversioned-binary.patch Upstream -package/screen/0005-rename-sched_h.patch Upstream -package/screen/0006-comm-h-now-depends-on-term-h.patch Upstream +package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch Upstream +package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch Upstream +package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch Upstream +package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch Upstream +package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch Upstream +package/screen/0006-comm.h-now-depends-on-term.h.patch Upstream package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch Upstream package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch Upstream package/sdl/0001-use-correct-directfb-config.patch Upstream diff --git a/package/screen/0001-no-memcpy-fallback.patch b/package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch similarity index 77% rename from package/screen/0001-no-memcpy-fallback.patch rename to package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch index 2137907199cd..ab002701d7ee 100644 --- a/package/screen/0001-no-memcpy-fallback.patch +++ b/package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch @@ -1,6 +1,7 @@ +From 545875ad0b6c9697fae41ae8770e95d117fe3cca Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sat, 13 Sep 2014 11:37:59 +0200 -Subject: Do not use memcpy as an alternative for bcopy/memmove +Subject: [PATCH] Do not use memcpy as an alternative for bcopy/memmove The configure script runs a small test program to check whether memcpy can handle overlapping memory areas. However, it is not valid @@ -16,15 +17,17 @@ Signed-off-by: Maarten ter Huurne Signed-off-by: Ricardo Martincoski [Bernd: rebase on top of 4.7.0] Signed-off-by: Bernd Kuhls +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- acconfig.h | 3 +-- - configure.ac | 18 +----------------- + configure.ac | 22 +--------------------- os.h | 8 ++------ osdef.h.in | 10 +--------- - 4 files changed, 5 insertions(+), 34 deletions(-) + 4 files changed, 5 insertions(+), 38 deletions(-) diff --git a/acconfig.h b/acconfig.h -index 2e46985..9b0b9d4 100644 +index 46d62b0..f83572c 100644 --- a/acconfig.h +++ b/acconfig.h @@ -476,7 +476,7 @@ @@ -45,43 +48,47 @@ index 2e46985..9b0b9d4 100644 /* diff --git a/configure.ac b/configure.ac -index 27690a6..b8e3bec 100644 +index 1a12c04..6f6c2da 100644 --- a/configure.ac +++ b/configure.ac -@@ -1145,7 +1145,7 @@ AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) - AC_CHECKING(fdwalk) - AC_TRY_LINK([#include ], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) +@@ -1278,7 +1278,7 @@ AC_TRY_LINK([ + fdwalk(NULL, NULL); + ],AC_DEFINE(HAVE_FDWALK)) -AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments) +AC_CHECKING(whether memmove/bcopy handles overlapping arguments) AC_TRY_RUN([ - main() { - char buf[10]; -@@ -1175,22 +1175,6 @@ main() { - exit(0); /* libc version works properly. */ - }], AC_DEFINE(USEMEMMOVE)) + #include + #include +@@ -1319,26 +1319,6 @@ main() { + }], AC_DEFINE(USEMEMMOVE),, + AC_NOTE(- skipping check because we are cross compiling; use memmove) AC_DEFINE(USEMEMMOVE)) -- -AC_TRY_RUN([ +-#include +-#include +- -#define bcopy(s,d,l) memcpy(d,s,l) +- +-int -main() { - char buf[10]; - strcpy(buf, "abcdefghi"); - bcopy(buf, buf + 2, 3); - if (strncmp(buf, "ababcf", 6)) -- exit(1); +- return 1; - strcpy(buf, "abcdefghi"); - bcopy(buf + 2, buf, 3); - if (strncmp(buf, "cdedef", 6)) -- exit(1); -- exit(0); /* libc version works properly. */ +- return 1; +- return 0; /* libc version works properly. */ -}], AC_DEFINE(USEMEMCPY),,:) - AC_SYS_LONG_FILE_NAMES AC_MSG_CHECKING(for vsprintf) diff --git a/os.h b/os.h -index e827ac9..0b41fb9 100644 +index 2a1c2ca..d1ac87e 100644 --- a/os.h +++ b/os.h @@ -142,12 +142,8 @@ extern int errno; @@ -100,7 +107,7 @@ index e827ac9..0b41fb9 100644 #endif diff --git a/osdef.h.in b/osdef.h.in -index 8687b60..e4057a0 100644 +index 6ddbd66..abdacf7 100644 --- a/osdef.h.in +++ b/osdef.h.in @@ -58,16 +58,8 @@ extern int bcmp __P((char *, char *, int)); @@ -122,5 +129,5 @@ index 8687b60..e4057a0 100644 extern void bcopy __P((char *, char *, int)); #endif -- -1.8.4.5 +2.41.0 diff --git a/package/screen/0002-install-no-backup-binary.patch b/package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch similarity index 85% rename from package/screen/0002-install-no-backup-binary.patch rename to package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch index 7842662b5767..ef82cd3e76d0 100644 --- a/package/screen/0002-install-no-backup-binary.patch +++ b/package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch @@ -1,18 +1,21 @@ +From 86b5c7677c5bef780bd4c28cbbdaa97eda938230 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 14 Sep 2014 23:58:34 +0200 -Subject: Do not create backup of old installed binary +Subject: [PATCH] Do not create backup of old installed binary This is a rather unusual feature that packagers will not expect. Signed-off-by: Maarten ter Huurne [baruch: update for 4.6.2] Signed-off-by: Baruch Siach +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- Makefile.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 187a69b..65549e9 100644 +index 26ec404..3efbbfd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -83,12 +83,9 @@ screen: $(OFILES) @@ -37,5 +40,5 @@ index 187a69b..65549e9 100644 cd doc; $(MAKE) uninstall -- -1.8.4.5 +2.41.0 diff --git a/package/screen/0003-install-always-chmod.patch b/package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch similarity index 73% rename from package/screen/0003-install-always-chmod.patch rename to package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch index 0aa7690b086f..bc3f676af3c1 100644 --- a/package/screen/0003-install-always-chmod.patch +++ b/package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch @@ -1,22 +1,25 @@ +From 4231969c47a8379f9113e0c9c9586bcfdd545c37 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 15 Sep 2014 00:03:05 +0200 -Subject: Change binary permission flags even if chown fails +Subject: [PATCH] Change binary permission flags even if chown fails Typically when creating a package, the build is not run as root, so the chown will fail. But the chmod can still be done. Signed-off-by: Maarten ter Huurne +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 65549e9..3c12fdb 100644 +index 3efbbfd..0315fde 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,7 +84,8 @@ screen: $(OFILES) - install_bin: .version screen + install_bin: .version screen installdirs $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) - -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) + -chown root $(DESTDIR)$(bindir)/$(SCREEN) @@ -25,5 +28,5 @@ index 65549e9..3c12fdb 100644 rm -f $(DESTDIR)$(bindir)/screen (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) -- -1.8.4.5 +2.41.0 diff --git a/package/screen/0004-install-nonversioned-binary.patch b/package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch similarity index 72% rename from package/screen/0004-install-nonversioned-binary.patch rename to package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch index ecbbd6519754..15795874ae20 100644 --- a/package/screen/0004-install-nonversioned-binary.patch +++ b/package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch @@ -1,20 +1,23 @@ +From 07d6e4d9da8bc7c6ed31aa9b643410ea093d164f Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 15 Sep 2014 00:06:20 +0200 -Subject: Support overriding SCREEN to get a non-versioned binary +Subject: [PATCH] Support overriding SCREEN to get a non-versioned binary If a packager runs "make install SCREEN=screen", do not create "screen" as a symlink to itself. Signed-off-by: Maarten ter Huurne +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.in b/Makefile.in -index 3c12fdb..860f351 100644 +index 0315fde..4718f08 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -86,9 +86,11 @@ install_bin: .version screen +@@ -86,9 +86,11 @@ install_bin: .version screen installdirs $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -chown root $(DESTDIR)$(bindir)/$(SCREEN) -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) @@ -27,5 +30,5 @@ index 3c12fdb..860f351 100644 ############################################################################### -- -1.8.4.5 +2.41.0 diff --git a/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch b/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch new file mode 100644 index 000000000000..24df05de8c46 --- /dev/null +++ b/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch @@ -0,0 +1,39 @@ +From 8b066a777b61600ff2c60cad0725f2089299ff56 Mon Sep 17 00:00:00 2001 +From: Maarten ter Huurne +Date: Mon, 15 Sep 2014 00:24:41 +0200 +Subject: [PATCH] Renamed sched.h to eventqueue.h + +There is a system header that got shadowed by "sched.h". +While Screen itself doesn't include , other system headers +might include it indirectly. This broke the build when using uClibc +with pthread support. + +Signed-off-by: Maarten ter Huurne +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain +--- + sched.h => eventqueue.h | 0 + screen.h | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + rename sched.h => eventqueue.h (100%) + +diff --git a/sched.h b/eventqueue.h +similarity index 100% +rename from sched.h +rename to eventqueue.h +diff --git a/screen.h b/screen.h +index 4823efb..2d51788 100644 +--- a/screen.h ++++ b/screen.h +@@ -43,7 +43,7 @@ + #include "osdef.h" + + #include "ansi.h" +-#include "sched.h" ++#include "eventqueue.h" + #include "acls.h" + #include "comm.h" + #include "layer.h" +-- +2.41.0 + diff --git a/package/screen/0005-rename-sched_h.patch b/package/screen/0005-rename-sched_h.patch deleted file mode 100644 index 9b29b76e0711..000000000000 --- a/package/screen/0005-rename-sched_h.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Maarten ter Huurne -Date: Mon, 15 Sep 2014 00:24:41 +0200 -Subject: Renamed sched.h to eventqueue.h - -There is a system header that got shadowed by "sched.h". -While Screen itself doesn't include , other system headers -might include it indirectly. This broke the build when using uClibc -with pthread support. - -Signed-off-by: Maarten ter Huurne ---- - eventqueue.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - sched.h | 48 ------------------------------------------------ - screen.h | 2 +- - 3 files changed, 49 insertions(+), 49 deletions(-) - create mode 100644 eventqueue.h - delete mode 100644 sched.h - -diff --git a/eventqueue.h b/eventqueue.h -new file mode 100644 -index 0000000..fdc3fc4 ---- /dev/null -+++ b/eventqueue.h -@@ -0,0 +1,48 @@ -+/* Copyright (c) 2008, 2009 -+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -+ * Micah Cowan (micah@cowan.name) -+ * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) -+ * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 -+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -+ * Copyright (c) 1987 Oliver Laumann -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 3, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program (see the file COPYING); if not, see -+ * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA -+ * -+ **************************************************************** -+ * $Id$ GNU -+ */ -+ -+struct event -+{ -+ struct event *next; -+ void (*handler) __P((struct event *, char *)); -+ char *data; -+ int fd; -+ int type; -+ int pri; -+ struct timeval timeout; -+ int queued; /* in evs queue */ -+ int active; /* in fdset */ -+ int *condpos; /* only active if condpos - condneg > 0 */ -+ int *condneg; -+}; -+ -+#define EV_TIMEOUT 0 -+#define EV_READ 1 -+#define EV_WRITE 2 -+#define EV_ALWAYS 3 -diff --git a/sched.h b/sched.h -deleted file mode 100644 -index fdc3fc4..0000000 ---- a/sched.h -+++ /dev/null -@@ -1,48 +0,0 @@ --/* Copyright (c) 2008, 2009 -- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -- * Micah Cowan (micah@cowan.name) -- * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) -- * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 -- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -- * Copyright (c) 1987 Oliver Laumann -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 3, or (at your option) -- * any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program (see the file COPYING); if not, see -- * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA -- * -- **************************************************************** -- * $Id$ GNU -- */ -- --struct event --{ -- struct event *next; -- void (*handler) __P((struct event *, char *)); -- char *data; -- int fd; -- int type; -- int pri; -- struct timeval timeout; -- int queued; /* in evs queue */ -- int active; /* in fdset */ -- int *condpos; /* only active if condpos - condneg > 0 */ -- int *condneg; --}; -- --#define EV_TIMEOUT 0 --#define EV_READ 1 --#define EV_WRITE 2 --#define EV_ALWAYS 3 -diff --git a/screen.h b/screen.h -index 603ca3f..34238c8 100644 ---- a/screen.h -+++ b/screen.h -@@ -43,7 +43,7 @@ - #include "osdef.h" - - #include "ansi.h" --#include "sched.h" -+#include "eventqueue.h" - #include "acls.h" - #include "comm.h" - #include "layer.h" --- -1.8.4.5 - diff --git a/package/screen/0006-comm-h-now-depends-on-term-h.patch b/package/screen/0006-comm.h-now-depends-on-term.h.patch similarity index 59% rename from package/screen/0006-comm-h-now-depends-on-term-h.patch rename to package/screen/0006-comm.h-now-depends-on-term.h.patch index 6ff6f3da0bec..088dfb340c92 100644 --- a/package/screen/0006-comm-h-now-depends-on-term-h.patch +++ b/package/screen/0006-comm.h-now-depends-on-term.h.patch @@ -1,28 +1,30 @@ -From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 +From 23a8ca6be87ad374d66854cee66ab758880cc651 Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Tue, 24 Dec 2013 22:16:31 -0500 -Subject: comm.h now depends on term.h +Subject: [PATCH] comm.h now depends on term.h Signed-off-by: Fabrice Fontaine [Patch retrieved and updated from: http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c] +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- - src/Makefile.in | 2 +- + Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index e791e79..d4f7c0b 100644 +index 4718f08..7082a3e 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -113,7 +113,7 @@ term.h: term.c term.sh - - kmapdef.c: term.h +@@ -132,7 +132,7 @@ kmapdef.c: term.h + tty.c: tty.sh + sh $(srcdir)/tty.sh tty.c -comm.h: comm.c comm.sh config.h +comm.h: comm.c comm.sh config.h term.h AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh - docs: + osdef.h: osdef.sh config.h osdef.h.in -- -cgit v1.0-41-gc330 +2.41.0 diff --git a/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch b/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch index f406a1afac69..d46bf723b800 100644 --- a/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch +++ b/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch @@ -1,4 +1,4 @@ -From b719314d201a3e9e1e57c65746a468c47bfc847f Mon Sep 17 00:00:00 2001 +From 8d8899b3ffd26d5049f8a9ccf12ff9ac65c352b4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Oct 2018 22:29:32 +0200 Subject: [PATCH] comm.h needed for list_{display,generic}.o @@ -12,15 +12,17 @@ Fixes: Signed-off-by: Fabrice Fontaine [Upstream status: https://savannah.gnu.org/bugs/index.php?54776] +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index af5938b..e6d5247 100644 +index 7082a3e..cd363b7 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -265,7 +265,7 @@ braille.h +@@ -349,7 +349,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ comm.h layer.h term.h image.h display.h window.h extern.h \ braille.h @@ -31,5 +33,5 @@ index af5938b..e6d5247 100644 list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h -- -2.17.1 +2.41.0 diff --git a/package/screen/screen.hash b/package/screen/screen.hash index a261d3100de4..ef32eb0696b0 100644 --- a/package/screen/screen.hash +++ b/package/screen/screen.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/screen/screen-4.9.0.tar.gz.sig -sha256 f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 screen-4.9.0.tar.gz +# https://ftp.gnu.org/gnu/screen/screen-4.9.1.tar.gz.sig +sha256 26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69 screen-4.9.1.tar.gz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 3239a1c1f390..d4052b119151 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 4.9.0 +SCREEN_VERSION = 4.9.1 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING From abbf59f643b5f67eb36fa3e0eadf52bc86802f6c Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Wed, 9 Aug 2023 19:15:00 +0200 Subject: [PATCH 1738/2890] package/qt6/qt6core5compat: new package Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/qt6/Config.in | 1 + package/qt6/qt6core5compat/Config.in | 12 ++++++ .../qt6/qt6core5compat/qt6core5compat.hash | 10 +++++ package/qt6/qt6core5compat/qt6core5compat.mk | 39 +++++++++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 package/qt6/qt6core5compat/Config.in create mode 100644 package/qt6/qt6core5compat/qt6core5compat.hash create mode 100644 package/qt6/qt6core5compat/qt6core5compat.mk diff --git a/DEVELOPERS b/DEVELOPERS index c643469f1799..6fd1021e9895 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3257,6 +3257,7 @@ F: package/libusb-compat/ F: package/proj/ F: package/python-iniparse/ F: package/qjson/ +F: package/qt6/qt6core5compat/ F: package/quazip/ F: package/shapelib/ F: package/simple-mail/ diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 3788caa6a39b..126bc2218083 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -47,5 +47,6 @@ source "package/qt6/qt6base/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6svg/Config.in" +source "package/qt6/qt6core5compat/Config.in" endif diff --git a/package/qt6/qt6core5compat/Config.in b/package/qt6/qt6core5compat/Config.in new file mode 100644 index 000000000000..9d9e08760125 --- /dev/null +++ b/package/qt6/qt6core5compat/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_QT6CORE5COMPAT + bool "qt6core5compat" + select BR2_PACKAGE_QT6BASE_XML + help + Qt is a cross-platform application and UI framework for + developers using C++. + + The Qt 5 Core Compat module contains the Qt 5 Core APIs that + were removed in Qt 6. The module facilitates the transition + to Qt 6. + + https://doc.qt.io/qt-6/qtcore5-index.html diff --git a/package/qt6/qt6core5compat/qt6core5compat.hash b/package/qt6/qt6core5compat/qt6core5compat.hash new file mode 100644 index 000000000000..0735df3af287 --- /dev/null +++ b/package/qt6/qt6core5compat/qt6core5compat.hash @@ -0,0 +1,10 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256 +sha256 d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a qt5compat-everywhere-src-6.4.3.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6core5compat/qt6core5compat.mk b/package/qt6/qt6core5compat/qt6core5compat.mk new file mode 100644 index 000000000000..0b6d9369cb1d --- /dev/null +++ b/package/qt6/qt6core5compat/qt6core5compat.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# qt6core5compat +# +################################################################################ + +QT6CORE5COMPAT_VERSION = $(QT6_VERSION) +QT6CORE5COMPAT_SITE = $(QT6_SITE) +QT6CORE5COMPAT_SOURCE = qt5compat-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6CORE5COMPAT_VERSION).tar.xz +QT6CORE5COMPAT_INSTALL_STAGING = YES +QT6CORE5COMPAT_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6CORE5COMPAT_CMAKE_BACKEND = ninja + +QT6CORE5COMPAT_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0 with exception (tools), \ + GFDL-1.3 (docs), \ + BSD-3-Clause + +QT6CORE5COMPAT_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + +QT6CORE5COMPAT_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6CORE5COMPAT_DEPENDENCIES = \ + host-pkgconf \ + qt6base + +$(eval $(cmake-package)) From 46f1cd6fe3b6a0f066e6217dec19ea8eb96d3923 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 24 Aug 2023 23:11:29 +0200 Subject: [PATCH 1739/2890] package/Config.in: make QT libraries entries visible with Qt6 For now the "QT libraries and helper libraries" section was only made visible when BR2_PACKAGE_QT5 was enabled. In preparation for enabling some of those libraries with Qt6, we now show this section when BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6. All of the 8 packages in this section already had a (redundant) "depends on BR2_PACKAGE_QT5" in their own Config.in file, so the only functional change of this commit is that the comment "QT libraries and helper libraries" now becomes visible with Qt6, but it is not followed by any selectable option. This will be changed in a following commit enabling one of those libraries with Qt6. Signed-off-by: Thomas Petazzoni --- package/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/Config.in b/package/Config.in index 0378566305f7..3ce869f3107d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -372,7 +372,8 @@ comment "Graphic libraries" comment "Other GUIs" source "package/qt5/Config.in" -if BR2_PACKAGE_QT5 + source "package/qt6/Config.in" +if BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 comment "QT libraries and helper libraries" source "package/cutelyst/Config.in" source "package/grantlee/Config.in" @@ -383,7 +384,6 @@ comment "QT libraries and helper libraries" source "package/qwt/Config.in" source "package/simple-mail/Config.in" endif - source "package/qt6/Config.in" source "package/tekui/Config.in" source "package/weston/Config.in" source "package/x11r7/Config.in" From 6ca42939d6debc645fbfb431b99ace4b93b5cc0d Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Wed, 9 Aug 2023 19:15:01 +0200 Subject: [PATCH 1740/2890] package/quazip: enable for qt6 Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/quazip/Config.in | 3 ++- package/quazip/quazip.mk | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/quazip/Config.in b/package/quazip/Config.in index bba5eddf3d43..4c7a187571c6 100644 --- a/package/quazip/Config.in +++ b/package/quazip/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_QUAZIP bool "quazip" - depends on BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB + select BR2_PACKAGE_QT6CORE5COMPAT if BR2_PACKAGE_QT6 help QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that can be used to access ZIP diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index bf3b8446246d..665058d89071 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -7,9 +7,15 @@ QUAZIP_VERSION = 1.4 QUAZIP_SITE = $(call github,stachenov,quazip,v$(QUAZIP_VERSION)) QUAZIP_INSTALL_STAGING = YES -QUAZIP_DEPENDENCIES = \ - zlib \ - qt5base +QUAZIP_DEPENDENCIES = zlib + +ifeq ($(BR2_PACKAGE_QT5BASE),y) +QUAZIP_DEPENDENCIES += qt5base +endif +ifeq ($(BR2_PACKAGE_QT6BASE),y) +QUAZIP_DEPENDENCIES += qt6base qt6core5compat +endif + QUAZIP_LICENSE = LGPL-2.1 QUAZIP_LICENSE_FILES = COPYING QUAZIP_CPE_ID_VENDOR = quazip_project From 9c806e132ac64c61e4374b76c7e1d9aa14c4bbdd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 24 Aug 2023 23:20:00 +0200 Subject: [PATCH 1741/2890] package/qt6/Config.in: fix alphabetic ordering Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 126bc2218083..276a0217ab28 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -44,9 +44,9 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6core5compat/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6svg/Config.in" -source "package/qt6/qt6core5compat/Config.in" endif From 93c7b55c778e3dd4d84945918e5d97d5f56256c5 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 8 Aug 2023 21:57:53 +0200 Subject: [PATCH 1742/2890] support/docker: add qemu-system-misc for riscv runtime tests The docker image currently contains qemu-system-arm and qemu-system-x86. Each package contains the 32bit and 64bit variants. This has been sufficient for the time being. The RISC-V ecosystem is growing rapidly. It is starting to become mainstream. To increase the diversity in Buildroot runtime tests, this commit adds the qemu-system-misc package in the Docker image, in order to have the commands qemu-system-riscv{32,64}. This package also contains other architectures (for example: microblaze, nios2, s390x, xtensa, ...). For Debian package details, see: https://packages.debian.org/bullseye/qemu-system-misc Signed-off-by: Julien Olivain Reviewed-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- support/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index a16c1e38491e..8c6e2add6009 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -44,6 +44,7 @@ RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ python3-pexpect \ python3-pytest \ qemu-system-arm \ + qemu-system-misc \ qemu-system-x86 \ rsync \ shellcheck \ From bdb15addcbf862182f82f70c2ff76124ba3538de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 20 Jul 2023 15:17:14 +0200 Subject: [PATCH 1743/2890] configs/qemu_{arm, aarch64}_ebbr: bump Linux, U-Boot and TF-A MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump qemu_arm_ebbr_defconfig and qemu_aarch64_ebbr_defconfig in sync: - Bump Linux to v6.4.3 - Bump U-Boot to 2023.07.02 - Bump TF-A to v2.9 While at it, tune the documentation: - Increase the amount of memory in the example commands to help run the largest OS distributions. - Update the link to the IR Guide to point at the latest version. Signed-off-by: Vincent Stehlé Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- board/qemu/aarch64-ebbr/readme.txt | 6 +++--- board/qemu/arm-ebbr/readme.txt | 2 +- configs/qemu_aarch64_ebbr_defconfig | 8 ++++---- configs/qemu_arm_ebbr_defconfig | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/board/qemu/aarch64-ebbr/readme.txt b/board/qemu/aarch64-ebbr/readme.txt index a2027dad4486..76d566045d44 100644 --- a/board/qemu/aarch64-ebbr/readme.txt +++ b/board/qemu/aarch64-ebbr/readme.txt @@ -33,7 +33,7 @@ Run the emulation with: -device virtio-net-device,netdev=eth0 \ -device virtio-rng-device,rng=rng0 \ -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ - -m 1024 \ + -m 2048 \ -netdev user,id=eth0 \ -no-acpi \ -nographic \ @@ -72,7 +72,7 @@ Then run the OS installer iso image on emulation with: -device virtio-rng-device,rng=rng0 \ -drive file=,if=none,format=raw,readonly=on,id=hd0 \ -drive file=disk.qcow2,if=none,id=hd1 \ - -m 1024 \ + -m 2048 \ -netdev user,id=eth0 \ -no-acpi \ -nographic \ @@ -100,4 +100,4 @@ Firmware update is currently not supported. [1]: https://github.com/ARM-software/ebbr [2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR [3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images -[4]: https://developer.arm.com/documentation/DUI1101/1-1/?lang=en +[4]: https://developer.arm.com/documentation/DUI1101/latest/ diff --git a/board/qemu/arm-ebbr/readme.txt b/board/qemu/arm-ebbr/readme.txt index 085e723fe6c8..dc2b0647a2a9 100644 --- a/board/qemu/arm-ebbr/readme.txt +++ b/board/qemu/arm-ebbr/readme.txt @@ -68,4 +68,4 @@ Firmware update is currently not supported. [1]: https://github.com/ARM-software/ebbr [2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR [3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images -[4]: https://developer.arm.com/documentation/DUI1101/1-1/?lang=en +[4]: https://developer.arm.com/documentation/DUI1101/latest/ diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index c858572bbfba..7807814aff43 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.3" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -27,7 +27,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # Firmware and bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -39,7 +39,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07.02" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index d6a92a1d6839..cfeea623fff6 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.3" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # Firmware and bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -42,7 +42,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07.02" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 624814f4ec26d470606aefeb1a817a31399a04c2 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 18 Jul 2023 11:36:16 +0200 Subject: [PATCH 1744/2890] package/rtl8189fs: fix build with big endian Add local patch to allow to override CFLAGS and undefine CONFIG_LITTLE_ENDIAN by default and use the correct endianness according to target architecture. Fixes: http://autobuild.buildroot.net/results/fe67db3884573ef750eda9d0dccd5f97b3ae698e Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...TRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch | 41 +++++++++++++++++++ package/rtl8189fs/rtl8189fs.mk | 7 +++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch diff --git a/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch b/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch new file mode 100644 index 000000000000..f9e2d6845d78 --- /dev/null +++ b/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch @@ -0,0 +1,41 @@ +From f48d99fab8b79e573850067a3ff2d8c16aa95ce1 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Sep 2022 21:17:17 +0200 +Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the + end of EXTRA_FLAGS assignment + +At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS +since it's assigned at the beginning of the Makefile. For example it's not +possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't +allow to build these modules for big endian architectures. So let's move +the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last +EXTRA_CFLAGS assignment. + +Upstream: https://github.com/jwrdegoede/rtl8189ES_linux/pull/101 + +Signed-off-by: Giulio Benetti +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index dfca305..6f91d0a 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,3 @@ +-EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) + EXTRA_CFLAGS += -O1 + #EXTRA_CFLAGS += -O3 + #EXTRA_CFLAGS += -Wall +@@ -2208,6 +2207,8 @@ ifneq ($(USER_MODULE_NAME),) + MODULE_NAME := $(USER_MODULE_NAME) + endif + ++EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) ++ + ifneq ($(KERNELRELEASE),) + + ########### this part for *.mk ############################ +-- +2.34.1 + diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index c3eef6e071c6..bd2946924226 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -8,10 +8,15 @@ RTL8189FS_VERSION = 75a566a830037c7d1309c5a9fe411562772a1cf2 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 +RTL8189FS_USER_EXTRA_CFLAGS = \ + -UCONFIG_LITTLE_ENDIAN \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN + RTL8189FS_MODULE_MAKE_OPTS = \ CONFIG_RTL8189FS=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) + KSRC=$(LINUX_DIR) \ + USER_EXTRA_CFLAGS="$(RTL8189FS_USER_EXTRA_CFLAGS)" ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),) RTL8189FS_MODULE_MAKE_OPTS += CONFIG_RTW_DEBUG=n From 7412789bfd55efc7797945a83bef4e4741faaf0e Mon Sep 17 00:00:00 2001 From: Witold Lipieta Date: Tue, 18 Apr 2023 13:42:04 +0200 Subject: [PATCH 1745/2890] package/python-segno: new package segno 1.5.2 https://pypi.org/project/segno/ Signed-off-by: Witold Lipieta Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 5 +++++ package/Config.in | 1 + package/python-segno/Config.in | 7 +++++++ package/python-segno/python-segno.hash | 5 +++++ package/python-segno/python-segno.mk | 14 ++++++++++++++ .../testing/tests/package/sample_python_segno.py | 13 +++++++++++++ support/testing/tests/package/test_python_segno.py | 11 +++++++++++ 7 files changed, 56 insertions(+) create mode 100644 package/python-segno/Config.in create mode 100644 package/python-segno/python-segno.hash create mode 100644 package/python-segno/python-segno.mk create mode 100644 support/testing/tests/package/sample_python_segno.py create mode 100644 support/testing/tests/package/test_python_segno.py diff --git a/DEVELOPERS b/DEVELOPERS index 6fd1021e9895..f91c4e9a2b41 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3110,6 +3110,11 @@ F: package/time/ N: Will Wagner F: package/yaffs2utils/ +N: Witold Lipieta +F: package/python-segno/ +F: support/testing/tests/package/sample_python_segno.py +F: support/testing/tests/package/test_python_segno.py + N: Wojciech M. Zabolotny F: package/avrdude/ F: package/jack2/ diff --git a/package/Config.in b/package/Config.in index 3ce869f3107d..3d16ea37d1a2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1288,6 +1288,7 @@ menu "External python modules" source "package/python-sdnotify/Config.in" source "package/python-secretstorage/Config.in" source "package/python-see/Config.in" + source "package/python-segno/Config.in" source "package/python-selenium/Config.in" source "package/python-semver/Config.in" source "package/python-sentry-sdk/Config.in" diff --git a/package/python-segno/Config.in b/package/python-segno/Config.in new file mode 100644 index 000000000000..3957cd79bfff --- /dev/null +++ b/package/python-segno/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_SEGNO + bool "python-segno" + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + help + QR Code and Micro QR Code generator for Python 2 and Python 3 + + https://github.com/heuer/segno/ diff --git a/package/python-segno/python-segno.hash b/package/python-segno/python-segno.hash new file mode 100644 index 000000000000..286bdf3615df --- /dev/null +++ b/package/python-segno/python-segno.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/segno/json +md5 6d7c852f951501cd3af85ef061d6bee4 segno-1.5.2.tar.gz +sha256 983424b296e62189d70fc73460cd946cf56dcbe82b9bda18c066fc1b24371cdc segno-1.5.2.tar.gz +# Locally computed sha256 checksums +sha256 98b0a86ca0cbf68c95051741bc983425a43fdece775fe0e2712e66be459cc9d1 LICENSE diff --git a/package/python-segno/python-segno.mk b/package/python-segno/python-segno.mk new file mode 100644 index 000000000000..c832f38f4b0d --- /dev/null +++ b/package/python-segno/python-segno.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-segno +# +################################################################################ + +PYTHON_SEGNO_VERSION = 1.5.2 +PYTHON_SEGNO_SOURCE = segno-$(PYTHON_SEGNO_VERSION).tar.gz +PYTHON_SEGNO_SITE = https://files.pythonhosted.org/packages/90/2a/2fedf1023f9273d8326362df7936748ebadef92ba53ab7970d9b8df1a6c2 +PYTHON_SEGNO_SETUP_TYPE = setuptools +PYTHON_SEGNO_LICENSE = BSD-3-Clause +PYTHON_SEGNO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_segno.py b/support/testing/tests/package/sample_python_segno.py new file mode 100644 index 000000000000..c96d6087ceff --- /dev/null +++ b/support/testing/tests/package/sample_python_segno.py @@ -0,0 +1,13 @@ +import segno +import os +import tempfile + +qr = segno.make_qr('http:/www.example.org/') +with tempfile.NamedTemporaryFile('wb', suffix='.png', delete=False) as f: + fn = f.name +qr.save(fn) +expected = b'\211PNG\r\n\032\n' # PNG magic number +with open(fn, mode='rb') as f: + val = f.read(len(expected)) +os.unlink(fn) +assert expected == val diff --git a/support/testing/tests/package/test_python_segno.py b/support/testing/tests/package/test_python_segno.py new file mode 100644 index 000000000000..75e712439979 --- /dev/null +++ b/support/testing/tests/package/test_python_segno.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Segno(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_SEGNO=y + """ + sample_scripts = ["tests/package/sample_python_segno.py"] From 87bc648720bb4e79ac99beff8a807019ac930233 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 24 Aug 2023 23:28:10 +0200 Subject: [PATCH 1746/2890] package/check: don't conflict with release archive In commit ee93213d18bc (package/check: fix compile issue due to missing source file), we switched from using the released tarball, to using the autogenerated tarball from github. However, that means that the filename of the archive did not change, while its content did change. The hash was promptly updated, but that means that the archive we cache on s.b.o (and possibly the one users may also already have locally) will not match the new hash (and conversely). So we switch to using the sha1-hash of the commit corresponding to the tag. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Waldemar Brodkorb Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/check/check.hash | 2 +- package/check/check.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/check/check.hash b/package/check/check.hash index 9b380ddc2886..a8cec60d16a6 100644 --- a/package/check/check.hash +++ b/package/check/check.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 998d355294bb94072f40584272cf4424571c396c631620ce463f6ea97aa67d2e check-0.15.2.tar.gz +sha256 20e7360f5774844c09fde696e5bf71d061e9f53b3d763d886d3318d8893fdda4 check-11970a7e112dfe243a2e68773f014687df2900e8.tar.gz # License files, locally calculated sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LESSER diff --git a/package/check/check.mk b/package/check/check.mk index 0bdc9b93ef38..95fe5c9d5764 100644 --- a/package/check/check.mk +++ b/package/check/check.mk @@ -4,7 +4,9 @@ # ################################################################################ -CHECK_VERSION = 0.15.2 +# This is the same as tag 0.15.2, but we can't use it, as to avoid conflict +# with the released tarball that was incomplete +CHECK_VERSION = 11970a7e112dfe243a2e68773f014687df2900e8 CHECK_SITE = $(call github,libcheck,check,$(CHECK_VERSION)) CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf From 0a0786bc78555e33ffb0012ee88b3bb4fef10e61 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 25 Aug 2023 18:33:35 +0200 Subject: [PATCH 1747/2890] package/ytree: bump version to 2.05 Release notes: https://www.han.de/~werner/ytree.html Removed patch which was applied upstream in a slightly changed way. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/ytree/0001-fix-musl.patch | 26 -------------------------- package/ytree/ytree.hash | 2 +- package/ytree/ytree.mk | 2 +- 4 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/ytree/0001-fix-musl.patch diff --git a/.checkpackageignore b/.checkpackageignore index 5303a8f3d816..d8d3970b3dd6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1594,7 +1594,6 @@ package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch Upstream package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch Upstream package/ympd/0001-only-c-language.patch Upstream package/ympd/0002-added-forward-declarations.patch Upstream -package/ytree/0001-fix-musl.patch Upstream package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch Upstream package/zabbix/0002-fix-build-with-libressl-3.5.0.patch Upstream package/zbar/0001-python-enum-fix-build-for-Python-3.11.patch Upstream diff --git a/package/ytree/0001-fix-musl.patch b/package/ytree/0001-fix-musl.patch deleted file mode 100644 index 0a24744669e6..000000000000 --- a/package/ytree/0001-fix-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix musl build - -Fixes - - match.c.text+0x9c): undefined reference to `re_comp' - match.c.text+0xca): undefined reference to `re_exec' - -by forcing to use the 'modern' regex methods implementation instead of -the obsolete re_comp/re_exec ([1]) one? - -[1] http://man7.org/linux/man-pages/man3/re_comp.3.html - -Signed-off-by: Bernd Kuhls - -diff -uNr ytree-1.99pl2.orig/match.c ytree-1.99pl2/match.c ---- ytree-1.99pl2.orig/match.c 2019-09-29 12:37:57.000000000 +0200 -+++ ytree-1.99pl2/match.c 2019-10-01 19:46:56.193815327 +0200 -@@ -10,7 +10,7 @@ - #include "ytree.h" - - #if defined( sun ) || defined( linux ) || defined( __NeXT__ ) || defined( OSF1 ) || defined( __OpenBSD__ ) || defined(__NetBSD__) || defined( __FreeBSD__ ) || defined( __GNU__ ) --#define HAS_REGEX -+#define HAS_REGCOMP - #endif - - #ifdef linux diff --git a/package/ytree/ytree.hash b/package/ytree/ytree.hash index 88ca8282bfd9..f3fbba8673b0 100644 --- a/package/ytree/ytree.hash +++ b/package/ytree/ytree.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6e7a8b7f68efe6d365abe33a1d06d739ad85f22a3d54ddd0aec24a3478d66642 ytree-2.04.tar.gz +sha256 8cf8b151e4913b5b7f7a91dffd5c7306106a42477ec44e71d62c75f66ab61a57 ytree-2.05.tar.gz sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING diff --git a/package/ytree/ytree.mk b/package/ytree/ytree.mk index a64ebe83eda6..1bd2df46b67a 100644 --- a/package/ytree/ytree.mk +++ b/package/ytree/ytree.mk @@ -4,7 +4,7 @@ # ################################################################################ -YTREE_VERSION = 2.04 +YTREE_VERSION = 2.05 YTREE_SITE = https://www.han.de/~werner YTREE_LICENSE = GPL-2.0+ YTREE_LICENSE_FILES = COPYING From cb83990af58da650a7faf04185a79f4e076d492e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 25 Aug 2023 17:50:01 +0200 Subject: [PATCH 1748/2890] package/tor: bump version to 0.4.8.4 Release notes: https://forum.torproject.org/t/stable-release-0-4-8-4/8884 Removed all patches due to upstream commit adding compatibility with LibreSSL 3.5: https://github.com/torproject/tor/commit/f3dabd705f26c56076934323f24b5b05ecdfd39c Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 3 - ...rc_lib_crypt_ops_crypto_dh_openssl_c.patch | 67 ------------------- ...c_lib_crypt_ops_crypto_rsa_openssl_c.patch | 58 ---------------- ...003-patch-src_lib_tls_x509_openssl_c.patch | 22 ------ package/tor/tor.hash | 4 +- package/tor/tor.mk | 2 +- 6 files changed, 3 insertions(+), 153 deletions(-) delete mode 100644 package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch delete mode 100644 package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch delete mode 100644 package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch diff --git a/.checkpackageignore b/.checkpackageignore index d8d3970b3dd6..e652742f2508 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1428,9 +1428,6 @@ package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch Upstream package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch Upstream package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch Upstream package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstream -package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch Upstream -package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch Upstream -package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch Upstream package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch Upstream package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables diff --git a/package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch b/package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch deleted file mode 100644 index 2df7c6b6a784..000000000000 --- a/package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fix build with opaque structs in LibreSSL 3.5 - -Downloaded from OpenBSD ports: -http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_crypt_ops_crypto_dh_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup - -Patch series was sent upstream: -https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244 - -Signed-off-by: Bernd Kuhls - -Index: src/lib/crypt_ops/crypto_dh_openssl.c ---- a/src/lib/crypt_ops/crypto_dh_openssl.c.orig -+++ b/src/lib/crypt_ops/crypto_dh_openssl.c -@@ -60,7 +60,7 @@ crypto_validate_dh_params(const BIGNUM *p, const BIGNU - /* Copy into a temporary DH object, just so that DH_check() can be called. */ - if (!(dh = DH_new())) - goto out; --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - BIGNUM *dh_p, *dh_g; - if (!(dh_p = BN_dup(p))) - goto out; -@@ -223,7 +223,7 @@ new_openssl_dh_from_params(BIGNUM *p, BIGNUM *g) - goto err; - } - --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - - if (!DH_set0_pqg(res_dh, dh_p, NULL, dh_g)) { - goto err; -@@ -276,7 +276,7 @@ crypto_dh_get_bytes(crypto_dh_t *dh) - int - crypto_dh_generate_public(crypto_dh_t *dh) - { --#ifndef OPENSSL_1_1_API -+#if !defined(OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER) - again: - #endif - if (!DH_generate_key(dh->dh)) { -@@ -286,7 +286,7 @@ crypto_dh_generate_public(crypto_dh_t *dh) - return -1; - /* LCOV_EXCL_STOP */ - } --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - /* OpenSSL 1.1.x doesn't appear to let you regenerate a DH key, without - * recreating the DH object. I have no idea what sort of aliasing madness - * can occur here, so do the check, and just bail on failure. -@@ -327,7 +327,7 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, si - - const BIGNUM *dh_pub; - --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - const BIGNUM *dh_priv; - DH_get0_key(dh->dh, &dh_pub, &dh_priv); - #else -@@ -338,7 +338,7 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, si - if (crypto_dh_generate_public(dh)<0) - return -1; - else { --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - DH_get0_key(dh->dh, &dh_pub, &dh_priv); - #else - dh_pub = dh->dh->pub_key; diff --git a/package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch b/package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch deleted file mode 100644 index 1354a4221e0d..000000000000 --- a/package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch +++ /dev/null @@ -1,58 +0,0 @@ -Fix build with opaque structs in LibreSSL 3.5 - -Downloaded from OpenBSD ports: -http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_crypt_ops_crypto_rsa_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup - -Patch series was sent upstream: -https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244 - -Signed-off-by: Bernd Kuhls - -Index: src/lib/crypt_ops/crypto_rsa_openssl.c ---- a/src/lib/crypt_ops/crypto_rsa_openssl.c.orig -+++ b/src/lib/crypt_ops/crypto_rsa_openssl.c -@@ -47,7 +47,7 @@ struct crypto_pk_t - int - crypto_pk_key_is_private(const crypto_pk_t *k) - { --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - if (!k || !k->key) - return 0; - -@@ -212,7 +212,7 @@ crypto_pk_public_exponent_ok(const crypto_pk_t *env) - - const BIGNUM *e; - --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - const BIGNUM *n, *d; - RSA_get0_key(env->key, &n, &e, &d); - #else -@@ -242,7 +242,7 @@ crypto_pk_cmp_keys(const crypto_pk_t *a, const crypto_ - const BIGNUM *a_n, *a_e; - const BIGNUM *b_n, *b_e; - --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - const BIGNUM *a_d, *b_d; - RSA_get0_key(a->key, &a_n, &a_e, &a_d); - RSA_get0_key(b->key, &b_n, &b_e, &b_d); -@@ -279,7 +279,7 @@ crypto_pk_num_bits(crypto_pk_t *env) - tor_assert(env); - tor_assert(env->key); - --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - /* It's so stupid that there's no other way to check that n is valid - * before calling RSA_bits(). - */ -@@ -572,7 +572,7 @@ static bool - rsa_private_key_too_long(RSA *rsa, int max_bits) - { - const BIGNUM *n, *e, *p, *q, *d, *dmp1, *dmq1, *iqmp; --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - - #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1) - n = RSA_get0_n(rsa); diff --git a/package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch b/package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch deleted file mode 100644 index fe8586357a65..000000000000 --- a/package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix build with opaque structs in LibreSSL 3.5 - -Downloaded from OpenBSD ports: -http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_tls_x509_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup - -Patch series was sent upstream: -https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244 - -Signed-off-by: Bernd Kuhls - -Index: src/lib/tls/x509_openssl.c ---- a/src/lib/tls/x509_openssl.c.orig -+++ b/src/lib/tls/x509_openssl.c -@@ -329,7 +329,7 @@ tor_tls_cert_is_valid(int severity, - cert_key = X509_get_pubkey(cert->cert); - if (check_rsa_1024 && cert_key) { - RSA *rsa = EVP_PKEY_get1_RSA(cert_key); --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - if (rsa && RSA_bits(rsa) == 1024) { - #else - if (rsa && BN_num_bits(rsa->n) == 1024) { diff --git a/package/tor/tor.hash b/package/tor/tor.hash index a6b5f27c4020..d87e2742d354 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.7.14.tar.gz.sha256sum -sha256 a5ac67f6466380fc05e8043d01c581e4e8a2b22fe09430013473e71065e65df8 tor-0.4.7.14.tar.gz +# From https://dist.torproject.org/tor-0.4.8.4.tar.gz.sha256sum +sha256 09c1ce74a25fc3b48c81ff146cbd0dd538cbbb8fe4e2964fc2fb2b192f6a1d2b tor-0.4.8.4.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index b794296c6a39..b3360d3c3b04 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.7.14 +TOR_VERSION = 0.4.8.4 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 447f645a210c74e538b4e04135345aa91380193b Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Fri, 25 Aug 2023 19:42:40 +0700 Subject: [PATCH 1749/2890] package/git: bump to version 2.42.0 Bump the package version to 2.42.0. For the full changelog, see the release announcement at [1]. Link: https://lore.kernel.org/git/xmqqr0nwp8mv.fsf@gitster.g/ [1] Signed-off-by: Bagas Sanjaya Signed-off-by: Thomas Petazzoni --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 91d723ecd1c5..d73778ad8544 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 e748bafd424cfe80b212cbc6f1bbccc3a47d4862fb1eb7988877750478568040 git-2.41.0.tar.xz +sha256 3278210e9fd2994b8484dd7e3ddd9ea8b940ef52170cdb606daa94d887c93b0d git-2.42.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 99646b10dc1e..853ec256a0dc 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.41.0 +GIT_VERSION = 2.42.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 4aa36a507c7321eabd4ba598750a05a37356d5fc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 25 Aug 2023 12:15:35 +0200 Subject: [PATCH 1750/2890] package/mosquitto: bump to version 2.0.17 Bugfix release, fixing a number of regressions in 2.0.16 From the changelog (https://github.com/eclipse/mosquitto/blob/master/ChangeLog.txt) 2.0.17 - 2023-08-22 =================== Broker: - Fix `max_queued_messages 0` stopping clients from receiving messages. Closes #2879. - Fix `max_inflight_messages` not being set correctly. Closes #2876. Apps: - Fix `mosquitto_passwd -U` backup file creation. Closes #2873. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/mosquitto/mosquitto.hash | 4 ++-- package/mosquitto/mosquitto.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index cbe54d6d1a68..df0a51df3a5a 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,6 +1,6 @@ # Locally calculated after checking gpg signature -# from https://mosquitto.org/files/source/mosquitto-2.0.16.tar.gz.asc -sha256 638db9e43e89d243ea98d10d66e76ff376131217780decd01abaffacc66d8035 mosquitto-2.0.16.tar.gz +# from https://mosquitto.org/files/source/mosquitto-2.0.17.tar.gz.asc +sha256 3be7a911236567c1a9fbe25baf3e3167004ba4a0c151a448ef1f7fc077dba52f mosquitto-2.0.17.tar.gz # License files sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index f146a86d0a21..0b85246f39c9 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 2.0.16 +MOSQUITTO_VERSION = 2.0.17 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 From 47ac12bd4ee4025e94e82a5484c2a2a60cb59281 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 25 Aug 2023 17:32:53 +0200 Subject: [PATCH 1751/2890] {linux, linux-headers}: bump 6.{1, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index d3448ba7447e..dcfc31ac8b4a 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.4.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.4.12" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 0177988c456b..246820827d3c 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 546b68b5097d3c0d74722de62aae217729d98e45fbb6bd458b490ac21ea40918 linux-6.4.11.tar.xz -sha256 f5f67bcfccd47f8d9db2d5ba24e33af7778f40a777577d1fba424f4a1712a296 linux-6.1.46.tar.xz +sha256 cca91be956fe081f8f6da72034cded96fe35a50be4bfb7e103e354aa2159a674 linux-6.4.12.tar.xz +sha256 93d58b6af007a5f44dd26831ff310707deb1ab9380c5136a534287eb3fddfcab linux-6.1.47.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 add0a575341b263a06e93599fc220a5dd34cb4ca5b9d05097a5db2a061928f26 linux-5.15.127.tar.xz sha256 cb54660ed4917cc4f9a9ab93d117defefd8bcbe745ec6082d909bbfd5ae962c2 linux-5.10.191.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8a2506700396..df22bfc1c1fe 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -405,8 +405,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.254" if BR2_KERNEL_HEADERS_5_4 default "5.10.191" if BR2_KERNEL_HEADERS_5_10 default "5.15.127" if BR2_KERNEL_HEADERS_5_15 - default "6.1.46" if BR2_KERNEL_HEADERS_6_1 - default "6.4.11" if BR2_KERNEL_HEADERS_6_4 + default "6.1.47" if BR2_KERNEL_HEADERS_6_1 + default "6.4.12" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From c11950fe4a2817c4bd1fa6d9c9e3cd3783b3f96f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 25 Aug 2023 12:15:35 +0200 Subject: [PATCH 1752/2890] package/mosquitto: bump to version 2.0.17 Bugfix release, fixing a number of regressions in 2.0.16 From the changelog (https://github.com/eclipse/mosquitto/blob/master/ChangeLog.txt) 2.0.17 - 2023-08-22 =================== Broker: - Fix `max_queued_messages 0` stopping clients from receiving messages. Closes #2879. - Fix `max_inflight_messages` not being set correctly. Closes #2876. Apps: - Fix `mosquitto_passwd -U` backup file creation. Closes #2873. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/mosquitto/mosquitto.hash | 4 ++-- package/mosquitto/mosquitto.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index cbe54d6d1a68..df0a51df3a5a 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,6 +1,6 @@ # Locally calculated after checking gpg signature -# from https://mosquitto.org/files/source/mosquitto-2.0.16.tar.gz.asc -sha256 638db9e43e89d243ea98d10d66e76ff376131217780decd01abaffacc66d8035 mosquitto-2.0.16.tar.gz +# from https://mosquitto.org/files/source/mosquitto-2.0.17.tar.gz.asc +sha256 3be7a911236567c1a9fbe25baf3e3167004ba4a0c151a448ef1f7fc077dba52f mosquitto-2.0.17.tar.gz # License files sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index f146a86d0a21..0b85246f39c9 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 2.0.16 +MOSQUITTO_VERSION = 2.0.17 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 From b6a96f8be27f98d3132cc2464ecd33594c2f1cd3 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 15 Aug 2023 19:45:59 +0200 Subject: [PATCH 1753/2890] configs/hifive_unleashed_defconfig: uboot needs pylibfdt uboot needs Python libfdt to build: pylibfdt does not seem to be available with python3 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4839060137 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/hifive_unleashed_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 80c5e48f964c..37898284ac06 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -48,6 +48,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_unleashed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y From 01893c74ebee2fb7be5248d35ff33d387ca5a92d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 15 Aug 2023 19:46:00 +0200 Subject: [PATCH 1754/2890] configs/hifive_unleashed_defconfig: bump to kernel 5.10.190 We have to bump the kernel version to build with gcc >= 12 for riscv and zicsr/zifencei extension [1] [2]. Similar to 0a4ac1e7fa715669aa2ab2a58b564fc875c07c68. Fixes: ./arch/riscv/include/asm/vdso/gettimeofday.h: Assembler messages: ./arch/riscv/include/asm/vdso/gettimeofday.h:71: Error: unrecognized opcode `csrr a5,0xc01', extension `zicsr' required [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7486227fa47aa84b102be18fd9985f6e8e11e756 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0b077b22ea9ff698840ff9305d9382935fb41540 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/hifive_unleashed_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 37898284ac06..c9d4a31ede1f 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -28,7 +28,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.190" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/hifive-unleashed/linux.config.fragment" BR2_LINUX_KERNEL_IMAGE=y From 0ee8ef970bab8680162175d127e388a04286791f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 26 Aug 2023 18:56:27 +0200 Subject: [PATCH 1755/2890] configs/freescale_imx6qsabresd_defconfig: fix defconfig While switching ATF to github, the BR2_TARGET_UBOOT_CUSTOM_GIT=y symbol was not removed. Since then this defconfig fail to build in gitlab-ci due to invalid defconfig check. WARN: defconfig ./configs/freescale_imx6qsabresd_defconfig can't be used: Missing: BR2_TARGET_UBOOT_CUSTOM_GIT=y [1] dd42b159a5f752921ee602530d289c810ad7ee51 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4889436612 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/freescale_imx6qsabresd_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index 86513d8072fc..dddfaf5228d0 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -37,7 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y From 3214d9d2b8ed3decd33c99dcc01172add28cf94c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 26 Aug 2023 18:56:28 +0200 Subject: [PATCH 1756/2890] configs/sipeed_{maixduino, maix_go}_sdcard_defconfig: fix build with binutils >= 2.38 Backport an upstream patch fixing the build with binutils >= 2.38 for riscv's for Zicsr and Zifencei. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4936949340 https://gitlab.com/buildroot.org/buildroot/-/jobs/4936949329 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/sipeed_maix_go_sdcard_defconfig | 1 + configs/sipeed_maixduino_sdcard_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig index 6c61e3aaafe0..2bea0b97bec3 100644 --- a/configs/sipeed_maix_go_sdcard_defconfig +++ b/configs/sipeed_maix_go_sdcard_defconfig @@ -17,6 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y BR2_BINFMT_FLAT=y BR2_BINFMT_FLAT_ONE=y # BR2_TARGET_ENABLE_ROOT_LOGIN is not set +BR2_GLOBAL_PATCH_DIR="board/canaan/k210-soc/patches" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig index da8cbe45f9fe..db7896fadfb5 100644 --- a/configs/sipeed_maixduino_sdcard_defconfig +++ b/configs/sipeed_maixduino_sdcard_defconfig @@ -17,6 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y BR2_BINFMT_FLAT=y BR2_BINFMT_FLAT_ONE=y # BR2_TARGET_ENABLE_ROOT_LOGIN is not set +BR2_GLOBAL_PATCH_DIR="board/canaan/k210-soc/patches" # Kernel BR2_LINUX_KERNEL=y From a26fa40853ff6033647f034d16270cdc66e22469 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Aug 2023 13:23:21 +0200 Subject: [PATCH 1757/2890] package/python3: security bump version to 3.11.5 Added md5 hash provided by upstream. Release notes: https://www.python.org/downloads/release/python-3115/ Fixes CVE-2023-40217. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python3/python3.hash | 4 +++- package/python3/python3.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 6c43e01a448d..1a0fee3290ea 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,5 @@ +# From https://www.python.org/downloads/release/python-3115/ +md5 393856f1b7713aa8bba4b642ab9985d3 Python-3.11.5.tar.xz # Locally computed -sha256 2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6 Python-3.11.4.tar.xz +sha256 85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f Python-3.11.5.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index bdb7cfd22f1f..5f8fa5b58d77 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).4 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).5 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From 19da04471599cac8eba272242b43bcff8e9ee9db Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Aug 2023 20:02:49 +0200 Subject: [PATCH 1758/2890] {linux, linux-headers}: bump 5.{10, 15}.x / 6.1.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/linux.hash | 6 +++--- package/linux-headers/Config.in.host | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 246820827d3c..d236dadad833 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,9 +1,9 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 cca91be956fe081f8f6da72034cded96fe35a50be4bfb7e103e354aa2159a674 linux-6.4.12.tar.xz -sha256 93d58b6af007a5f44dd26831ff310707deb1ab9380c5136a534287eb3fddfcab linux-6.1.47.tar.xz +sha256 c606cbd0353e677df6fae73cc16ba3c9244b98372ed7771d551024016f55ac31 linux-6.1.48.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 add0a575341b263a06e93599fc220a5dd34cb4ca5b9d05097a5db2a061928f26 linux-5.15.127.tar.xz -sha256 cb54660ed4917cc4f9a9ab93d117defefd8bcbe745ec6082d909bbfd5ae962c2 linux-5.10.191.tar.xz +sha256 0f2eca845183fd76f53b0c867c97f12b9ace2d7e8ee2cdeec7eb2897651b80de linux-5.15.128.tar.xz +sha256 c40d11ee56e50a132429badbd1ba1c53e42b3312590b2a39be34c241d1b0b5b9 linux-5.10.192.tar.xz sha256 51608da961b5e34d6a9452a7b302699e109633f769a4253c74b1048abba8d9c7 linux-5.4.254.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 349728d3d143fcee484b34e34e536fe48dfb8bb71263f81a66fd572cc9162137 linux-4.19.292.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index df22bfc1c1fe..ba8d0f897ca8 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,9 +403,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.14.323" if BR2_KERNEL_HEADERS_4_14 default "4.19.292" if BR2_KERNEL_HEADERS_4_19 default "5.4.254" if BR2_KERNEL_HEADERS_5_4 - default "5.10.191" if BR2_KERNEL_HEADERS_5_10 - default "5.15.127" if BR2_KERNEL_HEADERS_5_15 - default "6.1.47" if BR2_KERNEL_HEADERS_6_1 + default "5.10.192" if BR2_KERNEL_HEADERS_5_10 + default "5.15.128" if BR2_KERNEL_HEADERS_5_15 + default "6.1.48" if BR2_KERNEL_HEADERS_6_1 default "6.4.12" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From a2888f439cced45f48f35a51f2d4f9b0629ff28b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 25 Aug 2023 16:49:11 -0600 Subject: [PATCH 1759/2890] package/qemu: bump to version 8.1.0 Drop patch which is now upstream. Replace no longer supported --with-git-submodules config option with new --disable-download option. Replace no longer supported --meson config option with --python config option. The configure script expects --python to point to the python interpreter with the meson installation. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...tall-keyboard-maps-only-if-necessary.patch | 38 ------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 8 ++-- 3 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch diff --git a/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch b/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch deleted file mode 100644 index 8ba7f3cf1516..000000000000 --- a/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9d9b74f806f5dbca53df6630c1a0591eaedd4500 Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Sun, 1 Jan 2023 21:00:57 -0300 -Subject: [PATCH] meson: install keyboard maps only if necessary - -They are required only for system emulation (i.e. have_system is true). - -Upstream: https://patchwork.kernel.org/project/qemu-devel/patch/20230327172147.196607-1-casantos@redhat.com/ -Signed-off-by: Carlos Santos -Signed-off-by: Carlos Santos ---- - pc-bios/keymaps/meson.build | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build -index 158a3b410c..bff3083313 100644 ---- a/pc-bios/keymaps/meson.build -+++ b/pc-bios/keymaps/meson.build -@@ -47,7 +47,7 @@ if native_qemu_keymap.found() - build_by_default: true, - output: km, - command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()], -- install: true, -+ install: have_system, - install_dir: qemu_datadir / 'keymaps') - endforeach - -@@ -56,4 +56,6 @@ else - install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps') - endif - --install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps') -+if have_system -+ install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps') -+endif --- -2.31.1 - diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index e71742c243b0..506afa8bf357 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 ecf4d32cbef9d397bfc8cc50e4d1e92a1b30253bf32e8ee73c7a8dcf9a232b09 qemu-8.0.3.tar.xz +sha256 710c101198e334d4762eef65f649bc43fa8a5dd75303554b8acfec3eb25f0e55 qemu-8.1.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index b341d0220df3..84166958bb58 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -6,7 +6,7 @@ # When updating the version, check whether the list of supported targets # needs to be updated. -QEMU_VERSION = 8.0.3 +QEMU_VERSION = 8.1.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c @@ -272,7 +272,7 @@ define QEMU_CONFIGURE_CMDS --prefix=/usr \ --cross-prefix=$(TARGET_CROSS) \ --audio-drv-list= \ - --meson=$(HOST_DIR)/bin/meson \ + --python=$(HOST_DIR)/bin/python3 \ --ninja=$(HOST_DIR)/bin/ninja \ --disable-alsa \ --disable-bpf \ @@ -313,7 +313,7 @@ define QEMU_CONFIGURE_CMDS --enable-attr \ --enable-kvm \ --enable-vhost-net \ - --with-git-submodules=ignore \ + --disable-download \ --disable-hexagon-idef-parser \ $(QEMU_OPTS) endef @@ -458,7 +458,7 @@ define HOST_QEMU_CONFIGURE_CMDS --host-cc="$(HOSTCC)" \ --extra-cflags="$(HOST_QEMU_CFLAGS)" \ --extra-ldflags="$(HOST_LDFLAGS)" \ - --meson=$(HOST_DIR)/bin/meson \ + --python=$(HOST_DIR)/bin/python3 \ --ninja=$(HOST_DIR)/bin/ninja \ --disable-alsa \ --disable-bpf \ From 5cc09213364cc6f8262efbb223c8559c98173c7a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 25 Aug 2023 23:04:18 +0200 Subject: [PATCH 1760/2890] package/kodi-peripheral-joystick: bump version to 20.1.12-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index ba9932c9e454..545ce724a543 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d916506695d71385fe32d9b640e354b895c7a76ae9a9127a76c180f2a3ed8028 kodi-peripheral-joystick-20.1.11-Nexus.tar.gz +sha256 6fb7ed5f0054409ec907c80a0c3caf62dafed98e746044ced0a26f3060d3b844 kodi-peripheral-joystick-20.1.12-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 2f2cd05a1288..eecec4328c21 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.11-Nexus +KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.12-Nexus KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From 43d5fad3e55f08f3b6f21c4996160976e5bec308 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 25 Aug 2023 23:04:19 +0200 Subject: [PATCH 1761/2890] package/kodi-inputstream-adaptive: bump version to 20.3.12-Nexus Removed patch which is now included in upstream release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...de-missing-cstdint-to-support-gcc-13.patch | 103 ------------------ .../kodi-inputstream-adaptive.hash | 2 +- .../kodi-inputstream-adaptive.mk | 2 +- 3 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 package/kodi-inputstream-adaptive/0001-include-missing-cstdint-to-support-gcc-13.patch diff --git a/package/kodi-inputstream-adaptive/0001-include-missing-cstdint-to-support-gcc-13.patch b/package/kodi-inputstream-adaptive/0001-include-missing-cstdint-to-support-gcc-13.patch deleted file mode 100644 index ca4a363182ac..000000000000 --- a/package/kodi-inputstream-adaptive/0001-include-missing-cstdint-to-support-gcc-13.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 7b5c284e63c1d6327db7551a0646cffcbaf9410f Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Wed, 26 Apr 2023 15:47:17 +0000 -Subject: [PATCH] include missing to support gcc-13 - -gcc 13 moved some includes around and as a result is no longer transitively -included [1]. Explicitly include it for uint{32,64}_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Signed-off-by: Rudi Heitbaum -Signed-off-by: Bernd Kuhls -Upstream: https://github.com/xbmc/inputstream.adaptive/commit/7b5c284e63c1d6327db7551a0646cffcbaf9410f -[Bernd: backported from Omega branch] ---- - src/Iaes_decrypter.h | 3 ++- - src/SSD_dll.h | 1 + - src/utils/FileUtils.h | 1 + - src/utils/PropertiesUtils.h | 1 + - src/utils/StringUtils.h | 1 + - src/utils/Utils.h | 1 + - src/utils/XMLUtils.h | 1 + - 7 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/Iaes_decrypter.h b/src/Iaes_decrypter.h -index 7fdf6046d..da992be95 100644 ---- a/src/Iaes_decrypter.h -+++ b/src/Iaes_decrypter.h -@@ -10,6 +10,7 @@ - - #include - -+#include - #include - - class IAESDecrypter -@@ -31,4 +32,4 @@ class IAESDecrypter - - private: - std::string m_licenseKey; --}; -\ No newline at end of file -+}; -diff --git a/src/SSD_dll.h b/src/SSD_dll.h -index 4b2b70c1a..d23fcbe45 100644 ---- a/src/SSD_dll.h -+++ b/src/SSD_dll.h -@@ -8,6 +8,7 @@ - - #pragma once - -+#include - #include // va_list, va_start, va_arg, va_end - #include - -diff --git a/src/utils/FileUtils.h b/src/utils/FileUtils.h -index 40745b0d4..0924d8ff7 100644 ---- a/src/utils/FileUtils.h -+++ b/src/utils/FileUtils.h -@@ -8,6 +8,7 @@ - - #pragma once - -+#include - #include - #include - -diff --git a/src/utils/PropertiesUtils.h b/src/utils/PropertiesUtils.h -index dee3e0a16..a658b835c 100644 ---- a/src/utils/PropertiesUtils.h -+++ b/src/utils/PropertiesUtils.h -@@ -8,6 +8,7 @@ - - #pragma once - -+#include - #include - #include - #include -diff --git a/src/utils/StringUtils.h b/src/utils/StringUtils.h -index 3f841a274..f209546fa 100644 ---- a/src/utils/StringUtils.h -+++ b/src/utils/StringUtils.h -@@ -8,6 +8,7 @@ - - #pragma once - -+#include - #include - #include - #include -diff --git a/src/utils/Utils.h b/src/utils/Utils.h -index 4966ece63..472a328c4 100644 ---- a/src/utils/Utils.h -+++ b/src/utils/Utils.h -@@ -8,6 +8,7 @@ - - #pragma once - -+#include - #include - #include - #include diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index b29a0af1483d..2c130fbbdf90 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 ed266d2a51efcd0952cfacc8549350282dce07f7c0e885eeb41d662f123e12a6 kodi-inputstream-adaptive-20.3.11-Nexus.tar.gz +sha256 da21f6c765c208e4ba0fd8958954fe5681b393fc432d7b139946847214535228 kodi-inputstream-adaptive-20.3.12-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 6b11532b0e32..ebcf9e10d337 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.11-Nexus +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.12-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ From 4befd0b3256caf6f882a91868717b67306b74350 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 25 Aug 2023 23:05:38 +0200 Subject: [PATCH 1762/2890] package/kodi-pvr-nextpvr: bump version to 20.4.3-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 9ef0d4e75858..dcbc504a23d0 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1ce85447426ddf6d443a5e3444145a2d3af65ce73d9fb583e42cd8afc9d599a5 kodi-pvr-nextpvr-20.4.2-Nexus.tar.gz +sha256 752dff532a277797f3fefc1ced7fea6efb8d92982d9040c4080c1e6dbab203a0 kodi-pvr-nextpvr-20.4.3-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index 2629cd914765..e89aed7d0ad0 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 20.4.2-Nexus +KODI_PVR_NEXTPVR_VERSION = 20.4.3-Nexus KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md From 6cfb3efaaf743696da02a45dedba49f1afb3b12f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 9 Aug 2023 20:19:25 +0200 Subject: [PATCH 1763/2890] package/i2c-tools: switch python support to setuptools In Python 3.12, support for 'distutils' is going to be dropped. In preparation for this, this commit backports an upstream i2c-tools patch that switches the build logic to 'setuptools', future-proofing i2c-tools to the upcoming bump to Python 3.12. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...-Use-setuptools-instead-of-distutils.patch | 38 +++++++++++++++++++ package/i2c-tools/i2c-tools.mk | 10 ++--- 2 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 package/i2c-tools/0001-py-smbus-Use-setuptools-instead-of-distutils.patch diff --git a/package/i2c-tools/0001-py-smbus-Use-setuptools-instead-of-distutils.patch b/package/i2c-tools/0001-py-smbus-Use-setuptools-instead-of-distutils.patch new file mode 100644 index 000000000000..63b2a7f82f15 --- /dev/null +++ b/package/i2c-tools/0001-py-smbus-Use-setuptools-instead-of-distutils.patch @@ -0,0 +1,38 @@ +From cf3541b8a7ed50782edd05836020d31230fb86c6 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Wed, 19 Jan 2022 12:08:53 +0100 +Subject: py-smbus: Use setuptools instead of distutils + +As per [1], distutils is deprecated in Python 3.10 and will be removed +entirely in Python 3.12. + +As setuptools is essentially an enhanced version of distutils, it's +trivial to port to that. + +[1] https://docs.python.org/3/whatsnew/3.10.html#distutils-deprecated + +Signed-off-by: Ross Burton +Signed-off-by: Jean Delvare + +Upstream: https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/commit/?id=cf3541b8a7ed50782edd05836020d31230fb86c6 + +Signed-off-by: Bernd Kuhls +--- + py-smbus/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/py-smbus/setup.py b/py-smbus/setup.py +index 28a4500..26db33a 100644 +--- a/py-smbus/setup.py ++++ b/py-smbus/setup.py +@@ -1,6 +1,6 @@ + #!/usr/bin/env python + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + + setup( name="smbus", + version="1.1", +-- +cgit + diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index 5c9ce2662812..adccd9475dac 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -14,7 +14,7 @@ I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog I2C_TOOLS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_PYTHON3),y) -I2C_TOOLS_DEPENDENCIES += python3 +I2C_TOOLS_DEPENDENCIES += host-python-setuptools python3 endif ifeq ($(BR2_STATIC_LIBS),y) @@ -28,23 +28,23 @@ endif # Build/install steps mirror the distutil python package type in the python package # infrastructure ifeq ($(BR2_PACKAGE_PYTHON3),y) -# BASE_ENV taken from PKG_PYTHON_DISTUTILS_ENV in package/pkg-python.mk +# BASE_ENV taken from PKG_PYTHON_SETUPTOOLS_ENV in package/pkg-python.mk I2C_TOOLS_PYTHON_BASE_ENV = \ - $(PKG_PYTHON_DISTUTILS_ENV) \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ CFLAGS="$(TARGET_CFLAGS) -I../include" define I2C_TOOLS_BUILD_PYSMBUS (cd $(@D)/py-smbus; \ $(I2C_TOOLS_PYTHON_BASE_ENV) \ $(HOST_DIR)/bin/python setup.py build \ - $(PKG_PYTHON_DISTUTILS_BUILD_OPTS)) + $(PKG_PYTHON_SETUPTOOLS_BUILD_OPTS)) endef define I2C_TOOLS_INSTALL_PYSMBUS (cd $(@D)/py-smbus; \ $(I2C_TOOLS_PYTHON_BASE_ENV) \ $(HOST_DIR)/bin/python setup.py install \ - $(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)) + $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)) endef endif # BR2_PACKAGE_PYTHON3 From 5acaac7122945c7588cf2328d928e1d4fb6488dd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 10 Aug 2023 06:32:52 +0200 Subject: [PATCH 1764/2890] package/gcc: fix powerpc toolchain issues with 64-bit capable cores Some of the powerpc CPUs supported by Buildroot are dual mode CPUs, which means 32 Bit and 64 Bit mode is supported, and for any 64-bit capable CPU, GCC defaults to using 64-bit, even if the toolchain tuple starts with powerpc-* (and not powerpc64-*). This causes issues when building toolchains with uClibc or musl. In order to resolve this, we force GCC to understand we want to generate 32-bit code, using the --with-cpu-32 option. See here the gcc documentation for details about --with-cpu-32: https://gcc.gnu.org/install/configure.html See here for a discussion on the musl mailinglist about the error: https://inbox.vuxu.org/musl/20220722162900.GB1320090@port70.net/ Fixes: - http://autobuild.buildroot.net/results/450/4509d8cfb7d99beb4ef023f170490def1d90f92c - http://autobuild.buildroot.net/results/654/6545a464d49f9f3c6740a5208cfad7f09ec4cb8b - http://autobuild.buildroot.net/results/cf8/cf866d5320b069eb1e8b4f05e8e58de0ad2ec7b5 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/gcc/gcc.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 1ecbf7e9b4ae..305022917690 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -225,9 +225,17 @@ endif ifneq ($(GCC_TARGET_FP32_MODE),) HOST_GCC_COMMON_CONF_OPTS += --with-fp-32="$(GCC_TARGET_FP32_MODE)" endif + +# musl/uClibc-ng does not work with biarch powerpc toolchains, we +# need to configure gcc explicitely for 32 Bit for CPU's supporting +# 64 Bit and 32 Bit ifneq ($(GCC_TARGET_CPU),) +ifeq ($(BR2_powerpc),y) +HOST_GCC_COMMON_CONF_OPTS += --with-cpu-32=$(GCC_TARGET_CPU) +else HOST_GCC_COMMON_CONF_OPTS += --with-cpu=$(GCC_TARGET_CPU) endif +endif ifneq ($(GCC_TARGET_FPU),) HOST_GCC_COMMON_CONF_OPTS += --with-fpu=$(GCC_TARGET_FPU) From 7b02ca842d5361253fe502747cdd380b67d94e47 Mon Sep 17 00:00:00 2001 From: Jan Havran Date: Sun, 21 Aug 2022 13:04:18 +0200 Subject: [PATCH 1765/2890] board/pine64/pinecube: new board Add support for PineCube with: - U-Boot 2022.04 - Linux 5.15.61 PineCube is a low-powered, open source IP camera with the following specs: - Allwinner S3 Cortex-A7 - 128 MiB DDR3 - 16 MiB SPI flash - 5 MPx OV5640 camera - MicroSD slot - 10/100M Ethernet with passive PoE - 802.11 b/g/n WiFi - Bluetooth 4.1 - USB 2.0 - 26 pins GPIO header - Microphone - IR LEDs for night vision Board homepage: https://www.pine64.org/cube/ Board wiki: https://wiki.pine64.org/wiki/PineCube Signed-off-by: Jan Havran Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 +++ board/pine64/pinecube/extlinux.conf | 4 +++ board/pine64/pinecube/genimage.cfg | 34 ++++++++++++++++++++++ board/pine64/pinecube/post-build.sh | 5 ++++ board/pine64/pinecube/readme.txt | 31 ++++++++++++++++++++ configs/pine64_pinecube_defconfig | 45 +++++++++++++++++++++++++++++ 6 files changed, 123 insertions(+) create mode 100644 board/pine64/pinecube/extlinux.conf create mode 100644 board/pine64/pinecube/genimage.cfg create mode 100755 board/pine64/pinecube/post-build.sh create mode 100644 board/pine64/pinecube/readme.txt create mode 100644 configs/pine64_pinecube_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index f91c4e9a2b41..241de082eb05 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1494,6 +1494,10 @@ F: board/microchip/mpfs_icicle/ F: configs/microchip_mpfs_icicle_defconfig F: package/microchip-hss-payload-generator/ +N: Jan Havran +F: board/pine64/pinecube/ +F: configs/pine64_pinecube_defconfig + N: Jan Heylen F: package/opentracing-cpp/ diff --git a/board/pine64/pinecube/extlinux.conf b/board/pine64/pinecube/extlinux.conf new file mode 100644 index 000000000000..6a18d9a2cb9d --- /dev/null +++ b/board/pine64/pinecube/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /zImage + devicetree /sun8i-s3-pinecube.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait rw diff --git a/board/pine64/pinecube/genimage.cfg b/board/pine64/pinecube/genimage.cfg new file mode 100644 index 000000000000..398d45e2f7e7 --- /dev/null +++ b/board/pine64/pinecube/genimage.cfg @@ -0,0 +1,34 @@ +image boot.vfat { + vfat { + files = { + "zImage", + "sun8i-s3-pinecube.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 504K # 512KB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/pine64/pinecube/post-build.sh b/board/pine64/pinecube/post-build.sh new file mode 100755 index 000000000000..8dae08a47cd8 --- /dev/null +++ b/board/pine64/pinecube/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf diff --git a/board/pine64/pinecube/readme.txt b/board/pine64/pinecube/readme.txt new file mode 100644 index 000000000000..4cf6df211072 --- /dev/null +++ b/board/pine64/pinecube/readme.txt @@ -0,0 +1,31 @@ +Intro +===== + +This directory contains a Buildroot configuration for building a +Pine64 PineCube. + +Board homepage: https://www.pine64.org/cube/ +Board wiki: https://wiki.pine64.org/wiki/PineCube + +How to build it +=============== + + $ make pine64_pinecube_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sudo sync + +Insert the micro SDcard in your PineCube and power it up. The console +is on the serial port 2, 115200 8N1 (check Wiki for board pinout). diff --git a/configs/pine64_pinecube_defconfig b/configs/pine64_pinecube_defconfig new file mode 100644 index 000000000000..8f60115f8f60 --- /dev/null +++ b/configs/pine64_pinecube_defconfig @@ -0,0 +1,45 @@ +# Target options +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y + +# Toolchain options +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# System configuration +BR2_TARGET_GENERIC_HOSTNAME="pinecube" +BR2_TARGET_GENERIC_ISSUE="Welcome to Pine64 Pinecube" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/pinecube/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/pinecube/genimage.cfg" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.61" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-s3-pinecube" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pinecube" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" + +# Required host utilities for building an SDCard image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From e0166ecba0109f7f6757415afa7e7a67b058d406 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 26 Aug 2023 23:00:11 +0200 Subject: [PATCH 1766/2890] support/misc/gitlab-ci.yml.in: retry a job only if it failed due to a runner issue Each time a new pipeline is triggered, some jobs may fail due to temporary issue with a Gitlab runner (network, power supply, docker or maintainance). Most of the problems are "runner system failure" [1] and require to retart each failed jobs manually by maintainers to complete the pipeline with only real failures if any. The "retry" keyword allows to configure how many times a job is retried if it fails. "retry:when" allows to retry a failed job only on specific failure types like "runner_system_failure". While at it, retry a job if it failed due to a timeout failure (this timeout means that the job was pending for more than 24h) [2]. Such timeout failures occur on pipelines testing each Buildroot's defconfig since there is not enough gitlab runner available to build all of them within 24h. Retry only jobs that are more likely to wait for a runner (generate-gitlab-ci-yml, runtime_test_base, defconfig_base and test_pkg). [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/4936949397 (runner system failure) [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/4936949530 (timeout failure or the job got stuck) https://docs.gitlab.com/ee/ci/yaml/#retrywhen Signed-off-by: Romain Naour Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 5 +++++ support/misc/gitlab-ci.yml.in | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed17bb14b9a4..3d7719568f06 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,11 @@ stages: generate-gitlab-ci-yml: stage: generate-gitlab-ci script: ./support/scripts/generate-gitlab-ci-yml support/misc/gitlab-ci.yml.in > generated-gitlab-ci.yml + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always paths: diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 446132846f4c..4d9acbc3d3dc 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -67,6 +67,11 @@ before_script: tail -200 runtime-test.log exit 1 } + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always expire_in: 2 weeks @@ -99,6 +104,11 @@ before_script: - TEST_CASE_NAME=${CI_JOB_NAME} - echo "Starting runtime test ${TEST_CASE_NAME}" - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always expire_in: 2 weeks @@ -119,6 +129,11 @@ before_script: needs: - pipeline: $PARENT_PIPELINE_ID job: generate-gitlab-ci-yml + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always expire_in: 2 weeks From df6aed587ff0f2280e6aaa0fcebf8b83700e81d8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 14 Aug 2023 04:24:53 -0600 Subject: [PATCH 1767/2890] package/{rust, rust-bin}: security bump to version 1.71.1 Fixes CVE-2023-38497: Cargo not respecting umask when extracting crate archives https://blog.rust-lang.org/2023/08/03/cve-2023-38497.html Link to Rust 1.71.1 announcement: https://blog.rust-lang.org/2023/08/03/Rust-1.71.1.html Signed-off-by: James Hilliard [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 211ac424ed83..a11a964a90bb 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.71.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.71.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 9712efaa9c7977b6f03aeb3ef086d0050273f498790bf242e96b9a8117de901f rust-1.71.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.71.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.71.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 afd7148aaacdd38acb2f02ded9dd31c833d6f20d99f3f4b5617282295d2092d7 rust-1.71.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.71.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.71.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 bd0bcdb5fc5c4a9561de7b10361267a25e623de02c65734e76ee904b816f6a56 rust-1.71.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.71.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.71.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 f76bc0fdd382d5064d69e5888bcf81312e5ee2b0a700a7a54f240e7c5090bf5f rust-1.71.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.71.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.71.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 c0a31776d8d1ea351cf40c02e1cfa0ed05f3bcdcdd8b203a87447b31fd2bae30 rust-1.71.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.71.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.71.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 90a4483ba3aa1e3eea4660fbdddad31b3b43fe89458c1d9805b22dac6136abe7 rust-1.71.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 1cdfccb28bed3ad6b0204e3773e3aa43a8687d1740dcb3dd21b4b37ae5308ac1 rust-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 afa670835f244adf06486fa5966e106366b39817d7bbae18504cb6767208ebe9 rust-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.71.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.71.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 a632cfda657b105c0355ebd575d54ef2e931827befb3e098098b7c3fba085f47 rust-1.71.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.71.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.71.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 7ae6cf3686f7638c8263d6d7aba68e275edee4e4d832723c603ddab96e330fa4 rust-1.71.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 58542a0ab1162ce05a45eb751793782dc24c5bf8eb9a7467317f254260305ea6 rust-std-1.71.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 759567c0e070a686a593e163c72aeda9e17eb85e783d00d0d5f5642471c65ccc rust-std-1.71.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 fdf359b745d750aeb292a59676ed31acd5ddcc74fb6e987b9bb51dfbf466f3b6 rust-std-1.71.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 452fda324514d5c2431a6c66f376a1369b7199cfa0464f8e669af3b196dabccc rust-std-1.71.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 43a64dc0a6711802bd9de917a17b17e12099d4d7ed9478c5d86b9170ff104ed3 rust-std-1.71.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 774b5f95730179ed561cb4937b6e7813d0424a6ada69ebba45f240fed61c3165 rust-std-1.71.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 9a3aeefbf7dc6eea4e7f437878f0e1af161963ed45b7979581014a0d8bd6602e rust-std-1.71.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 33533c29f7435837bc3c274e11eb5f538a9c56eae3bac0ae6c682aeab56bb53b rust-std-1.71.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 7f03a6caa03353da24851da5cd7ed8d07394d7134de680174ee7877302aa6f79 rust-std-1.71.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 fda8b435939f48364b879981d913df16b10c2951d143da4bbc60e49e013c7ddc rust-std-1.71.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 f4ce3c4436ab691e979e012bab626062c3f14b3fc798dc26b5dcbd1344a85e2e rust-std-1.71.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 1db88e655caa1e4af31c7104de50339d9e8a53fb92f23cd302263cea934d6f79 rust-std-1.71.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 5878f641f4e5a12ced79d2f0d5d9a9d5b0b97b56967684cf09357162c3e6a7b7 rust-std-1.71.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-i586-unknown-linux-musl.tar.xz.asc -sha256 2f62eb58d29a24a8a0d1c8f8b314e676b419cd6d324c02ed63af14954c57467d rust-std-1.71.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 46976bf8297efc65556ccddfec395d5327fbe303f9dabffd104628a37cb1de6d rust-std-1.71.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-i686-unknown-linux-musl.tar.xz.asc -sha256 fa84fb37715f10075060cb4c9acf39dcc568b58b155ae1cbc913334b93423dac rust-std-1.71.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 a259bddfc3ee36279b016ebd2682fc5b4d1b93c63bed6e4f57b5a2963d661dc9 rust-std-1.71.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips-unknown-linux-musl.tar.xz.asc -sha256 25f020e04a18e67bf98751c9f80ac07abfd298264d45d1228d66d2fc21c6c681 rust-std-1.71.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 1af97099a18357a0c36d6c4e6ace4973cd60186d76ff115ea14f6b031f86d7da rust-std-1.71.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 5d469176aae820868d4f86889621a371670d7ca2c860708f625da36b612ae4ab rust-std-1.71.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 d95d52c63989d80c9284d33c6db438763426c18fc814357de3e2c0ffc0f202dd rust-std-1.71.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 103e5ac47a362f6db324eb08673f2b54ab041428585d5f3b9e991846f709b840 rust-std-1.71.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 ad91d662c93e5092367048c8e717f64a5096b876623e5fbc3c791b2d1f868dfb rust-std-1.71.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 9dc87b5807730e6a69c2bfc167d93599c6dd481fe5189ce1e395787c432d4353 rust-std-1.71.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 fac6cc57d8a922423db2f0239b8484df3b029d0b58a63676868de682680bbf87 rust-std-1.71.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 628957fbe1f8665578167c6814486941f7b04417dce8a499cababa3284a2260a rust-std-1.71.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 3ce73e032232522cd7c37e64b1e8895f16ddcef02b1646d078f67bb36b6c1494 rust-std-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 bf692cee46d6c04c3993795633fdc5d4c1dffa7e4d4924227fa3e044872440a4 rust-std-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 4ceab97a7c15e1235aa099306798e1eb8620aad5477b7123dc9e343bb9a6fcfe rust-std-1.71.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 679ef3ee4a3876f071e08539734de2fabfcc3410977e8c20ba685bc9f40a693b rust-std-1.71.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 98ae6530c3a41167e9d93d11ea078be98a02f6d809a06d0d51af3ce0f73150d7 rust-std-1.71.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.71.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.71.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 c91408683fe0918732525ec1e70263d3fc871ec8d15ae98768a1c6d7b9e3bff1 rust-std-1.71.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 911f2370b67b066cefd2ee772c5219015817e2c2dc327351f8b00c5ca7a1098f rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 c8ec5dcb8f59276d46360ed832fb428d212985fd5b2b0591e6f70a279d10274f rust-1.71.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 64f3189a2c55a8c7323e344c891d07637448454a10fed6dad5f7744f25abea94 rust-1.71.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 8f35174620db211a99743660c7eddff1b41ad2d4c80787d4e6c808d548bdf3b7 rust-1.71.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 ec14ef19f8929029435f5c0f9ee1c92534454e03369767968c0353fcd7b41791 rust-1.71.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 a03ad9d193960a2303269d98cd99f9f27990eb3874e76396282a49347c048085 rust-1.71.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 be14d5e2978f72e2607d7d6611f7e4066e772a46e0effa97862a60ee51f9afa8 rust-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 b2a0562d547a48ed6279a1594ca2a489ee34c08dc4181b1117b900bc2f4ccfc9 rust-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 ba282d429013028c45ea14ea4d909c3a1bb5ef2f57bca1dda7b436216554977d rust-1.71.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 ee205c9ee095ee5a9382332422b0be2bd2737451c6dd6e24cb2a28cec16b97ac rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 232afbb1b8673694742eba6444ee7c70294ca6da285cdeef9d43acd3f4c58ddc rust-std-1.71.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 347af135014822d0f191241457ee1fba28ee85285bc26881c5137989fcb0fa53 rust-std-1.71.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 68c51ede38dc74e6adac606ddba7d688b4f5f9df058e922916af73cd59b17379 rust-std-1.71.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 4720dee4efe1cbcf7c21ba3a5806dbfb6f7f04e67dec1a79c3fd61d5fd2deea3 rust-std-1.71.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 d1746b00db5d0ad09749e5a93740830a2850bcbd726b2e96d44fff06a2c72f6c rust-std-1.71.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 21533a39478f7484e22d733154405dca2842e2ad0f38cb1f53d6edbe85bb6e2d rust-std-1.71.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 9a5b0aa20ab0f1951af9ba79df9e28d2cd57612f1d309e8210d2c24334d8332f rust-std-1.71.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 aa8dbaf140b357c392ea2364b2d22a735900ca2d0d6e609c85b94666725c4999 rust-std-1.71.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 7f3816824948a017135d5c58aeb97df962f2e60575a18f18967eb473e68c7cdc rust-std-1.71.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 030a8ad8e5b794c5ca265a8837c46da442acae7c1ad2c4dfb61e9f751ddcfa1e rust-std-1.71.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 66a7c87d9a78fa4799eea5c73d885c4e6da17608d1f8e13823b298d82310ccca rust-std-1.71.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 afb5e6f523ec8b0ffc033942af53c4f60e564122f85af4e405b4c4ef7643f182 rust-std-1.71.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 a8bead93f5260c81f7a6795a29e8365ac30b966e7808c4957a4bd37843ab4e80 rust-std-1.71.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-i586-unknown-linux-musl.tar.xz.asc +sha256 7314624674c9817de083c0e88ea8650d839273a55f03de2e6f037ba64309d477 rust-std-1.71.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 672811c88fd5ffc5185d40eeecc7d257aeff47c9b48e0ced70ccea1e2559b273 rust-std-1.71.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-i686-unknown-linux-musl.tar.xz.asc +sha256 5d214864c9c62ea65e460e75ea65e2313b5b68a9db11f1c30edf271c8b041097 rust-std-1.71.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 e4348549904d9fff3f4d5608464d463815b8f47a3361927cf87458b4daf6b093 rust-std-1.71.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips-unknown-linux-musl.tar.xz.asc +sha256 e9d3caf95d111029f6a882ed2ca322a7d2c182e4c094a1f383725ae1aa980707 rust-std-1.71.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 c3185d57e96832d1a6c5e48e83e75698a46a49675432a367ecd0701c481d1280 rust-std-1.71.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 6f5549ff40278b8baa84c203730d348fff94aef20372c28fd373bc55acf99a3e rust-std-1.71.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 c6cf211aa291e09115fb08a96070deb1c9b292ef21e4263ee80e168eb66c675f rust-std-1.71.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 9cd1a7b2364d6af230e96700bd6b631b7f8dcfc3bad0feffefdf9ca6ce1df79c rust-std-1.71.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 05eb744705ac17a1b21693891219051ffbec05f2bc2be84f1eb4c5d1573f1b15 rust-std-1.71.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 4fb95536ff01b04f57cd14eebb57043e7d420aabce4b0b5beb3133f3a9844fa4 rust-std-1.71.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 8a5e93d9a106c90d658b88c8ded15b8d2446d3d6316f5d477b3b259b62119d7c rust-std-1.71.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 73d80d654f0b04a7b05168d08322ea9e4cc3bceeb8546cad5f398f8bbdeeddf5 rust-std-1.71.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 949c3d340674aac746a0278bb90707b179b95afe37200a61f05c56e8bdfc9060 rust-std-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 dd8399582595bc449aee5c7c7fb5d8061338be36583404a82e2d9e5b20743dae rust-std-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 60275c7d1a36abec87bf6e151d908a04e5cd28d22215fe0098caa4342f1c30d0 rust-std-1.71.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 92e46ba59c0f402691a810a6b57136ebccbcfab4beefb0ccfca55e3fb288180d rust-std-1.71.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 31f392df564850d78be80adc625b06a3964a49ef5c519075b930f2042a422264 rust-std-1.71.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.71.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 20667738a9005dda0386c8b6e59d55ce3044be11f78002f6640ca874d6911483 rust-std-1.71.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index 2336887ae6b1..db31e26a70b4 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.71.0 +RUST_BIN_VERSION = 1.71.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 7940ce09a53c..59270e195727 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.71.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.71.0-src.tar.xz.asc -sha256 5814699031aafdcc2e2f71fc9b389678cd7042350d1583da061463d8e88681c7 rustc-1.71.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.71.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.71.1-src.tar.xz.asc +sha256 371af0fbe04051e20a74dbea6d4e4e548f10f15309c49cae2688afb882b6c7f1 rustc-1.71.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d2625318fda6..a55bc447f494 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.71.0 +RUST_VERSION = 1.71.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From 387d66dc4f5c9fc4491c2da5b1de93e16a775483 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 29 Aug 2023 07:09:27 +0200 Subject: [PATCH 1768/2890] package/clamav: security bump version to 1.0.3 Release notes: https://blog.clamav.net/2023/08/clamav-120-feature-version-and-111-102.html Fixes CVE-2023-40477: "Upgrade the bundled UnRAR library (libclamunrar) to version 6.2.10." Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 9a41806d1e01..c140a2df078c 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 71dd39fe0d3937747fc280ea07c15cc990269257c4abb12dc438b4409d1b44c7 clamav-1.0.2.tar.gz +sha256 8779458dc31fdee1232eb8986f092d25568b39f5d337c0cbcd9c1abb5dc2886b clamav-1.0.3.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index e677c3375a17..e1e0fa8c63b3 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 1.0.2 +CLAMAV_VERSION = 1.0.3 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = \ From c9a4c8a0564dd5dcdaa9aa82a1e5830acd5ff08c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 28 Aug 2023 18:24:17 +0200 Subject: [PATCH 1769/2890] {linux, linux-headers}: bump 6.1.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/linux.hash | 2 +- package/linux-headers/Config.in.host | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index d236dadad833..fb2bfebd61f7 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 cca91be956fe081f8f6da72034cded96fe35a50be4bfb7e103e354aa2159a674 linux-6.4.12.tar.xz -sha256 c606cbd0353e677df6fae73cc16ba3c9244b98372ed7771d551024016f55ac31 linux-6.1.48.tar.xz +sha256 c9ea14231ca4ca6e3882a9339a8c3c414e4c91519d3e50af6822f47e99057a0f linux-6.1.49.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 0f2eca845183fd76f53b0c867c97f12b9ace2d7e8ee2cdeec7eb2897651b80de linux-5.15.128.tar.xz sha256 c40d11ee56e50a132429badbd1ba1c53e42b3312590b2a39be34c241d1b0b5b9 linux-5.10.192.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ba8d0f897ca8..deb3067b609b 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -405,7 +405,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.254" if BR2_KERNEL_HEADERS_5_4 default "5.10.192" if BR2_KERNEL_HEADERS_5_10 default "5.15.128" if BR2_KERNEL_HEADERS_5_15 - default "6.1.48" if BR2_KERNEL_HEADERS_6_1 + default "6.1.49" if BR2_KERNEL_HEADERS_6_1 default "6.4.12" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From e5e9f5d78bf808e2ba8b97fd7a3f4b74e968b1a1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 29 Aug 2023 07:16:39 +0200 Subject: [PATCH 1770/2890] package/unrar: bump version to 6.2.10 According to https://www.rarlab.com/vuln_rev3_names.html this package is not affected by CVE-2023-40477. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/unrar/unrar.hash | 2 +- package/unrar/unrar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index bc8f98687562..f0600af771f7 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0c2d4cbc8b34d0e3bec7b474e0f52bbcc6c4320ec089b4141223ee355f63c318 unrarsrc-6.2.6.tar.gz +sha256 55fe6ebd5e48d6655bfda3fd19b55438ca05e13c7e69772420caad9fdb68ef42 unrarsrc-6.2.10.tar.gz sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index f59d199558ec..ac19225937ab 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 6.2.6 +UNRAR_VERSION = 6.2.10 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = https://www.rarlab.com/rar UNRAR_LICENSE = unrar From 41280018b37cf1cb49d3716e17729279bc55f8ed Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Aug 2023 08:34:00 +0200 Subject: [PATCH 1771/2890] package/f2fs-tools: fix musl compile error musl 1.2.4 removed the lseek64 function, but kept a definition of lseek64 when _LARGEFILE64_SOURCE is defined. Add patch from upstream to kill the usage of lseek64. There is no need to backport it to older Buildroot releases, because musl 1.2.4 is not part of any release. Fixes: - http://autobuild.buildroot.net/results/17f/17f4ea7d62581cf8c574deeb98e1785220d5bd3f Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...ls-convert-to-lseek-and-kill-lseek64.patch | 459 ++++++++++++++++++ 1 file changed, 459 insertions(+) create mode 100644 package/f2fs-tools/0001-f2fs-tools-convert-to-lseek-and-kill-lseek64.patch diff --git a/package/f2fs-tools/0001-f2fs-tools-convert-to-lseek-and-kill-lseek64.patch b/package/f2fs-tools/0001-f2fs-tools-convert-to-lseek-and-kill-lseek64.patch new file mode 100644 index 000000000000..3ee42db7b6ea --- /dev/null +++ b/package/f2fs-tools/0001-f2fs-tools-convert-to-lseek-and-kill-lseek64.patch @@ -0,0 +1,459 @@ +From b15b6cc56ac7764be17acbdbf96448f388992adc Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 23 Aug 2023 15:41:28 +0200 +Subject: [PATCH] f2fs-tools: convert to lseek() and kill lseek64 + +This patch replaces lseek64 with lseek() having #define _FILE_OFFSET_BITS 64. + +Signed-off-by: Waldemar Brodkorb +Signed-off-by: Jaegeuk Kim +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=b15b6cc56ac7764be17acbdbf96448f388992adc +--- + configure.ac | 2 -- + fsck/Makefile.am | 2 +- + include/android_config.h | 4 ---- + lib/Makefile.am | 2 +- + lib/libf2fs.c | 3 --- + lib/libf2fs_io.c | 47 +++++++++++++++------------------------ + lib/libf2fs_zoned.c | 1 - + mkfs/Makefile.am | 4 ++-- + mkfs/f2fs_format.c | 2 -- + mkfs/f2fs_format_main.c | 2 -- + mkfs/f2fs_format_utils.c | 10 --------- + mkfs/f2fs_format_utils.h | 2 -- + tools/Makefile.am | 2 +- + tools/f2fs_io/Makefile.am | 2 +- + tools/f2fs_io/f2fs_io.c | 6 ----- + tools/f2fs_io_parse.c | 1 - + tools/f2fscrypt.c | 9 -------- + tools/fibmap.c | 7 ------ + 18 files changed, 24 insertions(+), 84 deletions(-) + +diff --git a/configure.ac b/configure.ac +index efab8d8..123ddbb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -187,8 +187,6 @@ AC_CHECK_FUNCS_ONCE([ + getmntent + getuid + keyctl +- llseek +- lseek64 + memset + setmntent + clock_gettime +diff --git a/fsck/Makefile.am b/fsck/Makefile.am +index 579dd26..40d31b8 100644 +--- a/fsck/Makefile.am ++++ b/fsck/Makefile.am +@@ -1,7 +1,7 @@ + ## Makefile.am + + AM_CPPFLAGS = ${libuuid_CFLAGS} -I$(top_srcdir)/include +-AM_CFLAGS = -Wall ++AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 + sbin_PROGRAMS = fsck.f2fs + noinst_HEADERS = common.h dict.h dqblk_v2.h f2fs.h fsck.h node.h quotaio.h \ + quotaio_tree.h quotaio_v2.h xattr.h compress.h +diff --git a/include/android_config.h b/include/android_config.h +index 141fe06..da8abcb 100644 +--- a/include/android_config.h ++++ b/include/android_config.h +@@ -30,8 +30,6 @@ + #define HAVE_FSTAT 1 + #define HAVE_FSTAT64 1 + #define HAVE_GETMNTENT 1 +-#define HAVE_LLSEEK 1 +-#define HAVE_LSEEK64 1 + #define HAVE_MEMSET 1 + #define HAVE_SELINUX_ANDROID_H 1 + #define HAVE_SETMNTENT 1 +@@ -67,7 +65,6 @@ + #define HAVE_FSTAT 1 + #define HAVE_FSTAT64 1 + #define HAVE_GETMNTENT 1 +-#define HAVE_LLSEEK 1 + #define HAVE_MEMSET 1 + #define HAVE_SPARSE_SPARSE_H 1 + #define HAVE_LIBLZ4 1 +@@ -78,6 +75,5 @@ + #endif + + #if defined(_WIN32) +-#define HAVE_LSEEK64 + #define HAVE_SPARSE_SPARSE_H 1 + #endif +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 871d773..69d46f8 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -3,7 +3,7 @@ + lib_LTLIBRARIES = libf2fs.la + + libf2fs_la_SOURCES = libf2fs.c libf2fs_io.c libf2fs_zoned.c nls_utf8.c +-libf2fs_la_CFLAGS = -Wall ++libf2fs_la_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 + libf2fs_la_CPPFLAGS = -I$(top_srcdir)/include + libf2fs_la_LDFLAGS = -version-info $(LIBF2FS_CURRENT):$(LIBF2FS_REVISION):$(LIBF2FS_AGE) + +diff --git a/lib/libf2fs.c b/lib/libf2fs.c +index 577a7e8..c3d5744 100644 +--- a/lib/libf2fs.c ++++ b/lib/libf2fs.c +@@ -6,9 +6,6 @@ + * + * Dual licensed under the GPL or LGPL version 2 licenses. + */ +-#define _LARGEFILE64_SOURCE +-#define _FILE_OFFSET_BITS 64 +- + #include + #include + #include +diff --git a/lib/libf2fs_io.c b/lib/libf2fs_io.c +index 1a8167d..74e5f3a 100644 +--- a/lib/libf2fs_io.c ++++ b/lib/libf2fs_io.c +@@ -11,8 +11,6 @@ + * + * Dual licensed under the GPL or LGPL version 2 licenses. + */ +-#define _LARGEFILE64_SOURCE +- + #include + #include + #include +@@ -67,22 +65,13 @@ static int __get_device_fd(__u64 *offset) + return -1; + } + +-#ifndef HAVE_LSEEK64 +-typedef off_t off64_t; +- +-static inline off64_t lseek64(int fd, __u64 offset, int set) +-{ +- return lseek(fd, offset, set); +-} +-#endif +- + /* ---------- dev_cache, Least Used First (LUF) policy ------------------- */ + /* + * Least used block will be the first victim to be replaced when max hash + * collision exceeds + */ + static bool *dcache_valid; /* is the cached block valid? */ +-static off64_t *dcache_blk; /* which block it cached */ ++static off_t *dcache_blk; /* which block it cached */ + static uint64_t *dcache_lastused; /* last used ticks for cache entries */ + static char *dcache_buf; /* cached block data */ + static uint64_t dcache_usetick; /* current use tick */ +@@ -172,7 +161,7 @@ static int dcache_alloc_all(long n) + { + if (n <= 0) + return -1; +- if ((dcache_blk = (off64_t *) malloc(sizeof(off64_t) * n)) == NULL ++ if ((dcache_blk = (off_t *) malloc(sizeof(off_t) * n)) == NULL + || (dcache_lastused = (uint64_t *) + malloc(sizeof(uint64_t) * n)) == NULL + || (dcache_buf = (char *) malloc (F2FS_BLKSIZE * n)) == NULL +@@ -257,7 +246,7 @@ static inline long dcache_relocate(long entry, int n) + dcache_config.num_cache_entry; + } + +-static long dcache_find(off64_t blk) ++static long dcache_find(off_t blk) + { + register long n = dcache_config.num_cache_entry; + register unsigned m = dcache_config.max_hash_collision; +@@ -278,10 +267,10 @@ static long dcache_find(off64_t blk) + } + + /* Physical read into cache */ +-static int dcache_io_read(int fd, long entry, off64_t offset, off64_t blk) ++static int dcache_io_read(int fd, long entry, off_t offset, off_t blk) + { +- if (lseek64(fd, offset, SEEK_SET) < 0) { +- MSG(0, "\n lseek64 fail.\n"); ++ if (lseek(fd, offset, SEEK_SET) < 0) { ++ MSG(0, "\n lseek fail.\n"); + return -1; + } + if (read(fd, dcache_buf + entry * F2FS_BLKSIZE, F2FS_BLKSIZE) < 0) { +@@ -308,12 +297,12 @@ static int dcache_io_read(int fd, long entry, off64_t offset, off64_t blk) + * 1: cache not available (uninitialized) + * -1: error + */ +-static int dcache_update_rw(int fd, void *buf, off64_t offset, ++static int dcache_update_rw(int fd, void *buf, off_t offset, + size_t byte_count, bool is_write) + { +- off64_t blk; ++ off_t blk; + int addr_in_blk; +- off64_t start; ++ off_t start; + + if (!dcache_initialized) + dcache_init(); /* auto initialize */ +@@ -377,13 +366,13 @@ static int dcache_update_rw(int fd, void *buf, off64_t offset, + * return value: 1: cache not available + * 0: success, -1: I/O error + */ +-int dcache_update_cache(int fd, void *buf, off64_t offset, size_t count) ++int dcache_update_cache(int fd, void *buf, off_t offset, size_t count) + { + return dcache_update_rw(fd, buf, offset, count, true); + } + + /* handles read into cache + read into buffer */ +-int dcache_read(int fd, void *buf, off64_t offset, size_t count) ++int dcache_read(int fd, void *buf, off_t offset, size_t count) + { + return dcache_update_rw(fd, buf, offset, count, false); + } +@@ -395,7 +384,7 @@ int dev_read_version(void *buf, __u64 offset, size_t len) + { + if (c.sparse_mode) + return 0; +- if (lseek64(c.kd, (off64_t)offset, SEEK_SET) < 0) ++ if (lseek(c.kd, (off_t)offset, SEEK_SET) < 0) + return -1; + if (read(c.kd, buf, len) < 0) + return -1; +@@ -534,10 +523,10 @@ int dev_read(void *buf, __u64 offset, size_t len) + + /* err = 1: cache not available, fall back to non-cache R/W */ + /* err = 0: success, err=-1: I/O error */ +- err = dcache_read(fd, buf, (off64_t)offset, len); ++ err = dcache_read(fd, buf, (off_t)offset, len); + if (err <= 0) + return err; +- if (lseek64(fd, (off64_t)offset, SEEK_SET) < 0) ++ if (lseek(fd, (off_t)offset, SEEK_SET) < 0) + return -1; + if (read(fd, buf, len) < 0) + return -1; +@@ -580,9 +569,9 @@ int dev_write(void *buf, __u64 offset, size_t len) + * dcache_update_cache() just update cache, won't do I/O. + * Thus even no error, we need normal non-cache I/O for actual write + */ +- if (dcache_update_cache(fd, buf, (off64_t)offset, len) < 0) ++ if (dcache_update_cache(fd, buf, (off_t)offset, len) < 0) + return -1; +- if (lseek64(fd, (off64_t)offset, SEEK_SET) < 0) ++ if (lseek(fd, (off_t)offset, SEEK_SET) < 0) + return -1; + if (write(fd, buf, len) < 0) + return -1; +@@ -596,7 +585,7 @@ int dev_write_block(void *buf, __u64 blk_addr) + + int dev_write_dump(void *buf, __u64 offset, size_t len) + { +- if (lseek64(c.dump_fd, (off64_t)offset, SEEK_SET) < 0) ++ if (lseek(c.dump_fd, (off_t)offset, SEEK_SET) < 0) + return -1; + if (write(c.dump_fd, buf, len) < 0) + return -1; +@@ -618,7 +607,7 @@ int dev_fill(void *buf, __u64 offset, size_t len) + /* Only allow fill to zero */ + if (*((__u8*)buf)) + return -1; +- if (lseek64(fd, (off64_t)offset, SEEK_SET) < 0) ++ if (lseek(fd, (off_t)offset, SEEK_SET) < 0) + return -1; + if (write(fd, buf, len) < 0) + return -1; +diff --git a/lib/libf2fs_zoned.c b/lib/libf2fs_zoned.c +index a0dd8bd..2ab2497 100644 +--- a/lib/libf2fs_zoned.c ++++ b/lib/libf2fs_zoned.c +@@ -6,7 +6,6 @@ + * + * Dual licensed under the GPL or LGPL version 2 licenses. + */ +-#define _LARGEFILE64_SOURCE + + #include + #include +diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am +index af5b1c7..bfffd88 100644 +--- a/mkfs/Makefile.am ++++ b/mkfs/Makefile.am +@@ -1,7 +1,7 @@ + ## Makefile.am + + AM_CPPFLAGS = ${libuuid_CFLAGS} ${libblkid_CFLAGS} -I$(top_srcdir)/include +-AM_CFLAGS = -Wall -DWITH_BLKDISCARD ++AM_CFLAGS = -Wall -DWITH_BLKDISCARD -D_FILE_OFFSET_BITS=64 + sbin_PROGRAMS = mkfs.f2fs + noinst_HEADERS = f2fs_format_utils.h + include_HEADERS = $(top_srcdir)/include/f2fs_fs.h +@@ -10,7 +10,7 @@ mkfs_f2fs_LDADD = ${libuuid_LIBS} ${libblkid_LIBS} $(top_builddir)/lib/libf2fs.l + + lib_LTLIBRARIES = libf2fs_format.la + libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c +-libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD ++libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD -D_FILE_OFFSET_BITS=64 + libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} ${libuuid_LIBS} -L$(top_builddir)/lib -lf2fs \ + -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE) + +diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c +index 019fb3a..d937eda 100644 +--- a/mkfs/f2fs_format.c ++++ b/mkfs/f2fs_format.c +@@ -6,8 +6,6 @@ + * + * Dual licensed under the GPL or LGPL version 2 licenses. + */ +-#define _LARGEFILE64_SOURCE +- + #include + #include + #include +diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c +index d8c9cea..08c1b25 100644 +--- a/mkfs/f2fs_format_main.c ++++ b/mkfs/f2fs_format_main.c +@@ -6,8 +6,6 @@ + * + * Dual licensed under the GPL or LGPL version 2 licenses. + */ +-#define _LARGEFILE64_SOURCE +- + #include + #include + #include +diff --git a/mkfs/f2fs_format_utils.c b/mkfs/f2fs_format_utils.c +index 448fbaa..437f113 100644 +--- a/mkfs/f2fs_format_utils.c ++++ b/mkfs/f2fs_format_utils.c +@@ -6,20 +6,10 @@ + * + * Dual licensed under the GPL or LGPL version 2 licenses. + */ +-#ifndef _LARGEFILE_SOURCE +-#define _LARGEFILE_SOURCE +-#endif +-#ifndef _LARGEFILE64_SOURCE +-#define _LARGEFILE64_SOURCE +-#endif + #ifndef _GNU_SOURCE + #define _GNU_SOURCE + #endif + +-#ifndef _FILE_OFFSET_BITS +-#define _FILE_OFFSET_BITS 64 +-#endif +- + #include + + #include +diff --git a/mkfs/f2fs_format_utils.h b/mkfs/f2fs_format_utils.h +index 807e7c3..6a7f687 100644 +--- a/mkfs/f2fs_format_utils.h ++++ b/mkfs/f2fs_format_utils.h +@@ -6,8 +6,6 @@ + * + * Dual licensed under the GPL or LGPL version 2 licenses. + */ +-#define _LARGEFILE64_SOURCE +- + #include "f2fs_fs.h" + + extern struct f2fs_configuration c; +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 6b03814..7dfffb1 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -1,7 +1,7 @@ + ## Makefile.am + + AM_CPPFLAGS = ${libuuid_CFLAGS} -I$(top_srcdir)/include +-AM_CFLAGS = -Wall ++AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 + sbin_PROGRAMS = + if !WINDOWS + sbin_PROGRAMS += fibmap.f2fs parse.f2fs +diff --git a/tools/f2fs_io/Makefile.am b/tools/f2fs_io/Makefile.am +index bc4f9d0..f5227ce 100644 +--- a/tools/f2fs_io/Makefile.am ++++ b/tools/f2fs_io/Makefile.am +@@ -2,7 +2,7 @@ + + if LINUX + AM_CPPFLAGS = -I$(top_srcdir)/include +-AM_CFLAGS = -Wall ++AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 + sbin_PROGRAMS = f2fs_io + f2fs_io_SOURCES = f2fs_io.c + endif +diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c +index 771fd16..1f6549b 100644 +--- a/tools/f2fs_io/f2fs_io.c ++++ b/tools/f2fs_io/f2fs_io.c +@@ -9,12 +9,6 @@ + #ifndef _GNU_SOURCE + #define _GNU_SOURCE + #endif +-#ifndef _LARGEFILE_SOURCE +-#define _LARGEFILE_SOURCE +-#endif +-#ifndef _LARGEFILE64_SOURCE +-#define _LARGEFILE64_SOURCE +-#endif + #ifndef O_LARGEFILE + #define O_LARGEFILE 0 + #endif +diff --git a/tools/f2fs_io_parse.c b/tools/f2fs_io_parse.c +index 47f1194..c3c1005 100644 +--- a/tools/f2fs_io_parse.c ++++ b/tools/f2fs_io_parse.c +@@ -8,7 +8,6 @@ + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +-#define _LARGEFILE64_SOURCE + #include + #include + #include +diff --git a/tools/f2fscrypt.c b/tools/f2fscrypt.c +index 8640ffa..d5222fb 100644 +--- a/tools/f2fscrypt.c ++++ b/tools/f2fscrypt.c +@@ -7,15 +7,6 @@ + * Authors: Michael Halcrow , + * Ildar Muslukhov + */ +- +-#ifndef _LARGEFILE_SOURCE +-#define _LARGEFILE_SOURCE +-#endif +- +-#ifndef _LARGEFILE64_SOURCE +-#define _LARGEFILE64_SOURCE +-#endif +- + #ifndef _GNU_SOURCE + #define _GNU_SOURCE + #endif +diff --git a/tools/fibmap.c b/tools/fibmap.c +index bda8238..3acc77b 100644 +--- a/tools/fibmap.c ++++ b/tools/fibmap.c +@@ -1,13 +1,6 @@ + #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) + #define _XOPEN_SOURCE 600 + #define _DARWIN_C_SOURCE +-#define _FILE_OFFSET_BITS 64 +-#ifndef _LARGEFILE_SOURCE +-#define _LARGEFILE_SOURCE +-#endif +-#ifndef _LARGEFILE64_SOURCE +-#define _LARGEFILE64_SOURCE +-#endif + #ifndef _GNU_SOURCE + #define _GNU_SOURCE + #endif +-- +2.39.2 + From e79533c751188383a2d08220841aabf02286cc60 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 Aug 2023 17:29:58 +0200 Subject: [PATCH 1772/2890] package/mutt: bump version to 2.2.11 See http://mutt.org/ for any news. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index c475641ab528..78bce765850d 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fa531b231d58fe1f30ceda0ed626683ea9ebdfb76ce47ef8bb27c2f77422cffb mutt-2.2.9.tar.gz +sha256 12325cf66d5ff8ac4bd87fac8db52c869de52dd278fc301cfd57d5a1f9f465cc mutt-2.2.11.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 5cf1b6bad22d..c5e4e4a14e9b 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.2.9 +MUTT_VERSION = 2.2.11 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From 4f4dd0d62fadc97b06e35aed2e947e387a6d6f6c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 28 Aug 2023 18:30:03 +0200 Subject: [PATCH 1773/2890] package/sqlite: bump version to 3.43.0 Release notes: https://sqlite.org/releaselog/3_43_0.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 39758f2b43ff..1a7f47edcdd9 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7abcfd161c6e2742ca5c6c0895d1f853c940f203304a0b49da4e1eca5d088ca6 sqlite-autoconf-3420000.tar.gz +sha256 49008dbf3afc04d4edc8ecfc34e4ead196973034293c997adad2f63f01762ae1 sqlite-autoconf-3430000.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 1576d6a3e188..5e676d5387f2 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.42.0 -SQLITE_TAR_VERSION = 3420000 +SQLITE_VERSION = 3.43.0 +SQLITE_TAR_VERSION = 3430000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2023 SQLITE_LICENSE = Public domain From a2ef47a4b56c5333bbc05ebc6f07e491646eb9ce Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Mon, 28 Aug 2023 14:04:19 +0200 Subject: [PATCH 1774/2890] package/libostree: bump to version 2023.6 Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 3b88b8200f89..d122fee86ebb 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bc593afb31fe1ac3d50419f917fafe321a0a3561d7bb2ba498a83740fe3adb14 libostree-2023.5.tar.xz +sha256 b43c4a373799681989bae12b3a1b94f453068dece6540b8e05a23b834c1037e2 libostree-2023.6.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index c61c1d15084e..15093f4b7adf 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2023.5 +LIBOSTREE_VERSION = 2023.6 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From e8332e66b4f063eb842bb934e4806a26f3cacfd2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 27 Aug 2023 11:35:41 +0300 Subject: [PATCH 1775/2890] package/daemon: bump to version 0.8.4 Update license info. COPYING hash updated because of added reference to additional licenses. Licenses for local snprintf and getopt implementations do not apply, since this code is not used for Linux targets. Add Tatu Ylonen Permissive license of the code in pseudo.c. Add LGPL-2.0+ license text file. Rename BSD-3-Clause text file and update hash because of text formatting change. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/daemon/daemon.hash | 8 +++++--- package/daemon/daemon.mk | 10 +++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/daemon/daemon.hash b/package/daemon/daemon.hash index 5ad7bf6ce2b5..f1346d269b87 100644 --- a/package/daemon/daemon.hash +++ b/package/daemon/daemon.hash @@ -1,7 +1,9 @@ # From http://www.libslack.org/daemon/ -sha256 b34b37543bba43bd086e59f4b754c8102380ae5c1728b987c890d5da4b4cf3ca daemon-0.8.2.tar.gz +sha256 fa28859ad341cb0a0b012c11c271814f870482013b49f710600321d379887cd1 daemon-0.8.4.tar.gz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE -sha256 35e31504fc0aec878e86900dde1d90a04404833c182f50d5678d873910bb11eb COPYING -sha256 5a93d5831e1297ab10fe643e1a631e83be392896da14ee2951285a79012df69d LICENSES/BSD-3-Clause.txt +sha256 34c8c7085e4d3920bfb8143b910d4f99194b9fc3e1cc3442c9b1b46db4382891 COPYING +sha256 8587dc1ea896f33b657d9e57bd3bf03f0c11ce07d041f09e687f87e7a0087b38 LICENSES/LicenseRef-BSD-3-Clause-Almost.txt sha256 aaf135472f81c5b4a0dca9367e5bb5e9750032b5bebe5442b36e4c0a47430df3 LICENSES/GPL-2.0-or-later.txt +sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt +sha256 1aa57d2704f6783460f2750a9f3217d083ed5161eb95438ca43a5674213a7128 LICENSES/LicenseRef-Tatu-Ylonen-Permissive.txt diff --git a/package/daemon/daemon.mk b/package/daemon/daemon.mk index 5e7e497ff133..d7709e03eff4 100644 --- a/package/daemon/daemon.mk +++ b/package/daemon/daemon.mk @@ -4,10 +4,14 @@ # ################################################################################ -DAEMON_VERSION = 0.8.2 +DAEMON_VERSION = 0.8.4 DAEMON_SITE = http://libslack.org/daemon/download -DAEMON_LICENSE = GPL-2.0+, LGPL-2.0+, BSD-3-Clause -DAEMON_LICENSE_FILES = LICENSE COPYING LICENSES/BSD-3-Clause.txt LICENSES/GPL-2.0-or-later.txt +DAEMON_LICENSE = GPL-2.0+, LGPL-2.0+, BSD-3-Clause, Tatu Ylonen permissive license +DAEMON_LICENSE_FILES = LICENSE COPYING \ + LICENSES/LicenseRef-BSD-3-Clause-Almost.txt \ + LICENSES/GPL-2.0-or-later.txt \ + LICENSES/LGPL-2.0-or-later.txt \ + LICENSES/LicenseRef-Tatu-Ylonen-Permissive.txt define DAEMON_CONFIGURE_CMDS (cd $(@D); ./configure) From 04bc8046305ed326d9ead496bda6368aff058975 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 29 Aug 2023 15:00:27 +0200 Subject: [PATCH 1776/2890] Update for 2023.08-rc3 Signed-off-by: Peter Korsgaard --- CHANGES | 17 +++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 49 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index d000ee945408..3ee83f64c624 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,20 @@ +2023.08-rc3, released August 29th, 2023 + + Fixes all over the tree. + + Defconfigs: Avenger96: Bump ATF to 2.9 to fix build warnings + with binutils >= 2.39. CI20: Bump kernel to 5.4.254 to fix + build issue with GCC 12. Hifive unleashed: Add missing + pylibfdt dependency / bump kernel to 5.10.109 to fix build + issue GCC 12. PC x86-64 bios/elf: Add missing libelf + dependency. Sipeed maix sdcard: Fix build issues with + binutils >= 2.38 + + Updated/fixed packages: check, clamav, cups, esp-hosted, + f2fs-tools, freeswitch, gcc, gmp, libks, libmodsecurity, + mosquitto, mpg123, network-manager, php, postgresql, python3, + ramspeed, rtl8189fs, rust, rust-bin, samba4, screen, zlib-ng + 2023.08-rc2, released August 20th, 2023 Fixes all over the tree. diff --git a/Makefile b/Makefile index f0ff9a148084..1a1ba92c66ee 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.08-rc2 +export BR2_VERSION := 2023.08-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1692567000 +BR2_VERSION_EPOCH = 1693313000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 45d6bbeef3ab..a4cce974de2a 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@

                    buildroot-2023.05.1.tar.xz

                    -

                    Latest release candidate: 2023.08-rc2

                    +

                    Latest release candidate: 2023.08-rc3

                    - +
                    - +
                    -

                    buildroot-2023.08-rc2.tar.gz

                    -

                    PGP signature

                    +

                    buildroot-2023.08-rc3.tar.gz

                    +

                    PGP signature

                    - +
                    - +
                    -

                    buildroot-2023.08-rc2.tar.xz

                    -

                    PGP signature

                    +

                    buildroot-2023.08-rc3.tar.xz

                    +

                    PGP signature

                    diff --git a/docs/website/news.html b/docs/website/news.html index 8c7cc8a8c260..aea677957909 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

                    News

                      +
                    • +
                      +
                      +
                      +

                      2023.08-rc3 released

                      +

                      29 August 2023

                      +
                      +
                      +

                      2023.08-rc3 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

                      + +

                      Head to the downloads page to pick up the + 2023.08-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

                      +
                      +
                      +
                      • +
                    • From 47b79476fb1a2a4e56e01d51e1f66752293392b3 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Tue, 29 Aug 2023 22:15:11 +0200 Subject: [PATCH 1777/2890] package/libxcrypt: fix build with perl >= 5.38 perl 5.38 deprecated smartmatch (~~ and the given/when syntax). Backport an upstream patch to drop uses of when. Fixes: - http://autobuild.buildroot.net/results/04c/04cf8d79fe8a58c3438e7be95ae781c9b2bef8a0/ Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- ...ommon.pm-compatible-with-latest-perl.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch diff --git a/package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch b/package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch new file mode 100644 index 000000000000..7a17fa5c1297 --- /dev/null +++ b/package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch @@ -0,0 +1,50 @@ +From ce562f4d33dc090fcd8f6ea1af3ba32cdc2b3c9c Mon Sep 17 00:00:00 2001 +From: Leon Timmermans +Date: Tue, 6 Jun 2023 17:03:57 +0200 +Subject: [PATCH] Make BuildCommon.pm compatible with latest perl + +It was previously using an experimental feature that has since been dropped. +This removes the use of that feature. + +Upstream: https://github.com/besser82/libxcrypt/commit/ce562f4d33dc090fcd8f6ea1af3ba32cdc2b3c9c +Signed-off-by: Daniel Lang +--- + build-aux/scripts/BuildCommon.pm | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/build-aux/scripts/BuildCommon.pm b/build-aux/scripts/BuildCommon.pm +index 0e6f2a31..c38ba21b 100644 +--- a/build-aux/scripts/BuildCommon.pm ++++ b/build-aux/scripts/BuildCommon.pm +@@ -11,7 +11,6 @@ use v5.14; # implicit use strict, use feature ':5.14' + use warnings FATAL => 'all'; + use utf8; + use open qw(:utf8); +-no if $] >= 5.018, warnings => 'experimental::smartmatch'; + no if $] >= 5.022, warnings => 'experimental::re_strict'; + use if $] >= 5.022, re => 'strict'; + +@@ -519,19 +518,19 @@ sub parse_symver_args { + my $COMPAT_ABI; + local $_; + for (@args) { +- when (/^SYMVER_MIN=(.+)$/) { ++ if (/^SYMVER_MIN=(.+)$/) { + $usage_error->() if defined $SYMVER_MIN; + $SYMVER_MIN = $1; + } +- when (/^SYMVER_FLOOR=(.+)$/) { ++ elsif (/^SYMVER_FLOOR=(.+)$/) { + $usage_error->() if defined $SYMVER_FLOOR; + $SYMVER_FLOOR = $1; + } +- when (/^COMPAT_ABI=(.+)$/) { ++ elsif (/^COMPAT_ABI=(.+)$/) { + $usage_error->() if defined $COMPAT_ABI; + $COMPAT_ABI = $1; + } +- default { ++ else { + $usage_error->() if defined $map_in; + $map_in = $_; + } From a1f351a8db1bbf20c6b766bc4dacdf3eca767e45 Mon Sep 17 00:00:00 2001 From: Charlie LEGER Date: Tue, 29 Aug 2023 14:43:51 +0200 Subject: [PATCH 1778/2890] package/libzip: bump to version 1.10.1 - Release note libzip 1.10.1: https://libzip.org/news/release-1.10.1.html - Release note libzip 1.10.0: https://libzip.org/news/release-1.10.0.html - API changes between 1.9.x to 1.10.x: https://github.com/nih-at/libzip/blob/v1.10.1/API-CHANGES.md Signed-off-by: Charlie LEGER Signed-off-by: Thomas Petazzoni --- package/libzip/libzip.hash | 2 +- package/libzip/libzip.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash index 26c038e4b657..93dcb490425a 100644 --- a/package/libzip/libzip.hash +++ b/package/libzip/libzip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937 libzip-1.9.2.tar.xz +sha256 dc3c8d5b4c8bbd09626864f6bcf93de701540f761d76b85d7c7d710f4bd90318 libzip-1.10.1.tar.xz sha256 01c022eca6d566e2e8792fd0f091a28653b2a608319922bcd4de91c49d1438e1 LICENSE diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk index 0c9d66d87768..cf85bfa8ce11 100644 --- a/package/libzip/libzip.mk +++ b/package/libzip/libzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZIP_VERSION = 1.9.2 +LIBZIP_VERSION = 1.10.1 LIBZIP_SITE = https://libzip.org/download LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz LIBZIP_LICENSE = BSD-3-Clause From 1ae3f1748b93990436723a4c4f8434ba61fdc099 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Tue, 29 Aug 2023 16:26:09 +0200 Subject: [PATCH 1779/2890] package/libgit2: bump version to 1.7.1 This fixes a problem with the build system that would make it fail to use pkg-config to detect libssh2. It worked anyway because -lssh2 works. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 1997c3ba8eea..76d599b81e5c 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d9d0f84a86bf98b73e68997f5c1543cc5067d0ca9c7a5acaba3e8d117ecefef3 libgit2-1.7.0.tar.gz +sha256 17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327 libgit2-1.7.1.tar.gz sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 93505f7d85ae..92563d24bb01 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.7.0 +LIBGIT2_VERSION = 1.7.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From f8047ff5987efc80f6ead51edae126911c02a8ad Mon Sep 17 00:00:00 2001 From: Sebastian Weyer Date: Wed, 8 Mar 2023 14:15:51 +0100 Subject: [PATCH 1780/2890] package/nushell: new package Nushell is a shell - written in Rust - that makes use of the nushell language to interact with the operating system Signed-off-by: Sebastian Weyer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/nushell/Config.in | 12 ++++++++++++ package/nushell/nushell.hash | 3 +++ package/nushell/nushell.mk | 20 ++++++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 package/nushell/Config.in create mode 100644 package/nushell/nushell.hash create mode 100644 package/nushell/nushell.mk diff --git a/DEVELOPERS b/DEVELOPERS index 241de082eb05..24ec17a7c252 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2683,6 +2683,9 @@ F: support/misc/toolchainfile.cmake.in N: Sam Voss F: package/ripgrep/ +N: Sebastian Weyer +F: package/nushell/ + N: Sébastien Szymanski F: package/mmc-utils/ F: package/python-flask-jsonrpc/ diff --git a/package/Config.in b/package/Config.in index 3d16ea37d1a2..544988480954 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2607,6 +2607,7 @@ comment "Shells" source "package/bash/Config.in" source "package/dash/Config.in" source "package/mksh/Config.in" + source "package/nushell/Config.in" source "package/zsh/Config.in" comment "Utilities" source "package/apg/Config.in" diff --git a/package/nushell/Config.in b/package/nushell/Config.in new file mode 100644 index 000000000000..edb01d2f72bc --- /dev/null +++ b/package/nushell/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_NUSHELL + bool "nushell" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_HOST_PKGCONF + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_TARGET_PROGS + help + A new type of shell. + + https://github.com/nushell/nushell diff --git a/package/nushell/nushell.hash b/package/nushell/nushell.hash new file mode 100644 index 000000000000..b553a6c2bc4a --- /dev/null +++ b/package/nushell/nushell.hash @@ -0,0 +1,3 @@ +# Locally generated +sha256 352e807698d5f95e9bfdd9dd5512acab3cbef315379299a32e5f322a76eb718a nushell-0.76.0.tar.gz +sha256 e189616e535e9f7bf410a72e6fc51ad1e0ae461c58d592e186c2669daa5d1e5d LICENSE diff --git a/package/nushell/nushell.mk b/package/nushell/nushell.mk new file mode 100644 index 000000000000..b9c1ee643484 --- /dev/null +++ b/package/nushell/nushell.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# nushell +# +################################################################################ + +NUSHELL_VERSION = 0.76.0 +NUSHELL_SITE = $(call github,nushell,nushell,$(NUSHELL_VERSION)) +NUSHELL_LICENSE = MIT +NUSHELL_LICENSE_FILES = LICENSE +NUSHELL_DEPENDENCIES = host-pkgconf openssl ncurses + +# Add /usr/bin/nu to /etc/shells as in package/bash/bash.mk +define NUSHELL_ADD_NU_TO_SHELLS + grep -qsE '^/usr/bin/nu$$' $(TARGET_DIR)/etc/shells \ + || echo "/usr/bin/nu" >> $(TARGET_DIR)/etc/shells +endef +NUSHELL_TARGET_FINALIZE_HOOKS += NUSHELL_ADD_NU_TO_SHELLS + +$(eval $(cargo-package)) From bea949996e193e3d40ea7dd45122f8fce75f8cd0 Mon Sep 17 00:00:00 2001 From: Sebastian Weyer Date: Wed, 8 Mar 2023 14:15:53 +0100 Subject: [PATCH 1781/2890] support/testing/tests/package/test_nu.py: new runtime test Load sample script support/testing/tests/package/sample_nu.nu onto the target and verify proper execution by nushell Signed-off-by: Sebastian Weyer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ support/testing/tests/package/sample_nu.nu | 6 ++++ support/testing/tests/package/test_nu.py | 32 ++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 support/testing/tests/package/sample_nu.nu create mode 100644 support/testing/tests/package/test_nu.py diff --git a/DEVELOPERS b/DEVELOPERS index 24ec17a7c252..db0ea49f9048 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2685,6 +2685,8 @@ F: package/ripgrep/ N: Sebastian Weyer F: package/nushell/ +F: support/testing/tests/package/sample_nu.nu +F: support/testing/tests/package/test_nu.py N: Sébastien Szymanski F: package/mmc-utils/ diff --git a/support/testing/tests/package/sample_nu.nu b/support/testing/tests/package/sample_nu.nu new file mode 100644 index 000000000000..5287862cf1d8 --- /dev/null +++ b/support/testing/tests/package/sample_nu.nu @@ -0,0 +1,6 @@ +#! /usr/bin/nu +def greet [name] { + ["hello" $name] +} + +greet "world" diff --git a/support/testing/tests/package/test_nu.py b/support/testing/tests/package/test_nu.py new file mode 100644 index 000000000000..14ddacfbc881 --- /dev/null +++ b/support/testing/tests/package/test_nu.py @@ -0,0 +1,32 @@ +import os + +import infra.basetest + + +class TestNu(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG cannot be used as it doesn't + # support a host rustc which is necessary for nushell + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_SYSTEM_DHCP="eth0" + BR2_PACKAGE_NUSHELL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("tests/package/sample_nu.nu")) + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", img]) + self.emulator.login() + cmd = "nu sample_nu.nu" + self.assertRunOk(cmd) From c1038fe47c705fd7bf4bbc6e8b8557d5417adaad Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 30 Aug 2023 09:59:26 -0600 Subject: [PATCH 1782/2890] package/openjdk{-bin}: security bump versions to 11.0.20+8 and 17.0.8+7 Fixed the following security issues: * CVEs - CVE-2023-22006 - CVE-2023-22036 - CVE-2023-22041 - CVE-2023-22044 - CVE-2023-22045 - CVE-2023-22049 - CVE-2023-25193 * Security fixes - JDK-8298676: Enhanced Look and Feel - JDK-8300285: Enhance TLS data handling - JDK-8300596: Enhance Jar Signature validation - JDK-8301998, JDK-8302084: Update HarfBuzz to 7.0.1 - JDK-8302475: Enhance HTTP client file downloading - JDK-8302483: Enhance ZIP performance - JDK-8303376: Better launching of JDI - JDK-8304468: Better array usages - JDK-8305312: Enhanced path handling - JDK-8308682: Enhance AES performance For details, see the announcements: https://mail.openjdk.org/pipermail/jdk-updates-dev/2023-July/024064.html https://mail.openjdk.org/pipermail/jdk-updates-dev/2023-July/024063.html Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- .../0001-Add-ARCv2-ISA-processors-support-to-Zero.patch | 0 package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename package/openjdk/{17.0.7+7 => 17.0.8+7}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (100%) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index eb9d7396e3ec..401e83e75e53 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,10 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz -sha256 0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz +sha256 aa5fc7d388fe544e5d85902e68399d5299e931f9b280d358a3cbee218d6017b0 OpenJDK17U-jdk_x64_linux_hotspot_17.0.8_7.tar.gz +sha256 c43688163cfdcb1a6e6fe202cc06a51891df746b954c55dbd01430e7d7326d00 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.8_7.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581 OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz -sha256 0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz +sha256 7a99258af2e3ee9047e90f1c0c1775fd6285085759501295358d934d662e01f9 OpenJDK11U-jdk_x64_linux_hotspot_11.0.20_8.tar.gz +sha256 eb821c049c2d2f7c3fbf8ddcce2d608d3aa7d488700e76bfbbebabba93021748 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.20_8.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index dad846534b11..616c8d917d05 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.7_7 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.8_7 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.19_7 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.20_8 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.8+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 100% rename from package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.8+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 3b362896282d..ba398b84bec7 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 43b80a5aec5fce908e80858e9b34efdf1b49255a12ce303650325af65141d3e8 openjdk-17.0.7+7.tar.gz -sha256 25fd9ab3042a284aa4e6348969403016404bc2706a4a02c149a0054fbe477337 openjdk-11.0.19+7.tar.gz +sha256 643ff42dcdf8751e0fee716c1a1914ddc7348b174e871a5eb2636578a181f20d openjdk-17.0.8+7.tar.gz +sha256 b2a37ef209ae7eaf8f34182b7c9aa3252af20a214d02970f96ce62242c805479 openjdk-11.0.20+8.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 39d461a87cde..d1a2fa23ee12 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.7+7 +OPENJDK_VERSION_MINOR = 0.8+7 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.19+7 +OPENJDK_VERSION_MINOR = 0.20+8 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) From 60f50a5e34e1bb5fd7236cd9d562070135b6116d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 29 Aug 2023 14:09:33 +0200 Subject: [PATCH 1783/2890] package/pcm-tools: fix github-download The pcm-tools package contains a version.h with git attributes: $ cat version.h #define PCM_VERSION " ($Format:%ci ID=%h$)" $ man 5 gitattributes Creating an archive export-subst If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. The expansion depends on the availability of a commit ID, i.e., if git-archive(1) has been given a tree instead of a commit or a tag then no replacement will be done. The placeholders are the same as those for the option --pretty=format: of git-log(1), except that they need to be wrapped like this: $Format:PLACEHOLDERS$ in the file. E.g. the string $Format:%H$ will be replaced by the commit hash. So, the archive generated by github has changed since we updated pcm-tools in 2021-12-08 with commit d1d93d488c76 (package/pcm-tools: bump to version 202110). The downlad was still OK in 2022-01-04 [0] but has been failing at least since 202-08-25 [1]. Since the archive is generated on the github side, there is not much we can do to fix this up. We switch over to using git to do the download, and we generate the archive localy, which we know is reproducible. We fix the version.h so that it contains the same string as the backup tarball we host on s.b.o. There are three other files in pcm-tools that have git attributes, to exclude them from the generated archive, all pertaining to CI/CD stuff: .cirrus.yml export-ignore .gitlab-ci.yml export-ignore .travis.yml export-ignore We don't remove them, because they have no impact on the build, and they are anyway already present in the archive by the time we could act on it anyway... [0] http://autobuild.buildroot.org/results/127/1276a3d49c8848039f034e7f03632df365097e94/ [1] http://autobuild.buildroot.org/results/8bb/8bbf9c36af332bbf5e7c1abcbb594a0b231ef97e/ Reported-by: Woody Douglass Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- package/pcm-tools/pcm-tools.hash | 2 +- package/pcm-tools/pcm-tools.mk | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/package/pcm-tools/pcm-tools.hash b/package/pcm-tools/pcm-tools.hash index 1853dcebb574..cfa3faeff7bb 100644 --- a/package/pcm-tools/pcm-tools.hash +++ b/package/pcm-tools/pcm-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 aa48ab1473720aeb7837b67bfc612100f484748720a8b8034daff00419709057 pcm-tools-202110.tar.gz +sha256 29416f83d1de95594d225f63af34f8f074ee4822010ce2e05b1fabc66933472a pcm-tools-93fc9193a70e2f1f054be554c48f4a4791be5032-br1.tar.gz sha256 0f476c77009f982dcc4bdff41e692ddd456a9862908e99f2ae3d57296decc649 LICENSE diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk index d676df57f9ac..c53049269644 100644 --- a/package/pcm-tools/pcm-tools.mk +++ b/package/pcm-tools/pcm-tools.mk @@ -4,8 +4,12 @@ # ################################################################################ -PCM_TOOLS_VERSION = 202110 -PCM_TOOLS_SITE = $(call github,opcm,pcm,$(PCM_TOOLS_VERSION)) +# Don't use the github helper, as pcm-tools uses git attributes that are +# replaced when gnerating the archive. +# 93fc9193a70e2f1f054be554c48f4a4791be5032 is the hash of the 202110 tag. +PCM_TOOLS_VERSION = 93fc9193a70e2f1f054be554c48f4a4791be5032 +PCM_TOOLS_SITE = https://github.com/opcm/pcm +PCM_TOOLS_SITE_METHOD = git PCM_TOOLS_LICENSE = BSD-3-Clause PCM_TOOLS_LICENSE_FILES = LICENSE @@ -13,6 +17,14 @@ PCM_TOOLS_EXE_FILES = \ pcm-core pcm-iio pcm-lspci pcm-memory pcm-msr pcm-numa \ pcm-pcicfg pcm-pcie pcm-power pcm-sensor pcm-tsx pcm +# version.h contains git attributes; replace them with the previously-known +# value. +define PCM_TOOLS_FIXUP_VERSION_H + $(SED) 's/\$$Format:%ci ID=%h\$$/2021-10-25 16:07:54 +0200 ID=93fc9193/' \ + $(@D)/version.h +endef +PCM_TOOLS_POST_EXTRACT_HOOKS += PCM_TOOLS_FIXUP_VERSION_H + define PCM_TOOLS_BUILD_CMDS touch $(@D)/daemon-binaries $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ From 65c99394ff2e6cd52a79366ad693c28daca07fb0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 29 Aug 2023 00:43:11 +0200 Subject: [PATCH 1784/2890] boot/grub2: backport fixes for numerous CVEs Grub 2.06 is affected by a number of CVEs, which have been fixed in the master branch of Grub, but are not yet part of any release (there is a 2.12-rc1 release, but nothing else between 2.06 and 2.12-rc1). So this patch backports the relevant fixes for CVE-2022-28736, CVE-2022-28735, CVE-2021-3695, CVE-2021-3696, CVE-2021-3697, CVE-2022-28733, CVE-2022-28734, CVE-2022-2601 and CVE-2022-3775. It should be noted that CVE-2021-3695, CVE-2021-3696, CVE-2021-3697 are not reported as affecting Grub by our CVE matching logic because the NVD database uses an incorrect CPE ID in those CVEs: it uses "grub" as the product instead of "grub2" like all other CVEs for grub. This issue has been reported to the NVD maintainers. This requires backporting a lot of patches, but jumping from 2.06 to 2.12-rc1 implies getting 592 commits, which is quite a lot. All Grub test cases are working fine: https://gitlab.com/tpetazzoni/buildroot/-/pipelines/984500585 https://gitlab.com/tpetazzoni/buildroot/-/pipelines/984500679 Signed-off-by: Thomas Petazzoni [Arnout: fix check-package warning in patch 0002] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - ...onfig-Restore-umask-for-the-grub.cfg.patch | 6 +- ...hainloader-Simplify-the-loader-state.patch | 126 ++++ ...ot-Add-API-to-pass-context-to-loader.patch | 165 +++++ ...i-chainloader-Use-grub_loader_set_ex.patch | 80 ++ ...ct-non-kernel-files-in-the-shim_lock.patch | 105 +++ ...07-video-Remove-trailing-whitespaces.patch | 689 ++++++++++++++++++ ...g-Abort-sooner-if-a-read-operation-f.patch | 204 ++++++ ...g-Refuse-to-handle-multiple-image-he.patch | 34 + ...g-Drop-greyscale-support-to-fix-heap.patch | 173 +++++ ...g-Avoid-heap-OOB-R-W-inserting-huff-.patch | 44 ++ ...eg-Block-int-underflow-wild-pointer-.patch | 78 ++ ...3-net-ip-Do-IP-fragment-maths-safely.patch | 56 ++ ...Fix-OOB-write-for-split-http-headers.patch | 50 ++ ...or-out-on-headers-with-LF-without-CR.patch | 52 ++ ...erflow-in-grub_font_get_glyph_intern.patch | 116 +++ ...-integer-overflows-in-grub_font_cons.patch | 83 +++ ...ix-an-integer-underflow-in-blit_comb.patch | 93 +++ boot/grub2/grub2.mk | 19 + 19 files changed, 2170 insertions(+), 4 deletions(-) create mode 100644 boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch create mode 100644 boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch create mode 100644 boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch create mode 100644 boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch create mode 100644 boot/grub2/0007-video-Remove-trailing-whitespaces.patch create mode 100644 boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch create mode 100644 boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch create mode 100644 boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch create mode 100644 boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch create mode 100644 boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch create mode 100644 boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch create mode 100644 boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch create mode 100644 boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch create mode 100644 boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch create mode 100644 boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch create mode 100644 boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch diff --git a/.checkpackageignore b/.checkpackageignore index f943153de9e0..0cf2ce193a0a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -107,7 +107,6 @@ boot/at91bootstrap/0003-u-boot-relocation-fix.patch Upstream boot/at91dataflashboot/0001-do-not-install.patch Upstream boot/at91dataflashboot/0002-eabi-fixes.patch Upstream boot/grub2/0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch Upstream -boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch Upstream boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch Upstream boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch Upstream boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch Upstream diff --git a/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch b/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch index 0d6a1a6e0100..ba9c8a93444e 100644 --- a/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch +++ b/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch @@ -1,4 +1,4 @@ -From 8418defaf0902bdd8af188221ae54c5a3d6ad05d Mon Sep 17 00:00:00 2001 +From 4c1ad500e73d46c83dec369da85db39ae2fe62dd Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 3 Dec 2021 16:13:28 +0800 Subject: [PATCH] grub-mkconfig: Restore umask for the grub.cfg @@ -17,7 +17,7 @@ Fixes: CVE-2021-3981 Signed-off-by: Michael Chang Reviewed-by: Daniel Kiper -[Upstream: https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=0adec29674561034771c13e446069b41ef41e4d4] +Upstream: https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=0adec29674561034771c13e446069b41ef41e4d4 Signed-off-by: Thomas Petazzoni --- util/grub-mkconfig.in | 3 +++ @@ -39,5 +39,5 @@ index f8cbb8d7a..84f356ea4 100644 fi fi -- -2.37.2 +2.41.0 diff --git a/boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch b/boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch new file mode 100644 index 000000000000..f6073add0bf7 --- /dev/null +++ b/boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch @@ -0,0 +1,126 @@ +From dfdc742bdb22be468035f96cce0be5fee23b6df5 Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 10:02:04 +0100 +Subject: [PATCH] loader/efi/chainloader: Simplify the loader state + +The chainloader command retains the source buffer and device path passed +to LoadImage(), requiring the unload hook passed to grub_loader_set() to +free them. It isn't required to retain this state though - they aren't +required by StartImage() or anything else in the boot hook, so clean them +up before grub_cmd_chainloader() finishes. + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper +Upstream: 1469983ebb9674753ad333d37087fb8cb20e1dce +[Thomas: needed to cherry-pick +04c86e0bb7b58fc2f913f798cdb18934933e532d which fixes CVE-2022-28736] +Signed-off-by: Thomas Petazzoni +--- + grub-core/loader/efi/chainloader.c | 38 +++++++++++++++++------------- + 1 file changed, 21 insertions(+), 17 deletions(-) + +diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c +index 2bd80f4db..d1602c89b 100644 +--- a/grub-core/loader/efi/chainloader.c ++++ b/grub-core/loader/efi/chainloader.c +@@ -44,25 +44,20 @@ GRUB_MOD_LICENSE ("GPLv3+"); + + static grub_dl_t my_mod; + +-static grub_efi_physical_address_t address; +-static grub_efi_uintn_t pages; +-static grub_efi_device_path_t *file_path; + static grub_efi_handle_t image_handle; +-static grub_efi_char16_t *cmdline; + + static grub_err_t + grub_chainloader_unload (void) + { ++ grub_efi_loaded_image_t *loaded_image; + grub_efi_boot_services_t *b; + ++ loaded_image = grub_efi_get_loaded_image (image_handle); ++ if (loaded_image != NULL) ++ grub_free (loaded_image->load_options); ++ + b = grub_efi_system_table->boot_services; + efi_call_1 (b->unload_image, image_handle); +- efi_call_2 (b->free_pages, address, pages); +- +- grub_free (file_path); +- grub_free (cmdline); +- cmdline = 0; +- file_path = 0; + + grub_dl_unref (my_mod); + return GRUB_ERR_NONE; +@@ -140,7 +135,7 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename) + char *dir_start; + char *dir_end; + grub_size_t size; +- grub_efi_device_path_t *d; ++ grub_efi_device_path_t *d, *file_path; + + dir_start = grub_strchr (filename, ')'); + if (! dir_start) +@@ -222,11 +217,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_efi_status_t status; + grub_efi_boot_services_t *b; + grub_device_t dev = 0; +- grub_efi_device_path_t *dp = 0; ++ grub_efi_device_path_t *dp = NULL, *file_path = NULL; + grub_efi_loaded_image_t *loaded_image; + char *filename; + void *boot_image = 0; + grub_efi_handle_t dev_handle = 0; ++ grub_efi_physical_address_t address = 0; ++ grub_efi_uintn_t pages = 0; ++ grub_efi_char16_t *cmdline = NULL; + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); +@@ -234,11 +232,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + + grub_dl_ref (my_mod); + +- /* Initialize some global variables. */ +- address = 0; +- image_handle = 0; +- file_path = 0; +- + b = grub_efi_system_table->boot_services; + + file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE); +@@ -408,6 +401,10 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_file_close (file); + grub_device_close (dev); + ++ /* We're finished with the source image buffer and file path now. */ ++ efi_call_2 (b->free_pages, address, pages); ++ grub_free (file_path); ++ + grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0); + return 0; + +@@ -419,11 +416,18 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + if (file) + grub_file_close (file); + ++ grub_free (cmdline); + grub_free (file_path); + + if (address) + efi_call_2 (b->free_pages, address, pages); + ++ if (image_handle != NULL) ++ { ++ efi_call_1 (b->unload_image, image_handle); ++ image_handle = NULL; ++ } ++ + grub_dl_unref (my_mod); + + return grub_errno; +-- +2.41.0 + diff --git a/boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch b/boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch new file mode 100644 index 000000000000..30b410e38a67 --- /dev/null +++ b/boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch @@ -0,0 +1,165 @@ +From 8b6336696d93b51703c2015eff3e2d8a02145e43 Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 10:58:28 +0100 +Subject: [PATCH] commands/boot: Add API to pass context to loader + +Loaders rely on global variables for saving context which is consumed +in the boot hook and freed in the unload hook. In the case where a loader +command is executed twice, calling grub_loader_set() a second time executes +the unload hook, but in some cases this runs when the loader's global +context has already been updated, resulting in the updated context being +freed and potential use-after-free bugs when the boot hook is subsequently +called. + +This adds a new API, grub_loader_set_ex(), which allows a loader to specify +context that is passed to its boot and unload hooks. This is an alternative +to requiring that loaders call grub_loader_unset() before mutating their +global context. + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper +Upstream: 14ceb3b3ff6db664649138442b6562c114dcf56e +[Thomas: needed to backport 04c86e0bb7b58fc2f913f798cdb18934933e532d, +which fixes CVE-2022-28736] +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/boot.c | 66 ++++++++++++++++++++++++++++++++++----- + include/grub/loader.h | 5 +++ + 2 files changed, 63 insertions(+), 8 deletions(-) + +diff --git a/grub-core/commands/boot.c b/grub-core/commands/boot.c +index bbca81e94..61514788e 100644 +--- a/grub-core/commands/boot.c ++++ b/grub-core/commands/boot.c +@@ -27,10 +27,20 @@ + + GRUB_MOD_LICENSE ("GPLv3+"); + +-static grub_err_t (*grub_loader_boot_func) (void); +-static grub_err_t (*grub_loader_unload_func) (void); ++static grub_err_t (*grub_loader_boot_func) (void *context); ++static grub_err_t (*grub_loader_unload_func) (void *context); ++static void *grub_loader_context; + static int grub_loader_flags; + ++struct grub_simple_loader_hooks ++{ ++ grub_err_t (*boot) (void); ++ grub_err_t (*unload) (void); ++}; ++ ++/* Don't heap allocate this to avoid making grub_loader_set() fallible. */ ++static struct grub_simple_loader_hooks simple_loader_hooks; ++ + struct grub_preboot + { + grub_err_t (*preboot_func) (int); +@@ -44,6 +54,29 @@ static int grub_loader_loaded; + static struct grub_preboot *preboots_head = 0, + *preboots_tail = 0; + ++static grub_err_t ++grub_simple_boot_hook (void *context) ++{ ++ struct grub_simple_loader_hooks *hooks; ++ ++ hooks = (struct grub_simple_loader_hooks *) context; ++ return hooks->boot (); ++} ++ ++static grub_err_t ++grub_simple_unload_hook (void *context) ++{ ++ struct grub_simple_loader_hooks *hooks; ++ grub_err_t ret; ++ ++ hooks = (struct grub_simple_loader_hooks *) context; ++ ++ ret = hooks->unload (); ++ grub_memset (hooks, 0, sizeof (*hooks)); ++ ++ return ret; ++} ++ + int + grub_loader_is_loaded (void) + { +@@ -110,28 +143,45 @@ grub_loader_unregister_preboot_hook (struct grub_preboot *hnd) + } + + void +-grub_loader_set (grub_err_t (*boot) (void), +- grub_err_t (*unload) (void), +- int flags) ++grub_loader_set_ex (grub_err_t (*boot) (void *context), ++ grub_err_t (*unload) (void *context), ++ void *context, ++ int flags) + { + if (grub_loader_loaded && grub_loader_unload_func) +- grub_loader_unload_func (); ++ grub_loader_unload_func (grub_loader_context); + + grub_loader_boot_func = boot; + grub_loader_unload_func = unload; ++ grub_loader_context = context; + grub_loader_flags = flags; + + grub_loader_loaded = 1; + } + ++void ++grub_loader_set (grub_err_t (*boot) (void), ++ grub_err_t (*unload) (void), ++ int flags) ++{ ++ grub_loader_set_ex (grub_simple_boot_hook, ++ grub_simple_unload_hook, ++ &simple_loader_hooks, ++ flags); ++ ++ simple_loader_hooks.boot = boot; ++ simple_loader_hooks.unload = unload; ++} ++ + void + grub_loader_unset(void) + { + if (grub_loader_loaded && grub_loader_unload_func) +- grub_loader_unload_func (); ++ grub_loader_unload_func (grub_loader_context); + + grub_loader_boot_func = 0; + grub_loader_unload_func = 0; ++ grub_loader_context = 0; + + grub_loader_loaded = 0; + } +@@ -158,7 +208,7 @@ grub_loader_boot (void) + return err; + } + } +- err = (grub_loader_boot_func) (); ++ err = (grub_loader_boot_func) (grub_loader_context); + + for (cur = preboots_tail; cur; cur = cur->prev) + if (! err) +diff --git a/include/grub/loader.h b/include/grub/loader.h +index b20864282..97f231054 100644 +--- a/include/grub/loader.h ++++ b/include/grub/loader.h +@@ -40,6 +40,11 @@ void EXPORT_FUNC (grub_loader_set) (grub_err_t (*boot) (void), + grub_err_t (*unload) (void), + int flags); + ++void EXPORT_FUNC (grub_loader_set_ex) (grub_err_t (*boot) (void *context), ++ grub_err_t (*unload) (void *context), ++ void *context, ++ int flags); ++ + /* Unset current loader, if any. */ + void EXPORT_FUNC (grub_loader_unset) (void); + +-- +2.41.0 + diff --git a/boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch b/boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch new file mode 100644 index 000000000000..4308e3170f6b --- /dev/null +++ b/boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch @@ -0,0 +1,80 @@ +From 583fca49f413e00fe26f8ae7abe0837bbc574f79 Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 11:48:58 +0100 +Subject: [PATCH] loader/efi/chainloader: Use grub_loader_set_ex() + +This ports the EFI chainloader to use grub_loader_set_ex() in order to fix +a use-after-free bug that occurs when grub_cmd_chainloader() is executed +more than once before a boot attempt is performed. + +Fixes: CVE-2022-28736 + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper +Upstream: 04c86e0bb7b58fc2f913f798cdb18934933e532d +Signed-off-by: Thomas Petazzoni +--- + grub-core/loader/efi/chainloader.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c +index d1602c89b..7557eb269 100644 +--- a/grub-core/loader/efi/chainloader.c ++++ b/grub-core/loader/efi/chainloader.c +@@ -44,11 +44,10 @@ GRUB_MOD_LICENSE ("GPLv3+"); + + static grub_dl_t my_mod; + +-static grub_efi_handle_t image_handle; +- + static grub_err_t +-grub_chainloader_unload (void) ++grub_chainloader_unload (void *context) + { ++ grub_efi_handle_t image_handle = (grub_efi_handle_t) context; + grub_efi_loaded_image_t *loaded_image; + grub_efi_boot_services_t *b; + +@@ -64,8 +63,9 @@ grub_chainloader_unload (void) + } + + static grub_err_t +-grub_chainloader_boot (void) ++grub_chainloader_boot (void *context) + { ++ grub_efi_handle_t image_handle = (grub_efi_handle_t) context; + grub_efi_boot_services_t *b; + grub_efi_status_t status; + grub_efi_uintn_t exit_data_size; +@@ -225,6 +225,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_efi_physical_address_t address = 0; + grub_efi_uintn_t pages = 0; + grub_efi_char16_t *cmdline = NULL; ++ grub_efi_handle_t image_handle = NULL; + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); +@@ -405,7 +406,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + efi_call_2 (b->free_pages, address, pages); + grub_free (file_path); + +- grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0); ++ grub_loader_set_ex (grub_chainloader_boot, grub_chainloader_unload, image_handle, 0); + return 0; + + fail: +@@ -423,10 +424,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + efi_call_2 (b->free_pages, address, pages); + + if (image_handle != NULL) +- { +- efi_call_1 (b->unload_image, image_handle); +- image_handle = NULL; +- } ++ efi_call_1 (b->unload_image, image_handle); + + grub_dl_unref (my_mod); + +-- +2.41.0 + diff --git a/boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch b/boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch new file mode 100644 index 000000000000..b6fec1e6bbec --- /dev/null +++ b/boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch @@ -0,0 +1,105 @@ +From 1e1b1271b7a7c6ac20a4c5f8e0dc29614b4975d1 Mon Sep 17 00:00:00 2001 +From: Julian Andres Klode +Date: Thu, 2 Dec 2021 15:03:53 +0100 +Subject: [PATCH] kern/efi/sb: Reject non-kernel files in the shim_lock + verifier + +We must not allow other verifiers to pass things like the GRUB modules. +Instead of maintaining a blocklist, maintain an allowlist of things +that we do not care about. + +This allowlist really should be made reusable, and shared by the +lockdown verifier, but this is the minimal patch addressing +security concerns where the TPM verifier was able to mark modules +as verified (or the OpenPGP verifier for that matter), when it +should not do so on shim-powered secure boot systems. + +Fixes: CVE-2022-28735 + +Signed-off-by: Julian Andres Klode +Reviewed-by: Daniel Kiper +Upstream: 6fe755c5c07bb386fda58306bfd19e4a1c974c53 +Signed-off-by: Thomas Petazzoni +--- + grub-core/kern/efi/sb.c | 39 ++++++++++++++++++++++++++++++++++++--- + include/grub/verify.h | 1 + + 2 files changed, 37 insertions(+), 3 deletions(-) + +diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c +index c52ec6226..89c4bb3fd 100644 +--- a/grub-core/kern/efi/sb.c ++++ b/grub-core/kern/efi/sb.c +@@ -119,10 +119,11 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)), + void **context __attribute__ ((unused)), + enum grub_verify_flags *flags) + { +- *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; ++ *flags = GRUB_VERIFY_FLAGS_NONE; + + switch (type & GRUB_FILE_TYPE_MASK) + { ++ /* Files we check. */ + case GRUB_FILE_TYPE_LINUX_KERNEL: + case GRUB_FILE_TYPE_MULTIBOOT_KERNEL: + case GRUB_FILE_TYPE_BSD_KERNEL: +@@ -130,11 +131,43 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)), + case GRUB_FILE_TYPE_PLAN9_KERNEL: + case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE: + *flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK; ++ return GRUB_ERR_NONE; + +- /* Fall through. */ ++ /* Files that do not affect secureboot state. */ ++ case GRUB_FILE_TYPE_NONE: ++ case GRUB_FILE_TYPE_LOOPBACK: ++ case GRUB_FILE_TYPE_LINUX_INITRD: ++ case GRUB_FILE_TYPE_OPENBSD_RAMDISK: ++ case GRUB_FILE_TYPE_XNU_RAMDISK: ++ case GRUB_FILE_TYPE_SIGNATURE: ++ case GRUB_FILE_TYPE_PUBLIC_KEY: ++ case GRUB_FILE_TYPE_PUBLIC_KEY_TRUST: ++ case GRUB_FILE_TYPE_PRINT_BLOCKLIST: ++ case GRUB_FILE_TYPE_TESTLOAD: ++ case GRUB_FILE_TYPE_GET_SIZE: ++ case GRUB_FILE_TYPE_FONT: ++ case GRUB_FILE_TYPE_ZFS_ENCRYPTION_KEY: ++ case GRUB_FILE_TYPE_CAT: ++ case GRUB_FILE_TYPE_HEXCAT: ++ case GRUB_FILE_TYPE_CMP: ++ case GRUB_FILE_TYPE_HASHLIST: ++ case GRUB_FILE_TYPE_TO_HASH: ++ case GRUB_FILE_TYPE_KEYBOARD_LAYOUT: ++ case GRUB_FILE_TYPE_PIXMAP: ++ case GRUB_FILE_TYPE_GRUB_MODULE_LIST: ++ case GRUB_FILE_TYPE_CONFIG: ++ case GRUB_FILE_TYPE_THEME: ++ case GRUB_FILE_TYPE_GETTEXT_CATALOG: ++ case GRUB_FILE_TYPE_FS_SEARCH: ++ case GRUB_FILE_TYPE_LOADENV: ++ case GRUB_FILE_TYPE_SAVEENV: ++ case GRUB_FILE_TYPE_VERIFY_SIGNATURE: ++ *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; ++ return GRUB_ERR_NONE; + ++ /* Other files. */ + default: +- return GRUB_ERR_NONE; ++ return grub_error (GRUB_ERR_ACCESS_DENIED, N_("prohibited by secure boot policy")); + } + } + +diff --git a/include/grub/verify.h b/include/grub/verify.h +index cd129c398..672ae1692 100644 +--- a/include/grub/verify.h ++++ b/include/grub/verify.h +@@ -24,6 +24,7 @@ + + enum grub_verify_flags + { ++ GRUB_VERIFY_FLAGS_NONE = 0, + GRUB_VERIFY_FLAGS_SKIP_VERIFICATION = 1, + GRUB_VERIFY_FLAGS_SINGLE_CHUNK = 2, + /* Defer verification to another authority. */ +-- +2.41.0 + diff --git a/boot/grub2/0007-video-Remove-trailing-whitespaces.patch b/boot/grub2/0007-video-Remove-trailing-whitespaces.patch new file mode 100644 index 000000000000..94d6aeefe7db --- /dev/null +++ b/boot/grub2/0007-video-Remove-trailing-whitespaces.patch @@ -0,0 +1,689 @@ +From 1faa412c502c7c4ca1230fc152be30b88847fdd2 Mon Sep 17 00:00:00 2001 +From: Elyes Haouas +Date: Fri, 4 Mar 2022 07:42:13 +0100 +Subject: [PATCH] video: Remove trailing whitespaces + +Signed-off-by: Elyes Haouas +Reviewed-by: Daniel Kiper +Upstream: 1f48917d8ddb490dcdc70176e0f58136b7f7811a +[Thomas: needed to backport patches fixing CVEs in the video code] +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/bochs.c | 2 +- + grub-core/video/capture.c | 2 +- + grub-core/video/cirrus.c | 4 ++-- + grub-core/video/coreboot/cbfb.c | 2 +- + grub-core/video/efi_gop.c | 22 +++++++++---------- + grub-core/video/fb/fbblit.c | 8 +++---- + grub-core/video/fb/video_fb.c | 10 ++++----- + grub-core/video/i386/pc/vbe.c | 34 ++++++++++++++--------------- + grub-core/video/i386/pc/vga.c | 6 ++--- + grub-core/video/ieee1275.c | 4 ++-- + grub-core/video/radeon_fuloong2e.c | 6 ++--- + grub-core/video/radeon_yeeloong3a.c | 6 ++--- + grub-core/video/readers/png.c | 2 +- + grub-core/video/readers/tga.c | 2 +- + grub-core/video/sis315_init.c | 2 +- + grub-core/video/sis315pro.c | 8 +++---- + grub-core/video/sm712.c | 10 ++++----- + grub-core/video/video.c | 8 +++---- + 18 files changed, 69 insertions(+), 69 deletions(-) + +diff --git a/grub-core/video/bochs.c b/grub-core/video/bochs.c +index 30ea1bd82..edc651697 100644 +--- a/grub-core/video/bochs.c ++++ b/grub-core/video/bochs.c +@@ -212,7 +212,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + + if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x11111234) + return 0; +- ++ + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); + framebuffer.base = grub_pci_read (addr) & GRUB_PCI_ADDR_MEM_MASK; + if (!framebuffer.base) +diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c +index 4d3195e01..c653d89f9 100644 +--- a/grub-core/video/capture.c ++++ b/grub-core/video/capture.c +@@ -92,7 +92,7 @@ grub_video_capture_start (const struct grub_video_mode_info *mode_info, + framebuffer.ptr = grub_calloc (framebuffer.mode_info.height, framebuffer.mode_info.pitch); + if (!framebuffer.ptr) + return grub_errno; +- ++ + err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, + &framebuffer.mode_info, + framebuffer.ptr); +diff --git a/grub-core/video/cirrus.c b/grub-core/video/cirrus.c +index e2149e8ce..f5542ccdc 100644 +--- a/grub-core/video/cirrus.c ++++ b/grub-core/video/cirrus.c +@@ -354,11 +354,11 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height, + grub_uint8_t sr_ext = 0, hidden_dac = 0; + + grub_vga_set_geometry (&config, grub_vga_cr_write); +- ++ + grub_vga_gr_write (GRUB_VGA_GR_MODE_256_COLOR | GRUB_VGA_GR_MODE_READ_MODE1, + GRUB_VGA_GR_MODE); + grub_vga_gr_write (GRUB_VGA_GR_GR6_GRAPHICS_MODE, GRUB_VGA_GR_GR6); +- ++ + grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_NORMAL, GRUB_VGA_SR_MEMORY_MODE); + + grub_vga_cr_write ((config.pitch >> CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT) +diff --git a/grub-core/video/coreboot/cbfb.c b/grub-core/video/coreboot/cbfb.c +index 9af81fa5b..986003c51 100644 +--- a/grub-core/video/coreboot/cbfb.c ++++ b/grub-core/video/coreboot/cbfb.c +@@ -106,7 +106,7 @@ grub_video_cbfb_setup (unsigned int width, unsigned int height, + + grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, + grub_video_fbstd_colors); +- ++ + return err; + } + +diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c +index b7590dc6c..7a5054631 100644 +--- a/grub-core/video/efi_gop.c ++++ b/grub-core/video/efi_gop.c +@@ -273,7 +273,7 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo + grub_efi_status_t status; + struct grub_efi_gop_mode_info *info = NULL; + struct grub_video_mode_info mode_info; +- ++ + status = efi_call_4 (gop->query_mode, gop, mode, &size, &info); + + if (status) +@@ -390,7 +390,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + found = 1; + } + } +- ++ + if (!found) + { + unsigned mode; +@@ -399,7 +399,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + { + grub_efi_uintn_t size; + grub_efi_status_t status; +- ++ + status = efi_call_4 (gop->query_mode, gop, mode, &size, &info); + if (status) + { +@@ -472,11 +472,11 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + framebuffer.ptr = (void *) (grub_addr_t) gop->mode->fb_base; + framebuffer.offscreen + = grub_malloc (framebuffer.mode_info.height +- * framebuffer.mode_info.width ++ * framebuffer.mode_info.width + * sizeof (struct grub_efi_gop_blt_pixel)); + + buffer = framebuffer.offscreen; +- ++ + if (!buffer) + { + grub_dprintf ("video", "GOP: couldn't allocate shadow\n"); +@@ -485,11 +485,11 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + &framebuffer.mode_info); + buffer = framebuffer.ptr; + } +- ++ + grub_dprintf ("video", "GOP: initialising FB @ %p %dx%dx%d\n", + framebuffer.ptr, framebuffer.mode_info.width, + framebuffer.mode_info.height, framebuffer.mode_info.bpp); +- ++ + err = grub_video_fb_create_render_target_from_pointer + (&framebuffer.render_target, &framebuffer.mode_info, buffer); + +@@ -498,15 +498,15 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + grub_dprintf ("video", "GOP: Couldn't create FB target\n"); + return err; + } +- ++ + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + { + grub_dprintf ("video", "GOP: Couldn't set FB target\n"); + return err; + } +- ++ + err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, + grub_video_fbstd_colors); + +@@ -514,7 +514,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + grub_dprintf ("video", "GOP: Couldn't set palette\n"); + else + grub_dprintf ("video", "GOP: Success\n"); +- ++ + return err; + } + +diff --git a/grub-core/video/fb/fbblit.c b/grub-core/video/fb/fbblit.c +index d55924837..1010ef393 100644 +--- a/grub-core/video/fb/fbblit.c ++++ b/grub-core/video/fb/fbblit.c +@@ -466,7 +466,7 @@ grub_video_fbblit_replace_24bit_indexa (struct grub_video_fbblit_info *dst, + for (i = 0; i < width; i++) + { + register grub_uint32_t col; +- if (*srcptr == 0xf0) ++ if (*srcptr == 0xf0) + col = palette[16]; + else + col = palette[*srcptr & 0xf]; +@@ -478,7 +478,7 @@ grub_video_fbblit_replace_24bit_indexa (struct grub_video_fbblit_info *dst, + *dstptr++ = col >> 0; + *dstptr++ = col >> 8; + *dstptr++ = col >> 16; +-#endif ++#endif + srcptr++; + } + +@@ -651,7 +651,7 @@ grub_video_fbblit_blend_24bit_indexa (struct grub_video_fbblit_info *dst, + for (i = 0; i < width; i++) + { + register grub_uint32_t col; +- if (*srcptr != 0xf0) ++ if (*srcptr != 0xf0) + { + col = palette[*srcptr & 0xf]; + #ifdef GRUB_CPU_WORDS_BIGENDIAN +@@ -662,7 +662,7 @@ grub_video_fbblit_blend_24bit_indexa (struct grub_video_fbblit_info *dst, + *dstptr++ = col >> 0; + *dstptr++ = col >> 8; + *dstptr++ = col >> 16; +-#endif ++#endif + } + else + dstptr += 3; +diff --git a/grub-core/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c +index ae6b89f9a..fa4ebde26 100644 +--- a/grub-core/video/fb/video_fb.c ++++ b/grub-core/video/fb/video_fb.c +@@ -754,7 +754,7 @@ grub_video_fb_unmap_color_int (struct grub_video_fbblit_info * source, + *alpha = 0; + return; + } +- ++ + /* If we have an out-of-bounds color, return transparent black. */ + if (color > 255) + { +@@ -1141,7 +1141,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) + /* If everything is aligned on 32-bit use 32-bit copy. */ + if ((grub_addr_t) grub_video_fb_get_video_ptr (&target, src_x, src_y) + % sizeof (grub_uint32_t) == 0 +- && (grub_addr_t) grub_video_fb_get_video_ptr (&target, dst_x, dst_y) ++ && (grub_addr_t) grub_video_fb_get_video_ptr (&target, dst_x, dst_y) + % sizeof (grub_uint32_t) == 0 + && linelen % sizeof (grub_uint32_t) == 0 + && linedelta % sizeof (grub_uint32_t) == 0) +@@ -1155,7 +1155,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) + else if ((grub_addr_t) grub_video_fb_get_video_ptr (&target, src_x, src_y) + % sizeof (grub_uint16_t) == 0 + && (grub_addr_t) grub_video_fb_get_video_ptr (&target, +- dst_x, dst_y) ++ dst_x, dst_y) + % sizeof (grub_uint16_t) == 0 + && linelen % sizeof (grub_uint16_t) == 0 + && linedelta % sizeof (grub_uint16_t) == 0) +@@ -1170,7 +1170,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) + { + grub_uint8_t *src, *dst; + DO_SCROLL +- } ++ } + } + + /* 4. Fill empty space with specified color. In this implementation +@@ -1615,7 +1615,7 @@ grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask, + framebuffer.render_target = framebuffer.back_target; + return GRUB_ERR_NONE; + } +- ++ + mode_info->mode_type &= ~(GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED + | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP); + +diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c +index b7f911926..0e65b5206 100644 +--- a/grub-core/video/i386/pc/vbe.c ++++ b/grub-core/video/i386/pc/vbe.c +@@ -219,7 +219,7 @@ grub_vbe_disable_mtrr (int mtrr) + } + + /* Call VESA BIOS 0x4f09 to set palette data, return status. */ +-static grub_vbe_status_t ++static grub_vbe_status_t + grub_vbe_bios_set_palette_data (grub_uint32_t color_count, + grub_uint32_t start_index, + struct grub_vbe_palette_data *palette_data) +@@ -237,7 +237,7 @@ grub_vbe_bios_set_palette_data (grub_uint32_t color_count, + } + + /* Call VESA BIOS 0x4f00 to get VBE Controller Information, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *ci) + { + struct grub_bios_int_registers regs; +@@ -251,7 +251,7 @@ grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *ci) + } + + /* Call VESA BIOS 0x4f01 to get VBE Mode Information, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_mode_info (grub_uint32_t mode, + struct grub_vbe_mode_info_block *mode_info) + { +@@ -285,7 +285,7 @@ grub_vbe_bios_set_mode (grub_uint32_t mode, + } + + /* Call VESA BIOS 0x4f03 to return current VBE Mode, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_mode (grub_uint32_t *mode) + { + struct grub_bios_int_registers regs; +@@ -298,7 +298,7 @@ grub_vbe_bios_get_mode (grub_uint32_t *mode) + return regs.eax & 0xffff; + } + +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_getset_dac_palette_width (int set, int *dac_mask_size) + { + struct grub_bios_int_registers regs; +@@ -346,7 +346,7 @@ grub_vbe_bios_get_memory_window (grub_uint32_t window, + } + + /* Call VESA BIOS 0x4f06 to set scanline length (in bytes), return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_set_scanline_length (grub_uint32_t length) + { + struct grub_bios_int_registers regs; +@@ -354,14 +354,14 @@ grub_vbe_bios_set_scanline_length (grub_uint32_t length) + regs.ecx = length; + regs.eax = 0x4f06; + /* BL = 2, Set Scan Line in Bytes. */ +- regs.ebx = 0x0002; ++ regs.ebx = 0x0002; + regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT; + grub_bios_interrupt (0x10, ®s); + return regs.eax & 0xffff; + } + + /* Call VESA BIOS 0x4f06 to return scanline length (in bytes), return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_scanline_length (grub_uint32_t *length) + { + struct grub_bios_int_registers regs; +@@ -377,7 +377,7 @@ grub_vbe_bios_get_scanline_length (grub_uint32_t *length) + } + + /* Call VESA BIOS 0x4f07 to set display start, return status. */ +-static grub_vbe_status_t ++static grub_vbe_status_t + grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) + { + struct grub_bios_int_registers regs; +@@ -390,7 +390,7 @@ grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) + regs.edx = y; + regs.eax = 0x4f07; + /* BL = 80h, Set Display Start during Vertical Retrace. */ +- regs.ebx = 0x0080; ++ regs.ebx = 0x0080; + regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT; + grub_bios_interrupt (0x10, ®s); + +@@ -401,7 +401,7 @@ grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) + } + + /* Call VESA BIOS 0x4f07 to get display start, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_display_start (grub_uint32_t *x, + grub_uint32_t *y) + { +@@ -419,7 +419,7 @@ grub_vbe_bios_get_display_start (grub_uint32_t *x, + } + + /* Call VESA BIOS 0x4f0a. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_pm_interface (grub_uint16_t *segment, grub_uint16_t *offset, + grub_uint16_t *length) + { +@@ -896,7 +896,7 @@ vbe2videoinfo (grub_uint32_t mode, + case GRUB_VBE_MEMORY_MODEL_YUV: + mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_YUV; + break; +- ++ + case GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR: + mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_RGB; + break; +@@ -923,10 +923,10 @@ vbe2videoinfo (grub_uint32_t mode, + break; + case 8: + mode_info->bytes_per_pixel = 1; +- break; ++ break; + case 4: + mode_info->bytes_per_pixel = 0; +- break; ++ break; + } + + if (controller_info.version >= 0x300) +@@ -976,7 +976,7 @@ grub_video_vbe_iterate (int (*hook) (const struct grub_video_mode_info *info, vo + + static grub_err_t + grub_video_vbe_setup (unsigned int width, unsigned int height, +- grub_video_mode_type_t mode_type, ++ grub_video_mode_type_t mode_type, + grub_video_mode_type_t mode_mask) + { + grub_uint16_t *p; +@@ -1193,7 +1193,7 @@ grub_video_vbe_print_adapter_specific_info (void) + controller_info.version & 0xFF, + controller_info.oem_software_rev >> 8, + controller_info.oem_software_rev & 0xFF); +- ++ + /* The total_memory field is in 64 KiB units. */ + grub_printf_ (N_(" total memory: %d KiB\n"), + (controller_info.total_memory << 6)); +diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c +index b2f776c99..50d0b5e02 100644 +--- a/grub-core/video/i386/pc/vga.c ++++ b/grub-core/video/i386/pc/vga.c +@@ -48,7 +48,7 @@ static struct + int back_page; + } framebuffer; + +-static unsigned char ++static unsigned char + grub_vga_set_mode (unsigned char mode) + { + struct grub_bios_int_registers regs; +@@ -182,10 +182,10 @@ grub_video_vga_setup (unsigned int width, unsigned int height, + + is_target = 1; + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + return err; +- ++ + err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, + grub_video_fbstd_colors); + +diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c +index 17a3dbbb5..f8cf94d96 100644 +--- a/grub-core/video/ieee1275.c ++++ b/grub-core/video/ieee1275.c +@@ -234,7 +234,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height, + /* TODO. */ + return grub_error (GRUB_ERR_IO, "can't set mode %dx%d", width, height); + } +- ++ + err = grub_video_ieee1275_fill_mode_info (dev, &framebuffer.mode_info); + if (err) + { +@@ -261,7 +261,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height, + + grub_video_ieee1275_set_palette (0, framebuffer.mode_info.number_of_colors, + grub_video_fbstd_colors); +- ++ + return err; + } + +diff --git a/grub-core/video/radeon_fuloong2e.c b/grub-core/video/radeon_fuloong2e.c +index b4da34b5e..40917acb7 100644 +--- a/grub-core/video/radeon_fuloong2e.c ++++ b/grub-core/video/radeon_fuloong2e.c +@@ -75,7 +75,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != 0x515a1002) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -139,7 +139,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height, + framebuffer.mapped = 1; + + /* Prevent garbage from appearing on the screen. */ +- grub_memset (framebuffer.ptr, 0x55, ++ grub_memset (framebuffer.ptr, 0x55, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + + #ifndef TEST +@@ -152,7 +152,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height, + return err; + + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + return err; + +diff --git a/grub-core/video/radeon_yeeloong3a.c b/grub-core/video/radeon_yeeloong3a.c +index 52614feb6..48631c181 100644 +--- a/grub-core/video/radeon_yeeloong3a.c ++++ b/grub-core/video/radeon_yeeloong3a.c +@@ -74,7 +74,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != 0x96151002) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -137,7 +137,7 @@ grub_video_radeon_yeeloong3a_setup (unsigned int width, unsigned int height, + #endif + + /* Prevent garbage from appearing on the screen. */ +- grub_memset (framebuffer.ptr, 0, ++ grub_memset (framebuffer.ptr, 0, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + + #ifndef TEST +@@ -150,7 +150,7 @@ grub_video_radeon_yeeloong3a_setup (unsigned int width, unsigned int height, + return err; + + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + return err; + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index 0157ff742..54dfedf43 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -916,7 +916,7 @@ grub_png_convert_image (struct grub_png_data *data) + } + return; + } +- ++ + if (data->is_gray) + { + switch (data->bpp) +diff --git a/grub-core/video/readers/tga.c b/grub-core/video/readers/tga.c +index 7cb9d1d2a..a9ec3a1b6 100644 +--- a/grub-core/video/readers/tga.c ++++ b/grub-core/video/readers/tga.c +@@ -127,7 +127,7 @@ tga_load_palette (struct tga_data *data) + + if (len > sizeof (data->palette)) + len = sizeof (data->palette); +- ++ + if (grub_file_read (data->file, &data->palette, len) + != (grub_ssize_t) len) + return grub_errno; +diff --git a/grub-core/video/sis315_init.c b/grub-core/video/sis315_init.c +index ae5c1419c..09c3c7bbe 100644 +--- a/grub-core/video/sis315_init.c ++++ b/grub-core/video/sis315_init.c +@@ -1,4 +1,4 @@ +-static const struct { grub_uint8_t reg; grub_uint8_t val; } sr_dump [] = ++static const struct { grub_uint8_t reg; grub_uint8_t val; } sr_dump [] = + { + { 0x28, 0x81 }, + { 0x2a, 0x00 }, +diff --git a/grub-core/video/sis315pro.c b/grub-core/video/sis315pro.c +index 22a0c85a6..4d2f9999a 100644 +--- a/grub-core/video/sis315pro.c ++++ b/grub-core/video/sis315pro.c +@@ -103,7 +103,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != GRUB_SIS315PRO_PCIID) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -218,7 +218,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, + + #ifndef TEST + /* Prevent garbage from appearing on the screen. */ +- grub_memset (framebuffer.ptr, 0, ++ grub_memset (framebuffer.ptr, 0, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + grub_arch_sync_dma_caches (framebuffer.ptr, + framebuffer.mode_info.height +@@ -231,7 +231,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, + | GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0 + | GRUB_VGA_IO_MISC_28MHZ + | GRUB_VGA_IO_MISC_ENABLE_VRAM_ACCESS +- | GRUB_VGA_IO_MISC_COLOR, ++ | GRUB_VGA_IO_MISC_COLOR, + GRUB_VGA_IO_MISC_WRITE + GRUB_MACHINE_PCI_IO_BASE); + + grub_vga_sr_write (0x86, 5); +@@ -335,7 +335,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, + { + if (read_sis_cmd (0x5) != 0xa1) + write_sis_cmd (0x86, 0x5); +- ++ + write_sis_cmd (read_sis_cmd (0x20) | 0xa1, 0x20); + write_sis_cmd (read_sis_cmd (0x1e) | 0xda, 0x1e); + +diff --git a/grub-core/video/sm712.c b/grub-core/video/sm712.c +index 10c46eb65..65f59f84b 100644 +--- a/grub-core/video/sm712.c ++++ b/grub-core/video/sm712.c +@@ -167,7 +167,7 @@ enum + GRUB_SM712_CR_SHADOW_VGA_VBLANK_START = 0x46, + GRUB_SM712_CR_SHADOW_VGA_VBLANK_END = 0x47, + GRUB_SM712_CR_SHADOW_VGA_VRETRACE_START = 0x48, +- GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END = 0x49, ++ GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END = 0x49, + GRUB_SM712_CR_SHADOW_VGA_OVERFLOW = 0x4a, + GRUB_SM712_CR_SHADOW_VGA_CELL_HEIGHT = 0x4b, + GRUB_SM712_CR_SHADOW_VGA_HDISPLAY_END = 0x4c, +@@ -375,7 +375,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != GRUB_SM712_PCIID) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -471,7 +471,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, + + #if !defined (TEST) && !defined(GENINIT) + /* Prevent garbage from appearing on the screen. */ +- grub_memset ((void *) framebuffer.cached_ptr, 0, ++ grub_memset ((void *) framebuffer.cached_ptr, 0, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + #endif + +@@ -482,7 +482,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, + grub_sm712_sr_write (0x2, 0x6b); + grub_sm712_write_reg (0, GRUB_VGA_IO_PIXEL_MASK); + grub_sm712_sr_write (GRUB_VGA_SR_RESET_ASYNC, GRUB_VGA_SR_RESET); +- grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY ++ grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY + | GRUB_VGA_IO_MISC_NEGATIVE_HORIZ_POLARITY + | GRUB_VGA_IO_MISC_UPPER_64K + | GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0 +@@ -694,7 +694,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, + for (i = 0; i < ARRAY_SIZE (dda_lookups); i++) + grub_sm712_write_dda_lookup (i, dda_lookups[i].compare, dda_lookups[i].dda, + dda_lookups[i].vcentering); +- ++ + /* Undocumented */ + grub_sm712_cr_write (0, 0x9c); + grub_sm712_cr_write (0, 0x9d); +diff --git a/grub-core/video/video.c b/grub-core/video/video.c +index 983424107..8937da745 100644 +--- a/grub-core/video/video.c ++++ b/grub-core/video/video.c +@@ -491,13 +491,13 @@ parse_modespec (const char *current_mode, int *width, int *height, int *depth) + current_mode); + + param++; +- ++ + *width = grub_strtoul (value, 0, 0); + if (grub_errno != GRUB_ERR_NONE) + return grub_error (GRUB_ERR_BAD_ARGUMENT, + N_("invalid video mode specification `%s'"), + current_mode); +- ++ + /* Find height value. */ + value = param; + param = grub_strchr(param, 'x'); +@@ -513,13 +513,13 @@ parse_modespec (const char *current_mode, int *width, int *height, int *depth) + { + /* We have optional color depth value. */ + param++; +- ++ + *height = grub_strtoul (value, 0, 0); + if (grub_errno != GRUB_ERR_NONE) + return grub_error (GRUB_ERR_BAD_ARGUMENT, + N_("invalid video mode specification `%s'"), + current_mode); +- ++ + /* Convert color depth value. */ + value = param; + *depth = grub_strtoul (value, 0, 0); +-- +2.41.0 + diff --git a/boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch b/boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch new file mode 100644 index 000000000000..94431a4ef17a --- /dev/null +++ b/boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch @@ -0,0 +1,204 @@ +From 91d16e415b79f5080fa2bcc21bff6471f6be9f08 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 14:02:55 +1000 +Subject: [PATCH] video/readers/png: Abort sooner if a read operation fails + +Fuzzing revealed some inputs that were taking a long time, potentially +forever, because they did not bail quickly upon encountering an I/O error. + +Try to catch I/O errors sooner and bail out. + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: d5caac8ab79d068ad9a41030c772d03a4d4fbd7b +[Thomas: needed to cherry-pick +e623866d9286410156e8b9d2c82d6253a1b22d08, which fixes CVE-2021-3695] +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 55 ++++++++++++++++++++++++++++++----- + 1 file changed, 47 insertions(+), 8 deletions(-) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index 54dfedf43..d715c4629 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -142,6 +142,7 @@ static grub_uint8_t + grub_png_get_byte (struct grub_png_data *data) + { + grub_uint8_t r; ++ grub_ssize_t bytes_read = 0; + + if ((data->inside_idat) && (data->idat_remain == 0)) + { +@@ -175,7 +176,14 @@ grub_png_get_byte (struct grub_png_data *data) + } + + r = 0; +- grub_file_read (data->file, &r, 1); ++ bytes_read = grub_file_read (data->file, &r, 1); ++ ++ if (bytes_read != 1) ++ { ++ grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "png: unexpected end of data"); ++ return 0; ++ } + + if (data->inside_idat) + data->idat_remain--; +@@ -231,15 +239,16 @@ grub_png_decode_image_palette (struct grub_png_data *data, + if (len == 0) + return GRUB_ERR_NONE; + +- for (i = 0; 3 * i < len && i < 256; i++) ++ grub_errno = GRUB_ERR_NONE; ++ for (i = 0; 3 * i < len && i < 256 && grub_errno == GRUB_ERR_NONE; i++) + for (j = 0; j < 3; j++) + data->palette[i][j] = grub_png_get_byte (data); +- for (i *= 3; i < len; i++) ++ for (i *= 3; i < len && grub_errno == GRUB_ERR_NONE; i++) + grub_png_get_byte (data); + + grub_png_get_dword (data); + +- return GRUB_ERR_NONE; ++ return grub_errno; + } + + static grub_err_t +@@ -256,9 +265,13 @@ grub_png_decode_image_header (struct grub_png_data *data) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, "png: invalid image size"); + + color_bits = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + data->is_16bit = (color_bits == 16); + + color_type = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + /* According to PNG spec, no other types are valid. */ + if ((color_type & ~(PNG_COLOR_MASK_ALPHA | PNG_COLOR_MASK_COLOR)) +@@ -340,14 +353,20 @@ grub_png_decode_image_header (struct grub_png_data *data) + if (grub_png_get_byte (data) != PNG_COMPRESSION_BASE) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: compression method not supported"); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if (grub_png_get_byte (data) != PNG_FILTER_TYPE_BASE) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: filter method not supported"); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if (grub_png_get_byte (data) != PNG_INTERLACE_NONE) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: interlace method not supported"); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + /* Skip crc checksum. */ + grub_png_get_dword (data); +@@ -449,7 +468,7 @@ grub_png_get_huff_code (struct grub_png_data *data, struct huff_table *ht) + int code, i; + + code = 0; +- for (i = 0; i < ht->max_length; i++) ++ for (i = 0; i < ht->max_length && grub_errno == GRUB_ERR_NONE; i++) + { + code = (code << 1) + grub_png_get_bits (data, 1); + if (code < ht->maxval[i]) +@@ -504,8 +523,14 @@ grub_png_init_dynamic_block (struct grub_png_data *data) + grub_uint8_t lens[DEFLATE_HCLEN_MAX]; + + nl = DEFLATE_HLIT_BASE + grub_png_get_bits (data, 5); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + nd = DEFLATE_HDIST_BASE + grub_png_get_bits (data, 5); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + nb = DEFLATE_HCLEN_BASE + grub_png_get_bits (data, 4); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if ((nl > DEFLATE_HLIT_MAX) || (nd > DEFLATE_HDIST_MAX) || + (nb > DEFLATE_HCLEN_MAX)) +@@ -533,7 +558,7 @@ grub_png_init_dynamic_block (struct grub_png_data *data) + data->dist_offset); + + prev = 0; +- for (i = 0; i < nl + nd; i++) ++ for (i = 0; i < nl + nd && grub_errno == GRUB_ERR_NONE; i++) + { + int n, code; + struct huff_table *ht; +@@ -721,17 +746,21 @@ grub_png_read_dynamic_block (struct grub_png_data *data) + len = cplens[n]; + if (cplext[n]) + len += grub_png_get_bits (data, cplext[n]); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + n = grub_png_get_huff_code (data, &data->dist_table); + dist = cpdist[n]; + if (cpdext[n]) + dist += grub_png_get_bits (data, cpdext[n]); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + pos = data->wp - dist; + if (pos < 0) + pos += WSIZE; + +- while (len > 0) ++ while (len > 0 && grub_errno == GRUB_ERR_NONE) + { + data->slide[data->wp] = data->slide[pos]; + grub_png_output_byte (data, data->slide[data->wp]); +@@ -759,7 +788,11 @@ grub_png_decode_image_data (struct grub_png_data *data) + int final; + + cmf = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + flg = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if ((cmf & 0xF) != Z_DEFLATED) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, +@@ -774,7 +807,11 @@ grub_png_decode_image_data (struct grub_png_data *data) + int block_type; + + final = grub_png_get_bits (data, 1); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + block_type = grub_png_get_bits (data, 2); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + switch (block_type) + { +@@ -790,7 +827,7 @@ grub_png_decode_image_data (struct grub_png_data *data) + grub_png_get_byte (data); + grub_png_get_byte (data); + +- for (i = 0; i < len; i++) ++ for (i = 0; i < len && grub_errno == GRUB_ERR_NONE; i++) + grub_png_output_byte (data, grub_png_get_byte (data)); + + break; +@@ -1045,6 +1082,8 @@ grub_png_decode_png (struct grub_png_data *data) + + len = grub_png_get_dword (data); + type = grub_png_get_dword (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ break; + data->next_offset = data->file->offset + len + 4; + + switch (type) +-- +2.41.0 + diff --git a/boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch b/boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch new file mode 100644 index 000000000000..903d33b7b518 --- /dev/null +++ b/boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch @@ -0,0 +1,34 @@ +From e170edd18fcfdd9e6f91ba750fd022cef8d43cd4 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 14:13:40 +1000 +Subject: [PATCH] video/readers/png: Refuse to handle multiple image headers + +This causes the bitmap to be leaked. Do not permit multiple image headers. + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 166a4d61448f74745afe1dac2f2cfb85d04909bf +[Thomas: needed to cherry-pick +e623866d9286410156e8b9d2c82d6253a1b22d08, which fixes CVE-2021-3695] +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index d715c4629..35ae553c8 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -258,6 +258,9 @@ grub_png_decode_image_header (struct grub_png_data *data) + int color_bits; + enum grub_video_blit_format blt; + ++ if (data->image_width || data->image_height) ++ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "png: two image headers found"); ++ + data->image_width = grub_png_get_dword (data); + data->image_height = grub_png_get_dword (data); + +-- +2.41.0 + diff --git a/boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch b/boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch new file mode 100644 index 000000000000..686a0beafd7f --- /dev/null +++ b/boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch @@ -0,0 +1,173 @@ +From 5b42d132a029c1d245d94c813a45836522b46226 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 18:51:35 +1000 +Subject: [PATCH] video/readers/png: Drop greyscale support to fix heap + out-of-bounds write + +A 16-bit greyscale PNG without alpha is processed in the following loop: + + for (i = 0; i < (data->image_width * data->image_height); + i++, d1 += 4, d2 += 2) + { + d1[R3] = d2[1]; + d1[G3] = d2[1]; + d1[B3] = d2[1]; + } + +The increment of d1 is wrong. d1 is incremented by 4 bytes per iteration, +but there are only 3 bytes allocated for storage. This means that image +data will overwrite somewhat-attacker-controlled parts of memory - 3 bytes +out of every 4 following the end of the image. + +This has existed since greyscale support was added in 2013 in commit +3ccf16dff98f (grub-core/video/readers/png.c: Support grayscale). + +Saving starfield.png as a 16-bit greyscale image without alpha in the gimp +and attempting to load it causes grub-emu to crash - I don't think this code +has ever worked. + +Delete all PNG greyscale support. + +Fixes: CVE-2021-3695 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: e623866d9286410156e8b9d2c82d6253a1b22d08 +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 87 +++-------------------------------- + 1 file changed, 7 insertions(+), 80 deletions(-) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index 35ae553c8..a3161e25b 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -100,7 +100,7 @@ struct grub_png_data + + unsigned image_width, image_height; + int bpp, is_16bit; +- int raw_bytes, is_gray, is_alpha, is_palette; ++ int raw_bytes, is_alpha, is_palette; + int row_bytes, color_bits; + grub_uint8_t *image_data; + +@@ -296,13 +296,13 @@ grub_png_decode_image_header (struct grub_png_data *data) + data->bpp = 3; + else + { +- data->is_gray = 1; +- data->bpp = 1; ++ return grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "png: color type not supported"); + } + + if ((color_bits != 8) && (color_bits != 16) + && (color_bits != 4 +- || !(data->is_gray || data->is_palette))) ++ || !data->is_palette)) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: bit depth must be 8 or 16"); + +@@ -331,7 +331,7 @@ grub_png_decode_image_header (struct grub_png_data *data) + } + + #ifndef GRUB_CPU_WORDS_BIGENDIAN +- if (data->is_16bit || data->is_gray || data->is_palette) ++ if (data->is_16bit || data->is_palette) + #endif + { + data->image_data = grub_calloc (data->image_height, data->row_bytes); +@@ -899,27 +899,8 @@ grub_png_convert_image (struct grub_png_data *data) + int shift; + int mask = (1 << data->color_bits) - 1; + unsigned j; +- if (data->is_gray) +- { +- /* Generic formula is +- (0xff * i) / ((1U << data->color_bits) - 1) +- but for allowed bit depth of 1, 2 and for it's +- equivalent to +- (0xff / ((1U << data->color_bits) - 1)) * i +- Precompute the multipliers to avoid division. +- */ +- +- const grub_uint8_t multipliers[5] = { 0xff, 0xff, 0x55, 0x24, 0x11 }; +- for (i = 0; i < (1U << data->color_bits); i++) +- { +- grub_uint8_t col = multipliers[data->color_bits] * i; +- palette[i][0] = col; +- palette[i][1] = col; +- palette[i][2] = col; +- } +- } +- else +- grub_memcpy (palette, data->palette, 3 << data->color_bits); ++ ++ grub_memcpy (palette, data->palette, 3 << data->color_bits); + d1c = d1; + d2c = d2; + for (j = 0; j < data->image_height; j++, d1c += data->image_width * 3, +@@ -957,60 +938,6 @@ grub_png_convert_image (struct grub_png_data *data) + return; + } + +- if (data->is_gray) +- { +- switch (data->bpp) +- { +- case 4: +- /* 16-bit gray with alpha. */ +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 4, d2 += 4) +- { +- d1[R4] = d2[3]; +- d1[G4] = d2[3]; +- d1[B4] = d2[3]; +- d1[A4] = d2[1]; +- } +- break; +- case 2: +- if (data->is_16bit) +- /* 16-bit gray without alpha. */ +- { +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 4, d2 += 2) +- { +- d1[R3] = d2[1]; +- d1[G3] = d2[1]; +- d1[B3] = d2[1]; +- } +- } +- else +- /* 8-bit gray with alpha. */ +- { +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 4, d2 += 2) +- { +- d1[R4] = d2[1]; +- d1[G4] = d2[1]; +- d1[B4] = d2[1]; +- d1[A4] = d2[0]; +- } +- } +- break; +- /* 8-bit gray without alpha. */ +- case 1: +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 3, d2++) +- { +- d1[R3] = d2[0]; +- d1[G3] = d2[0]; +- d1[B3] = d2[0]; +- } +- break; +- } +- return; +- } +- + { + /* Only copy the upper 8 bit. */ + #ifndef GRUB_CPU_WORDS_BIGENDIAN +-- +2.41.0 + diff --git a/boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch b/boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch new file mode 100644 index 000000000000..19fde07060c8 --- /dev/null +++ b/boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch @@ -0,0 +1,44 @@ +From 43a7d9cb829467993ba683a26c980fcfdaa924c8 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 23:25:07 +1000 +Subject: [PATCH] video/readers/png: Avoid heap OOB R/W inserting huff table + items + +In fuzzing we observed crashes where a code would attempt to be inserted +into a huffman table before the start, leading to a set of heap OOB reads +and writes as table entries with negative indices were shifted around and +the new code written in. + +Catch the case where we would underflow the array and bail. + +Fixes: CVE-2021-3696 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 210245129c932dc9e1c2748d9d35524fb95b5042 +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index a3161e25b..d7ed5aa6c 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -438,6 +438,13 @@ grub_png_insert_huff_item (struct huff_table *ht, int code, int len) + for (i = len; i < ht->max_length; i++) + n += ht->maxval[i]; + ++ if (n > ht->num_values) ++ { ++ grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "png: out of range inserting huffman table item"); ++ return; ++ } ++ + for (i = 0; i < n; i++) + ht->values[ht->num_values - i] = ht->values[ht->num_values - i - 1]; + +-- +2.41.0 + diff --git a/boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch b/boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch new file mode 100644 index 000000000000..75c3f8e43b70 --- /dev/null +++ b/boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch @@ -0,0 +1,78 @@ +From 6be7ccfcc33da513de66f71de63fdc129fa019c2 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Wed, 7 Jul 2021 15:38:19 +1000 +Subject: [PATCH] video/readers/jpeg: Block int underflow -> wild pointer write + +Certain 1 px wide images caused a wild pointer write in +grub_jpeg_ycrcb_to_rgb(). This was caused because in grub_jpeg_decode_data(), +we have the following loop: + +for (; data->r1 < nr1 && (!data->dri || rst); + data->r1++, data->bitmap_ptr += (vb * data->image_width - hb * nc1) * 3) + +We did not check if vb * width >= hb * nc1. + +On a 64-bit platform, if that turns out to be negative, it will underflow, +be interpreted as unsigned 64-bit, then be added to the 64-bit pointer, so +we see data->bitmap_ptr jump, e.g.: + +0x6180_0000_0480 to +0x6181_0000_0498 + ^ + ~--- carry has occurred and this pointer is now far away from + any object. + +On a 32-bit platform, it will decrement the pointer, creating a pointer +that won't crash but will overwrite random data. + +Catch the underflow and error out. + +Fixes: CVE-2021-3697 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 22a3f97d39f6a10b08ad7fd1cc47c4dcd10413f6 +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/jpeg.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c +index e31602f76..1d256af01 100644 +--- a/grub-core/video/readers/jpeg.c ++++ b/grub-core/video/readers/jpeg.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -639,6 +640,7 @@ static grub_err_t + grub_jpeg_decode_data (struct grub_jpeg_data *data) + { + unsigned c1, vb, hb, nr1, nc1; ++ unsigned stride_a, stride_b, stride; + int rst = data->dri; + + vb = 8 << data->log_vs; +@@ -650,8 +652,14 @@ grub_jpeg_decode_data (struct grub_jpeg_data *data) + return grub_error(GRUB_ERR_BAD_FILE_TYPE, + "jpeg: attempted to decode data before start of stream"); + ++ if (grub_mul(vb, data->image_width, &stride_a) || ++ grub_mul(hb, nc1, &stride_b) || ++ grub_sub(stride_a, stride_b, &stride)) ++ return grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "jpeg: cannot decode image with these dimensions"); ++ + for (; data->r1 < nr1 && (!data->dri || rst); +- data->r1++, data->bitmap_ptr += (vb * data->image_width - hb * nc1) * 3) ++ data->r1++, data->bitmap_ptr += stride * 3) + for (c1 = 0; c1 < nc1 && (!data->dri || rst); + c1++, rst--, data->bitmap_ptr += hb * 3) + { +-- +2.41.0 + diff --git a/boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch b/boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch new file mode 100644 index 000000000000..3acec5cc209c --- /dev/null +++ b/boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch @@ -0,0 +1,56 @@ +From cadde7e36b8797060ac8cdf7cca7d8e1e09697e6 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Mon, 20 Dec 2021 19:41:21 +1100 +Subject: [PATCH] net/ip: Do IP fragment maths safely + +We can receive packets with invalid IP fragmentation information. This +can lead to rsm->total_len underflowing and becoming very large. + +Then, in grub_netbuff_alloc(), we add to this very large number, which can +cause it to overflow and wrap back around to a small positive number. +The allocation then succeeds, but the resulting buffer is too small and +subsequent operations can write past the end of the buffer. + +Catch the underflow here. + +Fixes: CVE-2022-28733 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 3e4817538de828319ba6d59ced2fbb9b5ca13287 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/ip.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c +index ea5edf8f1..74e4e8b06 100644 +--- a/grub-core/net/ip.c ++++ b/grub-core/net/ip.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + struct iphdr { +@@ -512,7 +513,14 @@ grub_net_recv_ip4_packets (struct grub_net_buff *nb, + { + rsm->total_len = (8 * (grub_be_to_cpu16 (iph->frags) & OFFSET_MASK) + + (nb->tail - nb->data)); +- rsm->total_len -= ((iph->verhdrlen & 0xf) * sizeof (grub_uint32_t)); ++ ++ if (grub_sub (rsm->total_len, (iph->verhdrlen & 0xf) * sizeof (grub_uint32_t), ++ &rsm->total_len)) ++ { ++ grub_dprintf ("net", "IP reassembly size underflow\n"); ++ return GRUB_ERR_NONE; ++ } ++ + rsm->asm_netbuff = grub_netbuff_alloc (rsm->total_len); + if (!rsm->asm_netbuff) + { +-- +2.41.0 + diff --git a/boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch b/boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch new file mode 100644 index 000000000000..cd249299be61 --- /dev/null +++ b/boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch @@ -0,0 +1,50 @@ +From 6bb49bda656e1121fd303cf3e69709172e267718 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 8 Mar 2022 18:17:03 +1100 +Subject: [PATCH] net/http: Fix OOB write for split http headers + +GRUB has special code for handling an http header that is split +across two packets. + +The code tracks the end of line by looking for a "\n" byte. The +code for split headers has always advanced the pointer just past the +end of the line, whereas the code that handles unsplit headers does +not advance the pointer. This extra advance causes the length to be +one greater, which breaks an assumption in parse_line(), leading to +it writing a NUL byte one byte past the end of the buffer where we +reconstruct the line from the two packets. + +It's conceivable that an attacker controlled set of packets could +cause this to zero out the first byte of the "next" pointer of the +grub_mm_region structure following the current_line buffer. + +Do not advance the pointer in the split header case. + +Fixes: CVE-2022-28734 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: ec6bfd3237394c1c7dbf2fd73417173318d22f4b +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/http.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/grub-core/net/http.c b/grub-core/net/http.c +index b616cf40b..a19b0a205 100644 +--- a/grub-core/net/http.c ++++ b/grub-core/net/http.c +@@ -190,9 +190,7 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)), + int have_line = 1; + char *t; + ptr = grub_memchr (nb->data, '\n', nb->tail - nb->data); +- if (ptr) +- ptr++; +- else ++ if (ptr == NULL) + { + have_line = 0; + ptr = (char *) nb->tail; +-- +2.41.0 + diff --git a/boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch b/boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch new file mode 100644 index 000000000000..684bb88a9c1a --- /dev/null +++ b/boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch @@ -0,0 +1,52 @@ +From 2974684d2f7f85a5c57af8155cc3b70c04ec1d6b Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 8 Mar 2022 19:04:40 +1100 +Subject: [PATCH] net/http: Error out on headers with LF without CR + +In a similar vein to the previous patch, parse_line() would write +a NUL byte past the end of the buffer if there was an HTTP header +with a LF rather than a CRLF. + +RFC-2616 says: + + Many HTTP/1.1 header field values consist of words separated by LWS + or special characters. These special characters MUST be in a quoted + string to be used within a parameter value (as defined in section 3.6). + +We don't support quoted sections or continuation lines, etc. + +If we see an LF that's not part of a CRLF, bail out. + +Fixes: CVE-2022-28734 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: b26b4c08e7119281ff30d0fb4a6169bd2afa8fe4 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/http.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/grub-core/net/http.c b/grub-core/net/http.c +index a19b0a205..1fa62b5cb 100644 +--- a/grub-core/net/http.c ++++ b/grub-core/net/http.c +@@ -68,7 +68,15 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len) + char *end = ptr + len; + while (end > ptr && *(end - 1) == '\r') + end--; ++ ++ /* LF without CR. */ ++ if (end == ptr + len) ++ { ++ data->errmsg = grub_strdup (_("invalid HTTP header - LF without CR")); ++ return GRUB_ERR_NONE; ++ } + *end = 0; ++ + /* Trailing CRLF. */ + if (data->in_chunk_len == 1) + { +-- +2.41.0 + diff --git a/boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch b/boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch new file mode 100644 index 000000000000..680df1f5e9b3 --- /dev/null +++ b/boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch @@ -0,0 +1,116 @@ +From 1aefeca0f6304a20c1a3711cb9e89c5fdb901b6b Mon Sep 17 00:00:00 2001 +From: Zhang Boyang +Date: Fri, 5 Aug 2022 00:51:20 +0800 +Subject: [PATCH] font: Fix size overflow in grub_font_get_glyph_internal() + +The length of memory allocation and file read may overflow. This patch +fixes the problem by using safemath macros. + +There is a lot of code repetition like "(x * y + 7) / 8". It is unsafe +if overflow happens. This patch introduces grub_video_bitmap_calc_1bpp_bufsz(). +It is safe replacement for such code. It has safemath-like prototype. + +This patch also introduces grub_cast(value, pointer), it casts value to +typeof(*pointer) then store the value to *pointer. It returns true when +overflow occurs or false if there is no overflow. The semantics of arguments +and return value are designed to be consistent with other safemath macros. + +Signed-off-by: Zhang Boyang +Reviewed-by: Daniel Kiper +Upstream: 9c76ec09ae08155df27cd237eaea150b4f02f532 +[Thomas: needed to backport 768e1ef2fc159f6e14e7246e4be09363708ac39e, +which fixes CVE-2022-2601] +Signed-off-by: Thomas Petazzoni +--- + grub-core/font/font.c | 17 +++++++++++++---- + include/grub/bitmap.h | 18 ++++++++++++++++++ + include/grub/safemath.h | 2 ++ + 3 files changed, 33 insertions(+), 4 deletions(-) + +diff --git a/grub-core/font/font.c b/grub-core/font/font.c +index d09bb38d8..876b5b695 100644 +--- a/grub-core/font/font.c ++++ b/grub-core/font/font.c +@@ -739,7 +739,8 @@ grub_font_get_glyph_internal (grub_font_t font, grub_uint32_t code) + grub_int16_t xoff; + grub_int16_t yoff; + grub_int16_t dwidth; +- int len; ++ grub_ssize_t len; ++ grub_size_t sz; + + if (index_entry->glyph) + /* Return cached glyph. */ +@@ -766,9 +767,17 @@ grub_font_get_glyph_internal (grub_font_t font, grub_uint32_t code) + return 0; + } + +- len = (width * height + 7) / 8; +- glyph = grub_malloc (sizeof (struct grub_font_glyph) + len); +- if (!glyph) ++ /* Calculate real struct size of current glyph. */ ++ if (grub_video_bitmap_calc_1bpp_bufsz (width, height, &len) || ++ grub_add (sizeof (struct grub_font_glyph), len, &sz)) ++ { ++ remove_font (font); ++ return 0; ++ } ++ ++ /* Allocate and initialize the glyph struct. */ ++ glyph = grub_malloc (sz); ++ if (glyph == NULL) + { + remove_font (font); + return 0; +diff --git a/include/grub/bitmap.h b/include/grub/bitmap.h +index 5728f8ca3..0d9603f61 100644 +--- a/include/grub/bitmap.h ++++ b/include/grub/bitmap.h +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + struct grub_video_bitmap + { +@@ -79,6 +80,23 @@ grub_video_bitmap_get_height (struct grub_video_bitmap *bitmap) + return bitmap->mode_info.height; + } + ++/* ++ * Calculate and store the size of data buffer of 1bit bitmap in result. ++ * Equivalent to "*result = (width * height + 7) / 8" if no overflow occurs. ++ * Return true when overflow occurs or false if there is no overflow. ++ * This function is intentionally implemented as a macro instead of ++ * an inline function. Although a bit awkward, it preserves data types for ++ * safemath macros and reduces macro side effects as much as possible. ++ * ++ * XXX: Will report false overflow if width * height > UINT64_MAX. ++ */ ++#define grub_video_bitmap_calc_1bpp_bufsz(width, height, result) \ ++({ \ ++ grub_uint64_t _bitmap_pixels; \ ++ grub_mul ((width), (height), &_bitmap_pixels) ? 1 : \ ++ grub_cast (_bitmap_pixels / GRUB_CHAR_BIT + !!(_bitmap_pixels % GRUB_CHAR_BIT), (result)); \ ++}) ++ + void EXPORT_FUNC (grub_video_bitmap_get_mode_info) (struct grub_video_bitmap *bitmap, + struct grub_video_mode_info *mode_info); + +diff --git a/include/grub/safemath.h b/include/grub/safemath.h +index c17b89bba..bb0f826de 100644 +--- a/include/grub/safemath.h ++++ b/include/grub/safemath.h +@@ -30,6 +30,8 @@ + #define grub_sub(a, b, res) __builtin_sub_overflow(a, b, res) + #define grub_mul(a, b, res) __builtin_mul_overflow(a, b, res) + ++#define grub_cast(a, res) grub_add ((a), 0, (res)) ++ + #else + #error gcc 5.1 or newer or clang 3.8 or newer is required + #endif +-- +2.41.0 + diff --git a/boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch b/boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch new file mode 100644 index 000000000000..d8e5835e181c --- /dev/null +++ b/boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch @@ -0,0 +1,83 @@ +From fefba72d17364d6212cfd3be2232f4ce0ba23b82 Mon Sep 17 00:00:00 2001 +From: Zhang Boyang +Date: Fri, 5 Aug 2022 01:58:27 +0800 +Subject: [PATCH] font: Fix several integer overflows in + grub_font_construct_glyph() + +This patch fixes several integer overflows in grub_font_construct_glyph(). +Glyphs of invalid size, zero or leading to an overflow, are rejected. +The inconsistency between "glyph" and "max_glyph_size" when grub_malloc() +returns NULL is fixed too. + +Fixes: CVE-2022-2601 + +Reported-by: Zhang Boyang +Signed-off-by: Zhang Boyang +Reviewed-by: Daniel Kiper +Upstream: 768e1ef2fc159f6e14e7246e4be09363708ac39e +Signed-off-by: Thomas Petazzoni +--- + grub-core/font/font.c | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) + +diff --git a/grub-core/font/font.c b/grub-core/font/font.c +index 876b5b695..0ff552578 100644 +--- a/grub-core/font/font.c ++++ b/grub-core/font/font.c +@@ -1515,6 +1515,7 @@ grub_font_construct_glyph (grub_font_t hinted_font, + struct grub_video_signed_rect bounds; + static struct grub_font_glyph *glyph = 0; + static grub_size_t max_glyph_size = 0; ++ grub_size_t cur_glyph_size; + + ensure_comb_space (glyph_id); + +@@ -1531,29 +1532,33 @@ grub_font_construct_glyph (grub_font_t hinted_font, + if (!glyph_id->ncomb && !glyph_id->attributes) + return main_glyph; + +- if (max_glyph_size < sizeof (*glyph) + (bounds.width * bounds.height + GRUB_CHAR_BIT - 1) / GRUB_CHAR_BIT) ++ if (grub_video_bitmap_calc_1bpp_bufsz (bounds.width, bounds.height, &cur_glyph_size) || ++ grub_add (sizeof (*glyph), cur_glyph_size, &cur_glyph_size)) ++ return main_glyph; ++ ++ if (max_glyph_size < cur_glyph_size) + { + grub_free (glyph); +- max_glyph_size = (sizeof (*glyph) + (bounds.width * bounds.height + GRUB_CHAR_BIT - 1) / GRUB_CHAR_BIT) * 2; +- if (max_glyph_size < 8) +- max_glyph_size = 8; +- glyph = grub_malloc (max_glyph_size); ++ if (grub_mul (cur_glyph_size, 2, &max_glyph_size)) ++ max_glyph_size = 0; ++ glyph = max_glyph_size > 0 ? grub_malloc (max_glyph_size) : NULL; + } + if (!glyph) + { ++ max_glyph_size = 0; + grub_errno = GRUB_ERR_NONE; + return main_glyph; + } + +- grub_memset (glyph, 0, sizeof (*glyph) +- + (bounds.width * bounds.height +- + GRUB_CHAR_BIT - 1) / GRUB_CHAR_BIT); ++ grub_memset (glyph, 0, cur_glyph_size); + + glyph->font = main_glyph->font; +- glyph->width = bounds.width; +- glyph->height = bounds.height; +- glyph->offset_x = bounds.x; +- glyph->offset_y = bounds.y; ++ if (bounds.width == 0 || bounds.height == 0 || ++ grub_cast (bounds.width, &glyph->width) || ++ grub_cast (bounds.height, &glyph->height) || ++ grub_cast (bounds.x, &glyph->offset_x) || ++ grub_cast (bounds.y, &glyph->offset_y)) ++ return main_glyph; + + if (glyph_id->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR) + grub_font_blit_glyph_mirror (glyph, main_glyph, +-- +2.41.0 + diff --git a/boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch b/boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch new file mode 100644 index 000000000000..1d3d26fb7bcf --- /dev/null +++ b/boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch @@ -0,0 +1,93 @@ +From 79bd19e078c5053d800b1b4d3a901083da947e70 Mon Sep 17 00:00:00 2001 +From: Zhang Boyang +Date: Mon, 24 Oct 2022 08:05:35 +0800 +Subject: [PATCH] font: Fix an integer underflow in blit_comb() + +The expression (ctx.bounds.height - combining_glyphs[i]->height) / 2 may +evaluate to a very big invalid value even if both ctx.bounds.height and +combining_glyphs[i]->height are small integers. For example, if +ctx.bounds.height is 10 and combining_glyphs[i]->height is 12, this +expression evaluates to 2147483647 (expected -1). This is because +coordinates are allowed to be negative but ctx.bounds.height is an +unsigned int. So, the subtraction operates on unsigned ints and +underflows to a very big value. The division makes things even worse. +The quotient is still an invalid value even if converted back to int. + +This patch fixes the problem by casting ctx.bounds.height to int. As +a result the subtraction will operate on int and grub_uint16_t which +will be promoted to an int. So, the underflow will no longer happen. Other +uses of ctx.bounds.height (and ctx.bounds.width) are also casted to int, +to ensure coordinates are always calculated on signed integers. + +Fixes: CVE-2022-3775 + +Reported-by: Daniel Axtens +Signed-off-by: Zhang Boyang +Reviewed-by: Daniel Kiper +Upstream: 992c06191babc1e109caf40d6a07ec6fdef427af +Signed-off-by: Thomas Petazzoni +--- + grub-core/font/font.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/grub-core/font/font.c b/grub-core/font/font.c +index 0ff552578..7b1cbde07 100644 +--- a/grub-core/font/font.c ++++ b/grub-core/font/font.c +@@ -1206,12 +1206,12 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + ctx.bounds.height = main_glyph->height; + + above_rightx = main_glyph->offset_x + main_glyph->width; +- above_righty = ctx.bounds.y + ctx.bounds.height; ++ above_righty = ctx.bounds.y + (int) ctx.bounds.height; + + above_leftx = main_glyph->offset_x; +- above_lefty = ctx.bounds.y + ctx.bounds.height; ++ above_lefty = ctx.bounds.y + (int) ctx.bounds.height; + +- below_rightx = ctx.bounds.x + ctx.bounds.width; ++ below_rightx = ctx.bounds.x + (int) ctx.bounds.width; + below_righty = ctx.bounds.y; + + comb = grub_unicode_get_comb (glyph_id); +@@ -1224,7 +1224,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + + if (!combining_glyphs[i]) + continue; +- targetx = (ctx.bounds.width - combining_glyphs[i]->width) / 2 + ctx.bounds.x; ++ targetx = ((int) ctx.bounds.width - combining_glyphs[i]->width) / 2 + ctx.bounds.x; + /* CGJ is to avoid diacritics reordering. */ + if (comb[i].code + == GRUB_UNICODE_COMBINING_GRAPHEME_JOINER) +@@ -1234,8 +1234,8 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + case GRUB_UNICODE_COMB_OVERLAY: + do_blit (combining_glyphs[i], + targetx, +- (ctx.bounds.height - combining_glyphs[i]->height) / 2 +- - (ctx.bounds.height + ctx.bounds.y), &ctx); ++ ((int) ctx.bounds.height - combining_glyphs[i]->height) / 2 ++ - ((int) ctx.bounds.height + ctx.bounds.y), &ctx); + if (min_devwidth < combining_glyphs[i]->width) + min_devwidth = combining_glyphs[i]->width; + break; +@@ -1308,7 +1308,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + /* Fallthrough. */ + case GRUB_UNICODE_STACK_ATTACHED_ABOVE: + do_blit (combining_glyphs[i], targetx, +- -(ctx.bounds.height + ctx.bounds.y + space ++ -((int) ctx.bounds.height + ctx.bounds.y + space + + combining_glyphs[i]->height), &ctx); + if (min_devwidth < combining_glyphs[i]->width) + min_devwidth = combining_glyphs[i]->width; +@@ -1316,7 +1316,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + + case GRUB_UNICODE_COMB_HEBREW_DAGESH: + do_blit (combining_glyphs[i], targetx, +- -(ctx.bounds.height / 2 + ctx.bounds.y ++ -((int) ctx.bounds.height / 2 + ctx.bounds.y + + combining_glyphs[i]->height / 2), &ctx); + if (min_devwidth < combining_glyphs[i]->width) + min_devwidth = combining_glyphs[i]->width; +-- +2.41.0 + diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 875884cf5c4a..6c3a861fb644 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -34,6 +34,25 @@ GRUB2_IGNORE_CVES += CVE-2020-15705 GRUB2_IGNORE_CVES += CVE-2021-3981 # vulnerability is specific to the SUSE distribution GRUB2_IGNORE_CVES += CVE-2021-46705 +# 0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch +GRUB2_IGNORE_CVES += CVE-2022-28736 +# 0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch +GRUB2_IGNORE_CVES += CVE-2022-28735 +# 0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch +GRUB2_IGNORE_CVES += CVE-2021-3695 +# 0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch +GRUB2_IGNORE_CVES += CVE-2021-3696 +# 0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch +GRUB2_IGNORE_CVES += CVE-2021-3697 +# 0013-net-ip-Do-IP-fragment-maths-safely.patch +GRUB2_IGNORE_CVES += CVE-2022-28733 +# 0014-net-http-Fix-OOB-write-for-split-http-headers.patch +# 0015-net-http-Error-out-on-headers-with-LF-without-CR.patch +GRUB2_IGNORE_CVES += CVE-2022-28734 +# 0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch +GRUB2_IGNORE_CVES += CVE-2022-2601 +# 0018-font-Fix-an-integer-underflow-in-blit_comb.patch +GRUB2_IGNORE_CVES += CVE-2022-3775 ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y) GRUB2_INSTALL_TARGET = YES From 6bee7c3eb2680022dc16994afe423ea819ea0c06 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 30 Aug 2023 21:57:01 +0200 Subject: [PATCH 1785/2890] .checkpackageignore: correct renamed path of openjdk 17.0.8+7 patch Commit c1038fe47c renamed the patch, but didn't update .checkpackageignore, leading to two failures: .checkpackageignore:1055: ignored file package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch is missing package/openjdk/17.0.8+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation) Rename the file in .checkpackageignore as well. Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0cf2ce193a0a..3a9a6fb58c8c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1051,7 +1051,7 @@ package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch Ups package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch Upstream package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch Upstream package/open2300/0001-fix-makefile.patch Upstream -package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream +package/openjdk/17.0.8+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream package/openldap/0001-fix_cross_strip.patch Upstream package/openldap/0002-fix-bignum.patch Upstream package/openldap/0003-disable-docs.patch Upstream From cf686670b99ae0388b27867db64516c09b2de91f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 29 Aug 2023 00:32:14 +0200 Subject: [PATCH 1786/2890] package/log4cxx: ignore CVE-2023-31038 CVE-2023-31038 affects log4cxx only if ODBC is supported. While CVE-2023-31038 has been fixed in newer versions of log4cxx, there is quite a huge gap to do a version bump, and the commit that fixes CVE-2023-31038 could not be identified. Therefore, we want to rely on the fact that our log4cxx package does not support ODBC: there is indeed no explicit dependency on our unixodbc package in log4cxx.mk. However, log4cxx automatically detects if ODBC is available and if it is, it uses it. So what we do in this commit is backport an upstream commit, which adds explicitly options to enable/disable ODBC and ESMTP support, and we use them to (1) always disable ODBC and (2) explicitly enable/disable ESMTP support. Thanks to ODBC being disabled, we're not affected by CVE-2023-31038. Of course, there is a potential regression for users who were relying on the implicit unixodbc dependency, but as we could not identify the commit fixing the CVE-2023-31038, this is the best we can do at the moment. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- .../0001-Make-ODBC-and-SMTP-opt-in-191.patch | 73 +++++++++++++++++++ package/log4cxx/log4cxx.mk | 9 ++- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch diff --git a/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch b/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch new file mode 100644 index 000000000000..a116fcc4915b --- /dev/null +++ b/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch @@ -0,0 +1,73 @@ +From 4900c27cc284ba2f671ae92e6ffb4ab391f9507a Mon Sep 17 00:00:00 2001 +From: Robert Middleton +Date: Mon, 6 Feb 2023 20:39:02 -0500 +Subject: [PATCH] Make ODBC and SMTP opt-in (#191) + +See #189 + +Upstream: afeaab6d0f0107c77dfadcbe3708f170c48d5ed9 +Signed-off-by: Thomas Petazzoni +--- + src/main/include/CMakeLists.txt | 40 ++++++++++++++++++++++++--------- + 1 file changed, 30 insertions(+), 10 deletions(-) + +diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt +index e31443fb..d6835293 100644 +--- a/src/main/include/CMakeLists.txt ++++ b/src/main/include/CMakeLists.txt +@@ -85,22 +85,42 @@ include(CheckIncludeFiles) + include(CheckIncludeFileCXX) + include(CheckLibraryExists) + +-if(WIN32) +- CHECK_INCLUDE_FILES(sqlext.h HAS_ODBC) ++option(LOG4CXX_ENABLE_ODBC "Support logging via ODBC" OFF) ++if(LOG4CXX_ENABLE_ODBC) ++ if(WIN32) ++ CHECK_INCLUDE_FILES(sqlext.h HAS_ODBC) ++ else() ++ include(FindPkgConfig) ++ ++ pkg_check_modules( odbc odbc ) ++ if(${odbc_FOUND}) ++ set(HAS_ODBC 1) ++ else() ++ set(HAS_ODBC 0) ++ endif(${odbc_FOUND}) ++ endif(WIN32) ++ ++ if(NOT ${HAS_ODBC}) ++ message(SEND_ERROR "ODBC not found but requested") ++ endif() + else() +- include(FindPkgConfig) +- +- pkg_check_modules( odbc QUIET odbc ) +- if(${odbc_FOUND}) +- set(HAS_ODBC 1) +- endif(${odbc_FOUND}) +-endif(WIN32) ++ set(HAS_ODBC 0) ++endif(LOG4CXX_ENABLE_ODBC) ++ ++option(LOG4CXX_ENABLE_ESMTP "Support logging via libesmtp" OFF) ++if(LOG4CXX_ENABLE_ESMTP) ++ CHECK_LIBRARY_EXISTS(esmtp smtp_create_session "" HAS_LIBESMTP) ++ if(NOT HAS_LIBESMTP) ++ message(SEND_ERROR "SMTP support with libesmtp not found but requested") ++ endif() ++else() ++ set(HAS_LIBESMTP 0) ++endif(LOG4CXX_ENABLE_ESMTP) + + CHECK_INCLUDE_FILE_CXX(locale HAS_STD_LOCALE) + CHECK_FUNCTION_EXISTS(mbsrtowcs HAS_MBSRTOWCS) + CHECK_FUNCTION_EXISTS(wcstombs HAS_WCSTOMBS) + CHECK_FUNCTION_EXISTS(fwide HAS_FWIDE) +-CHECK_LIBRARY_EXISTS(esmtp smtp_create_session "" HAS_LIBESMTP) + CHECK_FUNCTION_EXISTS(syslog HAS_SYSLOG) + if(UNIX) + set(CMAKE_REQUIRED_LIBRARIES "pthread") +-- +2.41.0 + diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index a5569126d423..aee682529c89 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -11,10 +11,14 @@ LOG4CXX_INSTALL_STAGING = YES LOG4CXX_LICENSE = Apache-2.0 LOG4CXX_LICENSE_FILES = LICENSE LOG4CXX_CPE_ID_VENDOR = apache +# We do not support ODBC functionality +LOG4CXX_IGNORE_CVES = CVE-2023-31038 +# Note: if you want to support odbc, make sure CVE-2023-31038 is fixed LOG4CXX_CONF_OPTS = \ -DAPR_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apr-1-config \ - -DAPR_UTIL_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apu-1-config + -DAPR_UTIL_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apu-1-config \ + -DLOG4CXX_ENABLE_ODBC=OFF LOG4CXX_DEPENDENCIES = apr apr-util @@ -23,7 +27,10 @@ LOG4CXX_DEPENDENCIES += boost endif ifeq ($(BR2_PACKAGE_LIBESMTP),y) +LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_LIBESMTP=ON LOG4CXX_DEPENDENCIES += libesmtp +else +LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_LIBESMTP=OFF endif ifeq ($(BR2_USE_WCHAR),y) From 94716fdb481247e962aa646ee1a95852d03db700 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 28 Aug 2023 23:22:19 +0200 Subject: [PATCH 1787/2890] package/heirloom-mailx: fix comment about ignore CVE-2014-7844 In commit 15972770cf34ed0b0ba330e3cc42c04f1c80c3c8 ("package/heirloom-mailx: security bump to version 12.5-5 from Debian"), we added CVE-2014-7844 in HEIRLOOM_MAILX_IGNORE_CVES, but with the wrong comment about it: it is a different patch in the Debian stack of patches that fixes it. Indeed the description of patch 0011-outof-Introduce-expandaddr-flag.patch is: ===================================================================== Subject: [PATCH 1/4] outof: Introduce expandaddr flag Document that address expansion is disabled unless the expandaddr binary option is set. This has been assigned CVE-2014-7844 for BSD mailx, but it is not a vulnerability in Heirloom mailx because this feature was documented. ===================================================================== See also https://marc.info/?l=oss-security&m=141875285203183&w=2 for details. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- package/heirloom-mailx/heirloom-mailx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk index d3b8ad437aed..bb2e1f48de3b 100644 --- a/package/heirloom-mailx/heirloom-mailx.mk +++ b/package/heirloom-mailx/heirloom-mailx.mk @@ -12,7 +12,7 @@ HEIRLOOM_MAILX_LICENSE = BSD-4-Clause, Bellcore (base64), OpenVision (imap_gssap HEIRLOOM_MAILX_LICENSE_FILES = COPYING HEIRLOOM_MAILX_CPE_ID_VENDOR = heirloom HEIRLOOM_MAILX_CPE_ID_PRODUCT = mailx -# 0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch in the Debian patches +# 0011-outof-Introduce-expandaddr-flag.patch in the Debian patches HEIRLOOM_MAILX_IGNORE_CVES += CVE-2014-7844 ifeq ($(BR2_PACKAGE_OPENSSL),y) From 829610c701ba322514facd8e24ef4b9518a00601 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 28 Aug 2023 23:22:20 +0200 Subject: [PATCH 1788/2890] package/heirloom-mailx: ignore CVE-2004-2771 The CVE-2004-2771 is already fixed by the Debian patch 0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch. The Debian patch description is: Subject: [PATCH 4/4] globname: Invoke wordexp with WRDE_NOCMD (CVE-2004-2771) See also https://marc.info/?l=oss-security&m=141875285203183&w=2 for more details. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- package/heirloom-mailx/heirloom-mailx.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk index bb2e1f48de3b..063fccf5eb1c 100644 --- a/package/heirloom-mailx/heirloom-mailx.mk +++ b/package/heirloom-mailx/heirloom-mailx.mk @@ -14,6 +14,8 @@ HEIRLOOM_MAILX_CPE_ID_VENDOR = heirloom HEIRLOOM_MAILX_CPE_ID_PRODUCT = mailx # 0011-outof-Introduce-expandaddr-flag.patch in the Debian patches HEIRLOOM_MAILX_IGNORE_CVES += CVE-2014-7844 +# 0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch in the Debian patches +HEIRLOOM_MAILX_IGNORE_CVES += CVE-2004-2771 ifeq ($(BR2_PACKAGE_OPENSSL),y) HEIRLOOM_MAILX_DEPENDENCIES += openssl From 8997c746fa53db665e00dc5e325600cdf7a0a71c Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Sat, 12 Aug 2023 21:28:29 +0200 Subject: [PATCH 1789/2890] support/scripts/pkg-stats: fix typos Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 3248e3678d7e..eea900124cfd 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -84,7 +84,7 @@ class Package: all_ignored_cves = dict() all_cpeids = dict() # This is the list of all possible checks. Add new checks to this list so - # a tool that post-processeds the json output knows the checks before + # a tool that post-processes the json output knows the checks before # iterating over the packages. status_checks = ['cve', 'developers', 'hash', 'license', 'license-files', 'patches', 'pkg-check', 'url', 'version'] @@ -259,7 +259,7 @@ class Package: if var in self.all_cpeids: self.cpeid = self.all_cpeids[var] # Set a preliminary status, it might be overridden by check_package_cpes() - self.status['cpe'] = ("warning", "not checked against CPE dictionnary") + self.status['cpe'] = ("warning", "not checked against CPE dictionary") else: self.status['cpe'] = ("error", "no verified CPE identifier") @@ -499,7 +499,7 @@ def check_package_latest_version_set_status(pkg, status, version, identifier): async def check_package_get_latest_version_by_distro(session, pkg, retry=True): - url = "https://release-monitoring.org//api/project/Buildroot/%s" % pkg.name + url = "https://release-monitoring.org/api/project/Buildroot/%s" % pkg.name try: async with session.get(url) as resp: if resp.status != 200: From 060b88ace6772ceb016a1ebe45d415f10c194c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20B=C3=B6h?= Date: Thu, 23 Feb 2023 21:18:17 +0100 Subject: [PATCH 1790/2890] package/gr-osmosdr: add support for HACKRF receivers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Böh Signed-off-by: Thomas Petazzoni --- package/gr-osmosdr/Config.in | 13 +++++++++++++ package/gr-osmosdr/gr-osmosdr.mk | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/package/gr-osmosdr/Config.in b/package/gr-osmosdr/Config.in index d83de75282c4..72d3c3f481dd 100644 --- a/package/gr-osmosdr/Config.in +++ b/package/gr-osmosdr/Config.in @@ -36,4 +36,17 @@ config BR2_PACKAGE_GR_OSMOSDR_RFSPACE help Enable RFSPACE Receivers support +config BR2_PACKAGE_GR_OSMOSDR_HACKRF + bool "Osmocom HACKRF support" + depends on !BR2_STATIC_LIBS # hackrf + depends on BR2_TOOLCHAIN_HAS_THREADS # hackrf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # hackrf + select BR2_PACKAGE_HACKRF + help + Enable Osmocom HACKRF support + +comment "hackrf support needs a toolchain w/ threads, dynamic library, gcc >= 4.9" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + endif diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 6011a6753914..8491c005d83a 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -54,4 +54,11 @@ else GR_OSMOSDR_CONF_OPTS += -DENABLE_RFSPACE=OFF endif +ifeq ($(BR2_PACKAGE_GR_OSMOSDR_HACKRF),y) +GR_OSMOSDR_CONF_OPTS += -DENABLE_HACKRF=ON +GR_OSMOSDR_DEPENDENCIES += hackrf +else +GR_OSMOSDR_CONF_OPTS += -DENABLE_HACKRF=OFF +endif + $(eval $(cmake-package)) From 6fa3a239ac21a3ea1175303bc9b1293571a43979 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Sat, 12 Aug 2023 21:28:32 +0200 Subject: [PATCH 1791/2890] support/scripts/gen-missing-cpe: remove rarely used script The intention of this script is to generate the XML that can be sent to NVD to request a new CPE identifier. As discussed on the mailing list [0] keeping up with version numbers of all registered CPE ID won't work. In addition the feed used to generated the XML files will be retired [1]. In the future an API needs to be used for fetching the data in connection with a local database. All of this works against keeping this script and porting it to the new API. As a last blow Matthew, the original author concluded [2]: > Makes sense to drop it. There never got to be enough momentum in the overall > software community to make CVE or even the new identifier really accurate. The intention is to ignore the version part of CPE IDs in the future, and only look at the version range specified on a CVE. Therefore, a tool to add new CPE ID versions isn't useful to us. It might still be useful to have a tool to create the vendor and project parts of a CPE ID. However, the current gen-missing-cpe tool doesn't support that, and the API is anyway going to be retired. So there is no reason at all to keep this around. Remove gen-missing-cpe and the cpedb module. Remove the Makefile target to call the script. Since the cpedb module is removed, the CPEDB_URL definition must be moved to the place where it is still used, in pkg-stats. [0]: https://lists.buildroot.org/pipermail/buildroot/2023-August/672620.html [1]: https://nvd.nist.gov/General/News/change-timeline [2]: https://lists.buildroot.org/pipermail/buildroot/2023-August/672651.html Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- Makefile | 9 -- support/scripts/cpedb.py | 174 -------------------------------- support/scripts/gen-missing-cpe | 65 ------------ support/scripts/pkg-stats | 2 +- 4 files changed, 1 insertion(+), 249 deletions(-) delete mode 100644 support/scripts/cpedb.py delete mode 100755 support/scripts/gen-missing-cpe diff --git a/Makefile b/Makefile index 1a1ba92c66ee..8c7327356ef4 100644 --- a/Makefile +++ b/Makefile @@ -927,14 +927,6 @@ pkg-stats: --html $(O)/pkg-stats.html \ --nvd-path $(DL_DIR)/buildroot-nvd -.PHONY: missing-cpe -missing-cpe: - $(Q)mkdir -p $(CPE_UPDATES_DIR) - $(Q)cd "$(CONFIG_DIR)" ; \ - $(TOPDIR)/support/scripts/gen-missing-cpe \ - --nvd-path $(DL_DIR)/buildroot-nvd \ - --output $(CPE_UPDATES_DIR) - else # ifeq ($(BR2_HAVE_DOT_CONFIG),y) # Some subdirectories are also package names. To avoid that "make linux" @@ -1191,7 +1183,6 @@ help: @echo ' legal-info - generate info about license compliance' @echo ' show-info - generate info about packages, as a JSON blurb' @echo ' pkg-stats - generate info about packages as JSON and HTML' - @echo ' missing-cpe - generate XML snippets for missing CPE identifiers' @echo ' printvars - dump internal variables selected with VARS=...' @echo ' show-vars - dump all internal variables as a JSON blurb; use VARS=...' @echo ' to limit the list to variables names matching that pattern' diff --git a/support/scripts/cpedb.py b/support/scripts/cpedb.py deleted file mode 100644 index f4daf561244c..000000000000 --- a/support/scripts/cpedb.py +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/env python3 - -import xml.etree.ElementTree as ET -from xml.etree.ElementTree import Element, SubElement -import gzip -import os -import requests -import time -from xml.dom import minidom - -VALID_REFS = ['VENDOR', 'VERSION', 'CHANGE_LOG', 'PRODUCT', 'PROJECT', 'ADVISORY'] - -CPEDB_URL = "https://static.nvd.nist.gov/feeds/xml/cpe/dictionary/official-cpe-dictionary_v2.3.xml.gz" - -ns = { - '': 'http://cpe.mitre.org/dictionary/2.0', - 'cpe-23': 'http://scap.nist.gov/schema/cpe-extension/2.3', - 'xml': 'http://www.w3.org/XML/1998/namespace' -} - - -class CPE: - def __init__(self, cpe_str, titles, refs): - self.cpe_str = cpe_str - self.titles = titles - self.references = refs - self.cpe_cur_ver = "".join(self.cpe_str.split(":")[5:6]) - - def update_xml_dict(self): - ET.register_namespace('', 'http://cpe.mitre.org/dictionary/2.0') - cpes = Element('cpe-list') - cpes.set('xmlns:cpe-23', "http://scap.nist.gov/schema/cpe-extension/2.3") - cpes.set('xmlns:ns6', "http://scap.nist.gov/schema/scap-core/0.1") - cpes.set('xmlns:scap-core', "http://scap.nist.gov/schema/scap-core/0.3") - cpes.set('xmlns:config', "http://scap.nist.gov/schema/configuration/0.1") - cpes.set('xmlns:xsi', "http://www.w3.org/2001/XMLSchema-instance") - cpes.set('xmlns:meta', "http://scap.nist.gov/schema/cpe-dictionary-metadata/0.2") - cpes.set('xsi:schemaLocation', " ".join(["http://scap.nist.gov/schema/cpe-extension/2.3", - "https://scap.nist.gov/schema/cpe/2.3/cpe-dictionary-extension_2.3.xsd", - "http://cpe.mitre.org/dictionary/2.0", - "https://scap.nist.gov/schema/cpe/2.3/cpe-dictionary_2.3.xsd", - "http://scap.nist.gov/schema/cpe-dictionary-metadata/0.2", - "https://scap.nist.gov/schema/cpe/2.1/cpe-dictionary-metadata_0.2.xsd", - "http://scap.nist.gov/schema/scap-core/0.3", - "https://scap.nist.gov/schema/nvd/scap-core_0.3.xsd", - "http://scap.nist.gov/schema/configuration/0.1", - "https://scap.nist.gov/schema/nvd/configuration_0.1.xsd", - "http://scap.nist.gov/schema/scap-core/0.1", - "https://scap.nist.gov/schema/nvd/scap-core_0.1.xsd"])) - item = SubElement(cpes, 'cpe-item') - cpe_short_name = CPE.short_name(self.cpe_str) - cpe_new_ver = CPE.version_update(self.cpe_str) - - item.set('name', 'cpe:/' + cpe_short_name) - self.titles[0].text.replace(self.cpe_cur_ver, cpe_new_ver) - for title in self.titles: - item.append(title) - if self.references: - item.append(self.references) - cpe23item = SubElement(item, 'cpe-23:cpe23-item') - cpe23item.set('name', self.cpe_str) - - # Generate the XML as a string - xmlstr = ET.tostring(cpes) - - # And use minidom to pretty print the XML - return minidom.parseString(xmlstr).toprettyxml(encoding="utf-8").decode("utf-8") - - @staticmethod - def version(cpe): - return cpe.split(":")[5] - - @staticmethod - def product(cpe): - return cpe.split(":")[4] - - @staticmethod - def short_name(cpe): - return ":".join(cpe.split(":")[2:6]) - - @staticmethod - def version_update(cpe): - return ":".join(cpe.split(":")[5:6]) - - @staticmethod - def no_version(cpe): - return ":".join(cpe.split(":")[:5]) - - -class CPEDB: - def __init__(self, nvd_path): - self.all_cpes = dict() - self.all_cpes_no_version = dict() - self.nvd_path = nvd_path - - def get_xml_dict(self): - print("CPE: Setting up NIST dictionary") - if not os.path.exists(os.path.join(self.nvd_path, "cpe")): - os.makedirs(os.path.join(self.nvd_path, "cpe")) - - cpe_dict_local = os.path.join(self.nvd_path, "cpe", os.path.basename(CPEDB_URL)) - if not os.path.exists(cpe_dict_local) or os.stat(cpe_dict_local).st_mtime < time.time() - 86400: - print("CPE: Fetching xml manifest from [" + CPEDB_URL + "]") - cpe_dict = requests.get(CPEDB_URL) - open(cpe_dict_local, "wb").write(cpe_dict.content) - - print("CPE: Unzipping xml manifest...") - nist_cpe_file = gzip.GzipFile(fileobj=open(cpe_dict_local, 'rb')) - print("CPE: Converting xml manifest to dict...") - tree = ET.parse(nist_cpe_file) - all_cpedb = tree.getroot() - self.parse_dict(all_cpedb) - - def parse_dict(self, all_cpedb): - # Cycle through the dict and build two dict to be used for custom - # lookups of partial and complete CPE objects - # The objects are then used to create new proposed XML updates if - # if is determined one is required - # Out of the different language titles, select English - for cpe in all_cpedb.findall(".//{http://cpe.mitre.org/dictionary/2.0}cpe-item"): - cpe_titles = [] - for title in cpe.findall('.//{http://cpe.mitre.org/dictionary/2.0}title[@xml:lang="en-US"]', ns): - title.tail = None - cpe_titles.append(title) - - # Some older CPE don't include references, if they do, make - # sure we handle the case of one ref needing to be packed - # in a list - cpe_ref = cpe.find(".//{http://cpe.mitre.org/dictionary/2.0}references") - if cpe_ref: - for ref in cpe_ref.findall(".//{http://cpe.mitre.org/dictionary/2.0}reference"): - ref.tail = None - ref.text = ref.text.upper() - if ref.text not in VALID_REFS: - ref.text = ref.text + "-- UPDATE this entry, here are some examples and just one word should be used -- " + ' '.join(VALID_REFS) # noqa E501 - cpe_ref.tail = None - cpe_ref.text = None - - cpe_str = cpe.find(".//{http://scap.nist.gov/schema/cpe-extension/2.3}cpe23-item").get('name') - item = CPE(cpe_str, cpe_titles, cpe_ref) - cpe_str_no_version = CPE.no_version(cpe_str) - # This dict must have a unique key for every CPE version - # which allows matching to the specific obj data of that - # NIST dict entry - self.all_cpes.update({cpe_str: item}) - # This dict has one entry for every CPE (w/o version) to allow - # partial match (no valid version) check (the obj is saved and - # used as seed for suggested xml updates. By updating the same - # non-version'd entry, it assumes the last update here is the - # latest version in the NIST dict) - self.all_cpes_no_version.update({cpe_str_no_version: item}) - - def find_partial(self, cpe_str): - cpe_str_no_version = CPE.no_version(cpe_str) - if cpe_str_no_version in self.all_cpes_no_version: - return cpe_str_no_version - - def find_partial_obj(self, cpe_str): - cpe_str_no_version = CPE.no_version(cpe_str) - if cpe_str_no_version in self.all_cpes_no_version: - return self.all_cpes_no_version[cpe_str_no_version] - - def find_partial_latest_version(self, cpe_str_partial): - cpe_obj = self.find_partial_obj(cpe_str_partial) - return cpe_obj.cpe_cur_ver - - def find(self, cpe_str): - if self.find_partial(cpe_str): - if cpe_str in self.all_cpes: - return cpe_str - - def gen_update_xml(self, cpe_str): - cpe = self.find_partial_obj(cpe_str) - return cpe.update_xml_dict() diff --git a/support/scripts/gen-missing-cpe b/support/scripts/gen-missing-cpe deleted file mode 100755 index 0b222f2659a1..000000000000 --- a/support/scripts/gen-missing-cpe +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env python3 - -import argparse -import sys -import json -import subprocess -import os -from cpedb import CPEDB, CPE - - -def gen_update_xml_reports(cpeids, cpedb, output): - cpe_need_update = [] - - for cpe in cpeids: - result = cpedb.find(cpe) - if not result: - result = cpedb.find_partial(CPE.no_version(cpe)) - if result: - cpe_need_update.append(cpe) - else: - print("WARNING: no match found for '%s'" % cpe) - - for cpe in cpe_need_update: - xml = cpedb.gen_update_xml(cpe) - fname = CPE.product(cpe) + '-' + CPE.version(cpe) + '.xml' - print("Generating %s" % fname) - with open(os.path.join(output, fname), 'w+') as fp: - fp.write(xml) - - print("Generated %d update files out of %d CPEs" % (len(cpe_need_update), len(cpeids))) - - -def get_cpe_ids(): - print("Getting list of CPE for enabled packages") - cmd = ["make", "--no-print-directory", "show-info"] - js = json.loads(subprocess.check_output(cmd).decode("utf-8")) - return set([v["cpe-id"] for k, v in js.items() if "cpe-id" in v]) - - -def resolvepath(path): - return os.path.abspath(os.path.expanduser(path)) - - -def parse_args(): - parser = argparse.ArgumentParser() - parser.add_argument('--output', dest='output', - help='Path to the output CPE update files', type=resolvepath, required=True) - parser.add_argument('--nvd-path', dest='nvd_path', - help='Path to the local NVD database', type=resolvepath, required=True) - return parser.parse_args() - - -def __main__(): - args = parse_args() - if not os.path.isdir(args.output): - print("ERROR: output directory %s does not exist" % args.output) - sys.exit(1) - cpedb = CPEDB(args.nvd_path) - cpedb.get_xml_dict() - cpeids = get_cpe_ids() - gen_update_xml_reports(cpeids, cpedb, args.output) - - -if __name__ == "__main__": - __main__() diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index eea900124cfd..28f5a0789c48 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -37,10 +37,10 @@ brpath = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")) sys.path.append(os.path.join(brpath, "utils")) from getdeveloperlib import parse_developers # noqa: E402 -from cpedb import CPEDB_URL # noqa: E402 INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)") URL_RE = re.compile(r"\s*https?://\S*\s*$") +CPEDB_URL = "https://static.nvd.nist.gov/feeds/xml/cpe/dictionary/official-cpe-dictionary_v2.3.xml.gz" RM_API_STATUS_ERROR = 1 RM_API_STATUS_FOUND_BY_DISTRO = 2 From 3c8d890c1946308f5396aa6428da5274b25c3a5f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 15:35:33 +0100 Subject: [PATCH 1792/2890] toolchain/helpers.mk: strengthen uClibc locale check Currently, when verifying the configuration of a uClibc toolchain for the presence of locale support, we check __UCLIBC_HAS_LOCALE__. It turns out that we in fact also expect __UCLIBC_HAS_XLOCALE__ to be defined, as without it locale_t is not defined, causing build failure in some packages, such as libcpprestsdk: In file included from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/json.h:18, from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/pch/stdafx.h:88, from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/http/client/http_client_msg.cpp:13: /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/asyncrt_utils.h:317:13: error: 'locale_t' does not name a type 317 | typedef locale_t xplat_locale; | ^~~~~~~~ As essentially our requirement for uClibc in external toolchains is "it should match the uClibc configuration used by Buildroot for internal toolchains", it makes sense to verify __UCLIBC_HAS_XLOCALE__. Note that of course checking __UCLIBC_HAS_XLOCALE__ is sufficient, as it cannot be enabled if __UCLIBC_HAS_LOCALE isn't. This addresses an issue with the Synopsys ARC external toolchain, which is built with __UCLIBC_HAS_LOCALE__, but without __UCLIBC_HAS_XLOCALE__ causing a build failure with some packages (such as libcpprestsdk). Therefore, this patch also changes how the Synospys ARC external toolchain is exposed in Buildroot: it no longer advertise locale support. Fixes: http://autobuild.buildroot.org/results/e6778e60cc1ea455f5b4511d5824f04d8040f67b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- toolchain/helpers.mk | 2 +- .../toolchain-external-synopsys-arc/Config.in | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 27a5470ca39f..e5c838c0afcf 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -307,7 +307,7 @@ check_uclibc = \ $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,,$${UCLIBC_CONFIG_FILE},Large file support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_NATIVE_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\ - $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ + $(call check_uclibc_feature,__UCLIBC_HAS_XLOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support) ;\ $(call check_uclibc_feature,__PTHREADS_DEBUG_SUPPORT__,BR2_TOOLCHAIN_HAS_THREADS_DEBUG,$${UCLIBC_CONFIG_FILE},Thread debugging support) ;\ diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index 985e7b1710ce..292e652fb012 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -5,7 +5,6 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP - select BR2_ENABLE_LOCALE select BR2_USE_WCHAR select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_NPTL From 16c3b4b92bb7b2fef6ad314a5fb9b7203b3d80b3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 30 Aug 2023 22:42:13 +0200 Subject: [PATCH 1793/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index dcfc31ac8b4a..de08f755f665 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.4.12" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.4.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index fb2bfebd61f7..066edd9a7d2a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 cca91be956fe081f8f6da72034cded96fe35a50be4bfb7e103e354aa2159a674 linux-6.4.12.tar.xz -sha256 c9ea14231ca4ca6e3882a9339a8c3c414e4c91519d3e50af6822f47e99057a0f linux-6.1.49.tar.xz +sha256 5e5511b50bc9fd358bb5d7746fab3c5ea396d42c6bd7a54b2555ede0de5ac8e5 linux-6.4.13.tar.xz +sha256 b27ac1443eea563bc546ee1f67d9802bc8d6c0f6f18707407fba01f9f78c488c linux-6.1.50.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 0f2eca845183fd76f53b0c867c97f12b9ace2d7e8ee2cdeec7eb2897651b80de linux-5.15.128.tar.xz -sha256 c40d11ee56e50a132429badbd1ba1c53e42b3312590b2a39be34c241d1b0b5b9 linux-5.10.192.tar.xz -sha256 51608da961b5e34d6a9452a7b302699e109633f769a4253c74b1048abba8d9c7 linux-5.4.254.tar.xz +sha256 750ec97ce4f1473e392b367a55eca4ea7a6b1e9e65ca2fb3bbca2eaa64802b66 linux-5.15.129.tar.xz +sha256 bd4036da47612d0d8c5f8c43e7700e8c996ae3b51084aa8fc6530c9d00f1ded0 linux-5.10.193.tar.xz +sha256 34d5ed902f47d90f27b9d5d6b8db0d3fa660834111f9452e166d920968a4a061 linux-5.4.255.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 349728d3d143fcee484b34e34e536fe48dfb8bb71263f81a66fd572cc9162137 linux-4.19.292.tar.xz -sha256 6f0a9010b2451e7ab5b28e38c81b3c5149277ab5fe0e08059e60eb602b804ebc linux-4.14.323.tar.xz +sha256 cd95a8cb8fefb749e32359b8a915c036abc37e80746285da6535cb5a0776b3f0 linux-4.19.293.tar.xz +sha256 24e8b21647a0f270291ea56d9123d59c511fa10efc23f5d28b5cb51611e1d9f0 linux-4.14.324.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index deb3067b609b..0c0b365473c2 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -400,13 +400,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.323" if BR2_KERNEL_HEADERS_4_14 - default "4.19.292" if BR2_KERNEL_HEADERS_4_19 - default "5.4.254" if BR2_KERNEL_HEADERS_5_4 - default "5.10.192" if BR2_KERNEL_HEADERS_5_10 - default "5.15.128" if BR2_KERNEL_HEADERS_5_15 - default "6.1.49" if BR2_KERNEL_HEADERS_6_1 - default "6.4.12" if BR2_KERNEL_HEADERS_6_4 + default "4.14.324" if BR2_KERNEL_HEADERS_4_14 + default "4.19.293" if BR2_KERNEL_HEADERS_4_19 + default "5.4.255" if BR2_KERNEL_HEADERS_5_4 + default "5.10.193" if BR2_KERNEL_HEADERS_5_10 + default "5.15.129" if BR2_KERNEL_HEADERS_5_15 + default "6.1.50" if BR2_KERNEL_HEADERS_6_1 + default "6.4.13" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 93556f95a3a8ce402eb29e8f5c73f0c02a708f54 Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Wed, 30 Aug 2023 01:07:34 +0300 Subject: [PATCH 1794/2890] package/sdbus-cpp: bump to version 1.3.0 Changelog: https://github.com/Kistler-Group/sdbus-cpp/releases/tag/v1.3.0 A trailing whitespace was removed in the COPYING-LGPL-Exception file, so the hash differs. https://github.com/Kistler-Group/sdbus-cpp/commit/dcd9d46b9c5e5011dc7170e9d081bcf80096fd15 Signed-off-by: Sergey Bobrenok Signed-off-by: Thomas Petazzoni --- package/sdbus-cpp/sdbus-cpp.hash | 4 ++-- package/sdbus-cpp/sdbus-cpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index 169fad280761..f5fc8d686884 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 7f7231904abb6a996b8c18ddc5fb50078ef5dff5191649abf9f127aff41d24e9 v1.2.0.tar.gz +sha256 d44f59abdd64d8f1ca3af7db58bc6518cb081fc9ff16285c3d75a68f5c073d10 v1.3.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING -sha256 be43debbf06a38325616054a39e44ed5afde4ed21b99de197488a4a306d47e39 COPYING-LGPL-Exception +sha256 a1c9e75e25d8f2ce18017c88978edab2f0dbc7814ad0697d4ff2e5e59959f657 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index 0e8d74cfcd4d..52e5c50cd2a5 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDBUS_CPP_VERSION = 1.2.0 +SDBUS_CPP_VERSION = 1.3.0 SDBUS_CPP_SOURCE = v$(SDBUS_CPP_VERSION).tar.gz SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES From 06b2e496a0c47b1fef55b0daccac1e62b41d7aac Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 29 Aug 2023 15:22:30 -0700 Subject: [PATCH 1795/2890] package/go: bump to version 1.21.0 Go 1.21.0 is a major release of Go. https://go.dev/doc/devel/release#go1.21.0 Set GOTOOLCHAIN=local to disable the new toolchain download feature. This feature, introduced in Go 1.21.x, will automatically download pre-built compiler binaries from Google for the toolchain version specified in go.mod. We do not want this in Buildroot as we build from source instead: set GOTOOLCHAIN=local to disable the feature and use the locally built toolchain. https://go.dev/doc/toolchain Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/go/go.hash | 2 +- package/go/go.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 2298534d910e..2289442a72b7 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597 go1.20.7.src.tar.gz +sha256 818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a go1.21.0.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index fc1d9ed6818e..04aa6122569a 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.20.7 +GO_VERSION = 1.21.0 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -28,6 +28,7 @@ HOST_GO_COMMON_ENV = \ GOCACHE="$(HOST_GO_TARGET_CACHE)" \ GOMODCACHE="$(HOST_GO_GOPATH)/pkg/mod" \ GOPROXY=off \ + GOTOOLCHAIN=local \ PATH=$(BR_PATH) \ GOBIN= \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) From 16da1e0b047688831e6653b01194807af0a9df41 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 30 Aug 2023 22:45:09 +0200 Subject: [PATCH 1796/2890] package/libdrm: bump version to 2.4.116 Release notes: https://lists.x.org/archives/xorg-announce/2023-August/003416.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libdrm/libdrm.hash | 6 +++--- package/libdrm/libdrm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index 87cc17061702..32b39d6a1b8f 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-February/003323.html -sha256 554cfbfe0542bddb391b4e3e05bfbbfc3e282b955bd56218d21c0616481f65eb libdrm-2.4.115.tar.xz -sha512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd libdrm-2.4.115.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-August/003416.html +sha256 46c53f40735ea3d26d614297f155f6131a510624a24274f654f6469ca905339a libdrm-2.4.116.tar.xz +sha512 1287d1896deeb8cfb4532c6750eb43493dcefbfaaa598a73bbb682aa749594eaad3ed1fa2fe73d06280350f365a92a0c20cad8be76f3da2ed59b04aa008de911 libdrm-2.4.116.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 52ac13b7d02a..70f449037d07 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.115 +LIBDRM_VERSION = 2.4.116 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From cd8aa311be7360cbe8afbd974cda8bdc018e4448 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 30 Aug 2023 22:47:59 +0200 Subject: [PATCH 1797/2890] package/transmission: bump version to 4.0.4 Release notes: https://github.com/transmission/transmission/releases/tag/4.0.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/transmission/transmission.hash | 2 +- package/transmission/transmission.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/transmission/transmission.hash b/package/transmission/transmission.hash index e6775c47e70d..74b3a654b555 100644 --- a/package/transmission/transmission.hash +++ b/package/transmission/transmission.hash @@ -1,4 +1,4 @@ # From https://transmissionbt.com/download -sha256 b6b01fd58e42bb14f7aba0253db932ced050fcd2bba5d9f8469d77ddd8ad545a transmission-4.0.3.tar.xz +sha256 15f7b4318fdfbffb19aa8d9a6b0fd89348e6ef1e86baa21a0806ffd1893bd5a6 transmission-4.0.4.tar.xz # Locally calculated sha256 f56732960a61ecf3b9637404eef1a39221d2006336a98792b7b65a79f155449c COPYING diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index 26deeefa342c..efb46c0feb1a 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRANSMISSION_VERSION = 4.0.3 +TRANSMISSION_VERSION = 4.0.4 TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz TRANSMISSION_SITE = https://github.com/transmission/transmission/releases/download/$(TRANSMISSION_VERSION) TRANSMISSION_DEPENDENCIES = \ From 91aac180e0d973585ab6b85bc103457ea69558c6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 30 Aug 2023 22:54:02 +0200 Subject: [PATCH 1798/2890] package/intel-mediadriver: bump version to 23.3.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 39aa23a9737a..012317db3dbf 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ce929da08ea917e4bb133ae67b5de42dce9c459b06a2670358a6ada00c48db58 intel-media-23.3.1.tar.gz +sha256 6a0fc8513fb60e2e2fc2178a8fb0b25cb5dbacf52a645af9a9297fc5f43822ab intel-media-23.3.2.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 353f06156e77..44edba600774 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 23.3.1 +INTEL_MEDIADRIVER_VERSION = 23.3.2 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From 04811ff1489ac3b72cb3aca3ad806998c9863ca2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 30 Aug 2023 22:54:03 +0200 Subject: [PATCH 1799/2890] package/onevpl-intel-gpu: bump version to 23.3.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/onevpl-intel-gpu/onevpl-intel-gpu.hash | 2 +- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash index fa8e96959b9a..70af121d2898 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 51052b2cb0c1d0e628aa1e04b19ffdcd5098993c6c368045a79d87d21ca4ebe5 onevpl-intel-gpu-23.3.1.tar.gz +sha256 311658f18b45645ffa9337a6307d59a1025b6f77f8fe122c332f536a14e1ef44 onevpl-intel-gpu-23.3.2.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index 33b32b5d94a9..cbc612f4f340 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_INTEL_GPU_VERSION = 23.3.1 +ONEVPL_INTEL_GPU_VERSION = 23.3.2 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) ONEVPL_INTEL_GPU_LICENSE = MIT ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE From d87d54d23d258945ecc8fd3fc753910c1dd409e6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 30 Aug 2023 22:57:13 +0200 Subject: [PATCH 1800/2890] package/tor: bump version to 0.4.8.5 Release notes: https://forum.torproject.org/t/stable-release-0-4-8-5/8996 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index d87e2742d354..b6b183c2d1a4 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.8.4.tar.gz.sha256sum -sha256 09c1ce74a25fc3b48c81ff146cbd0dd538cbbb8fe4e2964fc2fb2b192f6a1d2b tor-0.4.8.4.tar.gz +# From https://dist.torproject.org/tor-0.4.8.5.tar.gz.sha256sum +sha256 6957cfd14a29eee7555c52f8387a46f2ce2f5fe7dadf93547f1bc74b1657e119 tor-0.4.8.5.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index b3360d3c3b04..e86fec29f4ca 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.8.4 +TOR_VERSION = 0.4.8.5 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 386b72ca224fba927a0bd768c2f772ee1b892ed1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 31 Aug 2023 16:44:21 +0200 Subject: [PATCH 1801/2890] Update for 2023.05.2 Signed-off-by: Peter Korsgaard (cherry picked from commit 3923a4fac8c9e501b5fd94eea98bd7e842b31876) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 32 ++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 3ee83f64c624..e623d8b4395c 100644 --- a/CHANGES +++ b/CHANGES @@ -80,6 +80,38 @@ Removed packages: libasplib, ocf-linux, tovid +2023.05.2, released August 31th, 2023 + + Important / security related fixes. + + Toolchains: Correctly mark Bootlin external toolchains as + having OpenMP support. + + Arch: Mark Alderlake x86 variants as no AVX512 support. + + Utils: Ensure utils/docker-run correctly supports git + worktrees. + + Defconfigs: Beaglebone: U-Boot needs OpenSSL. Beaglebone qt5: + Enable support for green wireless variant. + + Updated/fixed packages: arm-trusted-firmware, bind, cairo, + cmocka, containerd, crudini, cryptodev-linux, dmidecode, + ffmpeg, firmware-imx, gcc, gdb, ghostscript, gkrellm, + gnuradio, go, igh-ethercat, iperf3, kodi, libcurl, libopenssl, + libssh, libubootenv, libuhttpd, linux-tools, mali-driver, + nfs-utils, ntp, openssh, php, pipewire, python-pysmb, + python-iniparse, python-iptables, rtl8189es, rtl8189fs, + sam-ba, samba4, seatd, shadow, speex, + sunxi-mali-utgard-driver, supertuxkart, sysdig, systemd, tor, + tpm2-tss, transmission, uboot, unzip, webkitgtk, + wireless-regdb, wolfssl, wpebackend-fdo, wpewebkit, xenomai, + yaml-cpp, yavta + + Issues resolved (http://bugs.uclibc.org): + + #15634: fluidsynths refers to missing libgomp.so.1 + 2023.05.1, released July 17th, 2023 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 12da353f2e1c..75aae858b7d4 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.05.1' +RELEASE='2023.05.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From 1f137a03ea7698bc7cfc463494d96319fe2ff52d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 31 Aug 2023 20:28:40 +0200 Subject: [PATCH 1802/2890] docs/website: Update for 2023.05.2 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index a4cce974de2a..eeb5a142f9fb 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

                      buildroot-2023.02.3.tar.xz

                      -

                      Latest stable release: 2023.05.1

                      +

                      Latest stable release: 2023.05.2

                      - +
                      - +
                      -

                      buildroot-2023.05.1.tar.gz

                      -

                      PGP signature

                      +

                      buildroot-2023.05.2.tar.gz

                      +

                      PGP signature

                      - +
                      - +
                      -

                      buildroot-2023.05.1.tar.xz

                      -

                      PGP signature

                      +

                      buildroot-2023.05.2.tar.xz

                      +

                      PGP signature

                      diff --git a/docs/website/news.html b/docs/website/news.html index aea677957909..8465d932c306 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

                      News

                        +
                      • +
                        +
                        +
                        +

                        2023.05.2 released

                        +

                        31 August 2023

                        +
                        +
                        +

                        The 2023.05.2 bugfix release is out, fixing a number of important / + security related issues discovered since the 2023.05.1 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2023.05.2 release.

                        +
                        +
                        +
                        • +
                      • From d283473ae40498432c42c1bcf1ad815749aa4c8c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 31 Aug 2023 20:49:03 +0200 Subject: [PATCH 1803/2890] Update for 2023.02.4 Signed-off-by: Peter Korsgaard (cherry picked from commit 3b8e5b19ad9117c0ebcace9cde2e075108462c98) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/CHANGES b/CHANGES index e623d8b4395c..b17193a12c78 100644 --- a/CHANGES +++ b/CHANGES @@ -217,6 +217,35 @@ #15376: Libiconv config #15461: QtVirtualKeyboard segfaults +2023.02.4, released August 31th, 2023 + + Important / security related fixes. + + Toolchains: Correctly mark Bootlin external toolchains as + having OpenMP support. + + Arch: Mark Alderlake x86 variants as having no AVX512 support. + + Utils: Ensure utils/docker-run correctly supports git + worktrees. + + Defconfigs: Beaglebone qt5: Enable support for green wireless + variant. + + Updated/fixed packages: arm-trusted-firmware, bind, cairo, + cmocka, containerd, crudini, dmidecode, ffmpeg, freescale-imx, + gcc, gdb, ghostscript, gkrellm, gnuradio, go, heimdall, + iperf3, libcurl, libmodsecurity, libopenssl, libssh, + libubootenv, libuhttpd, linux-tools, ntp, openssh, php, + pipewire, python-iniparse, python-iptables, python-pysmb, + rtl8189fs, sam-ba, samba4, seatd, speex, supertuxkart, sysdig, + tor, tpm2-tss, uboot, unzip, webkitgtk, wireless-regdb, + wolfssl, wpebackend-fdo wpewebkit, xenomai, yaml-cpp, yavta + + Issues resolved (http://bugs.uclibc.org): + + #15634: fluidsynths refers to missing libgomp.so.1 + 2023.02.3, released July 17th, 2023 Important / security related fixes. From fbcc1bf533e721c7393315ca68e8faa3af9d3194 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 31 Aug 2023 21:30:47 +0200 Subject: [PATCH 1804/2890] docs/website: Update for 2023.02.4 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index eeb5a142f9fb..725cf62b2c7a 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
                        Download
                        -

                        Latest long term support release: 2023.02.3

                        +

                        Latest long term support release: 2023.02.4

                        - +
                        - +
                        -

                        buildroot-2023.02.3.tar.gz

                        -

                        PGP signature

                        +

                        buildroot-2023.02.4.tar.gz

                        +

                        PGP signature

                        - +
                        - +
                        -

                        buildroot-2023.02.3.tar.xz

                        -

                        PGP signature

                        +

                        buildroot-2023.02.4.tar.xz

                        +

                        PGP signature

                        diff --git a/docs/website/news.html b/docs/website/news.html index 8465d932c306..aeca36bc6875 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

                        News

                          +
                        • +
                          +
                          +
                          +

                          2023.02.4 released

                          +

                          31 August 2023

                          +
                          +
                          +

                          The 2023.02.4 bugfix release is out, fixing a number of important / + security related issues discovered since the 2023.02.3 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2023.02.4 release.

                          +
                          +
                          +
                          • +
                        • From bf7926230c7d47dd809e59646a6ff4f7fe35b833 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 2 Sep 2023 00:06:58 +0200 Subject: [PATCH 1805/2890] package/libgpgme: always use gpgrt-config from buildroot staging gpgme updated its gpg-error.m4 macro files to detect gpgrt-config at several occasions. Those changes are included since buildroot commit 13f3b8e124 "package/libgpgme: bump to version 1.20.0". gpgrt-config path needs to be forced in _CONF_ENV to make sure it will work in all host environments. See the log entry of commit d7f2d8403e "package/gnupg2: fix build failure when host provides an old gpgrt-config" [2] for a complete explanation. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=history;f=m4/gpg-error.m4;h=gpgme-1.20.0 [2] https://git.buildroot.org/buildroot/commit/?id=d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libgpgme/libgpgme.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 21a0b30d3bff..eb63b7c01314 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -33,6 +33,10 @@ LIBGPGME_CONF_OPTS = \ --disable-cpp-test \ --enable-languages=$(subst $(space),$(comma),$(LIBGPGME_LANGUAGE_BINDINGS)) +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +LIBGPGME_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config + # Handle argp-standalone or it errors out during build ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) # musl libc does not define error_t in errno.h, but argp.h does. From 3ef29343aeebefa019d2fabc6e0f83d7639b9b01 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 1 Sep 2023 22:50:14 +0200 Subject: [PATCH 1806/2890] package/less: bump to version 643 For change log, see: https://www.greenwoodsoftware.com/less/news.643.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/less/less.hash | 4 ++-- package/less/less.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/less/less.hash b/package/less/less.hash index 8018c9fab1b5..c44e24677367 100644 --- a/package/less/less.hash +++ b/package/less/less.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # using DSA key F153A7C833235259 -# https://www.greenwoodsoftware.com/less/less-633.sig -sha256 2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f less-633.tar.gz +# https://www.greenwoodsoftware.com/less/less-643.sig +sha256 2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8 less-643.tar.gz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/less/less.mk b/package/less/less.mk index f7211ef1122e..7431d80cc4e6 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -4,7 +4,7 @@ # ################################################################################ -LESS_VERSION = 633 +LESS_VERSION = 643 LESS_SITE = http://www.greenwoodsoftware.com/less LESS_LICENSE = GPL-3.0+ LESS_LICENSE_FILES = COPYING From 5b3388f1e2a23f9cfa922128304e6db803e1093c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 1 Sep 2023 22:55:55 +0200 Subject: [PATCH 1807/2890] package/ed: bump to version 1.19 See release announce: https://lists.gnu.org/archive/html/bug-ed/2023-01/msg00000.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ed/ed.hash | 4 ++-- package/ed/ed.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ed/ed.hash b/package/ed/ed.hash index 36f9b9c1e4c2..007f645f513b 100644 --- a/package/ed/ed.hash +++ b/package/ed/ed.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/bug-ed/2022-02/msg00000.html -sha256 aca8efad9800c587724a20b97aa8fc47e6b5a47df81606feaba831b074462b4f ed-1.18.tar.lz +# From https://lists.gnu.org/archive/html/bug-ed/2023-01/msg00000.html +sha256 ce2f2e5c424790aa96d09dacb93d9bbfdc0b7eb6249c9cb7538452e8ec77cd48 ed-1.19.tar.lz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ed/ed.mk b/package/ed/ed.mk index 645cfb769681..a90d1f005e99 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -4,7 +4,7 @@ # ################################################################################ -ED_VERSION = 1.18 +ED_VERSION = 1.19 ED_SITE = $(BR2_GNU_MIRROR)/ed ED_SOURCE = ed-$(ED_VERSION).tar.lz ED_LICENSE = GPL-2.0+ From d0e30b87f9a278218950000882c607cf39a79e45 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 2 Sep 2023 09:09:01 +0200 Subject: [PATCH 1808/2890] package/freetype: bump to version 2.13.2 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/freetype/freetype.hash | 6 +++--- package/freetype/freetype.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index ea03526c99a1..e7331d5ba053 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.13.1/ -sha1 af9b6b754320a0526179f166e3f8cffce78526ca freetype-2.13.1.tar.xz -sha256 ea67e3b019b1104d1667aa274f5dc307d8cbd606b399bc32df308a77f1a564bf freetype-2.13.1.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.13.2/ +sha1 2d8d5917a1983ebd04921f2993a88858d6f72dec freetype-2.13.2.tar.xz +sha256 12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d freetype-2.13.2.tar.xz # Locally calculated sha256 2e3bbb7d7c5c396368dd0853a790ec29ce5b8647163dde42a0493fb0d6556b2b LICENSE.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index c6bc0673f601..1f4bcaf341bb 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.13.1 +FREETYPE_VERSION = 2.13.2 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES From e8e66020f3fcac943595034ce7ec6fc6f1bc154b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 2 Sep 2023 09:26:09 +0200 Subject: [PATCH 1809/2890] package/libgpiod: bump to version 1.6.4 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- ...build-add-a-configure-switch-for-building-examples.patch | 6 +++--- package/libgpiod/libgpiod.hash | 2 +- package/libgpiod/libgpiod.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch b/package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch index a21c76700686..f1a853a6f863 100644 --- a/package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch +++ b/package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch @@ -73,7 +73,7 @@ diff --git a/configure.ac b/configure.ac index 57c99a8..90a6324 100644 --- a/configure.ac +++ b/configure.ac -@@ -155,6 +155,12 @@ then +@@ -164,6 +164,12 @@ then fi fi @@ -84,8 +84,8 @@ index 57c99a8..90a6324 100644 +AM_CONDITIONAL([WITH_EXAMPLES], [test "x$with_examples" = xtrue]) + AC_ARG_ENABLE([bindings-cxx], - [AS_HELP_STRING([--enable-bindings-cxx],[enable C++ bindings [default=no]])], - [if test "x$enableval" = xyes; then with_bindings_cxx=true; fi], + [AC_HELP_STRING([--enable-bindings-cxx], + [enable C++ bindings [default=no]])], -- cgit 1.2.3-1.el7 diff --git a/package/libgpiod/libgpiod.hash b/package/libgpiod/libgpiod.hash index f0803cab3695..6647b77c5a3b 100644 --- a/package/libgpiod/libgpiod.hash +++ b/package/libgpiod/libgpiod.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 841be9d788f00bab08ef22c4be5c39866f0e46cb100a3ae49ed816ac9c5dddc7 libgpiod-1.6.3.tar.xz +sha256 7b146e12f28fbca3df7557f176eb778c5ccf952ca464698dba8a61b2e1e3f9b5 libgpiod-1.6.4.tar.xz # Hash for license file sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING diff --git a/package/libgpiod/libgpiod.mk b/package/libgpiod/libgpiod.mk index 35d003fa3328..e7ff1556181c 100644 --- a/package/libgpiod/libgpiod.mk +++ b/package/libgpiod/libgpiod.mk @@ -6,7 +6,7 @@ # Be careful when bumping versions. # Dependency on kernel header versions may change. -LIBGPIOD_VERSION = 1.6.3 +LIBGPIOD_VERSION = 1.6.4 LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD_LICENSE = LGPL-2.1+ From a0617d73c39a42a6644e99f7e0a2f766ade1a3ce Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 1 Sep 2023 21:14:47 +0200 Subject: [PATCH 1810/2890] package/mc: bump to version 4.8.30 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/mc/mc.hash | 4 ++-- package/mc/mc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mc/mc.hash b/package/mc/mc.hash index 5edfc79113c3..93462afa60e8 100644 --- a/package/mc/mc.hash +++ b/package/mc/mc.hash @@ -1,4 +1,4 @@ -# Hash from http://ftp.midnight-commander.org/mc-4.8.29.sha256 -sha256 01d8a3b94f58180cca5bf17257b5078d1fd6fd27a9b5c0e970ec767549540ad4 mc-4.8.29.tar.xz +# Hash from http://ftp.midnight-commander.org/mc-4.8.30.sha256 +sha256 5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df mc-4.8.30.tar.xz # sha256 locally computed: sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING diff --git a/package/mc/mc.mk b/package/mc/mc.mk index 894b2314456c..2b4279c308ca 100644 --- a/package/mc/mc.mk +++ b/package/mc/mc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MC_VERSION = 4.8.29 +MC_VERSION = 4.8.30 MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ From 94d48acba3a787dd20fb53bcd759a2cf96e779fc Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 1 Sep 2023 12:55:09 -0600 Subject: [PATCH 1811/2890] package/libopenssl: bump version to 3.1.2 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- ...002-Reproducible-build-do-not-leak-compiler-path.patch | 2 +- ...igure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch | 8 ++++---- package/libopenssl/0005-Revert-Fix-static-builds.patch | 4 ++-- .../libopenssl/0006-Add-linux-x86-latomic-target.patch | 2 +- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch b/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch index ea26a3107537..9353c1ae90c4 100644 --- a/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch +++ b/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch @@ -15,7 +15,7 @@ diff --git a/crypto/build.info b/crypto/build.info index 2c619c6..49ca6ab 100644 --- a/crypto/build.info +++ b/crypto/build.info -@@ -111,7 +111,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ +@@ -115,7 +115,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ DEPEND[info.o]=buildinf.h DEPEND[cversion.o]=buildinf.h diff --git a/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch b/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch index 9f34e1f5fb74..629d9c26ce03 100644 --- a/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch +++ b/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch @@ -21,9 +21,9 @@ diff --git a/Configure b/Configure index 5a699836f3..f9152b1702 100755 --- a/Configure +++ b/Configure -@@ -1424,6 +1424,10 @@ my %predefined_CXX = $config{CXX} - ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX}) - : (); +@@ -1549,6 +1549,10 @@ unless ($disabled{asm}) { + } + } +if ($target eq "linux-ppc64" && !$disabled{asm}) { + $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2); @@ -31,7 +31,7 @@ index 5a699836f3..f9152b1702 100755 + # Check for makedepend capabilities. if (!$disabled{makedepend}) { - if ($config{target} =~ /^(VC|vms)-/) { + # If the attribute makedep_scheme is defined, then we assume that the -- 2.25.0 diff --git a/package/libopenssl/0005-Revert-Fix-static-builds.patch b/package/libopenssl/0005-Revert-Fix-static-builds.patch index 2bc0b961eb1b..149ad54fc53f 100644 --- a/package/libopenssl/0005-Revert-Fix-static-builds.patch +++ b/package/libopenssl/0005-Revert-Fix-static-builds.patch @@ -16,7 +16,7 @@ diff --git a/Configure b/Configure index 2c17f4186b..94cab4c3c4 100755 --- a/Configure +++ b/Configure -@@ -1438,10 +1438,6 @@ foreach (keys %useradd) { +@@ -1377,10 +1377,6 @@ foreach (keys %useradd) { # At this point, we can forget everything about %user and %useradd, # because it's now all been merged into the corresponding $config entry @@ -27,7 +27,7 @@ index 2c17f4186b..94cab4c3c4 100755 # Allow overriding the build file name $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile"; -@@ -1728,6 +1724,10 @@ if ($strict_warnings) +@@ -1671,6 +1667,10 @@ if ($strict_warnings) } } diff --git a/package/libopenssl/0006-Add-linux-x86-latomic-target.patch b/package/libopenssl/0006-Add-linux-x86-latomic-target.patch index a59db7331404..9ecc50b1aed8 100644 --- a/package/libopenssl/0006-Add-linux-x86-latomic-target.patch +++ b/package/libopenssl/0006-Add-linux-x86-latomic-target.patch @@ -14,7 +14,7 @@ diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 2200a85b16..bcf54a2a53 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf -@@ -861,6 +861,10 @@ my %targets = ( +@@ -868,6 +868,10 @@ my %targets = ( asm_arch => 'x86', perlasm_scheme => "elf", }, diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index b43281c7ebfa..1c82cd7cf87f 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-3.0.10.tar.gz.sha256 -sha256 1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323 openssl-3.0.10.tar.gz +# From https://www.openssl.org/source/openssl-3.1.2.tar.gz.sha256 +sha256 a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539 openssl-3.1.2.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 8bc3687921f1..9c1dbe869431 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.0.10 +LIBOPENSSL_VERSION = 3.1.2 LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 From ff6fae8bc1e995681cc906c4595205b5dc3f5586 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 1 Sep 2023 16:48:36 +0200 Subject: [PATCH 1812/2890] package/lighttpd: bump to version 1.4.71 Changelog: - https://www.lighttpd.net/2023/5/10/1.4.70/ - https://www.lighttpd.net/2023/5/27/1.4.71/ Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- package/lighttpd/lighttpd.hash | 4 ++-- package/lighttpd/lighttpd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 29bf5124b69f..a86ebf2f682a 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum -sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.71.sha512sum +sha512 c1388b563b9cf9dcab0a57bec42b09b2cb5e1932bc137ae5f957d1bf3932ddd8f5f188002a7b9a00f0a92ba3779b21ecbea2ccffa91e686b6660c9cc455d6598 lighttpd-1.4.71.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index ca2035b6b398..bc0dbcbf45f4 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).71 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause From 7dd5233b5540a950bb25024d2d48de04f07995bc Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Thu, 31 Aug 2023 21:45:13 +0200 Subject: [PATCH 1813/2890] package/libxcrypt: fix another build issue with perl >= 5.38 perl 5.38 deprecated smartmatch (~~ and the given/when syntax). Backport another upstream patch to drop uses of given. Fixes: - http://autobuild.buildroot.net/results/727/727aa831881af36394bafef9e13a0dcbd9d0db3a Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- ...ve-smartmatch-usage-from-gen-crypt-h.patch | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch diff --git a/package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch b/package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch new file mode 100644 index 000000000000..444896b53f86 --- /dev/null +++ b/package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch @@ -0,0 +1,61 @@ +From 95d6e03ae37f4ec948474d111105bbdd2938aba2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= +Date: Sun, 25 Jun 2023 01:35:08 +0200 +Subject: [PATCH] Remove smartmatch usage from gen-crypt-h + +Needed for Perl 5.38 + +Upstream: https://github.com/besser82/libxcrypt/commit/95d6e03ae37f4ec948474d111105bbdd2938aba2 +Signed-off-by: Daniel Lang +--- + build-aux/scripts/gen-crypt-h | 31 ++++++++++++++----------------- + 1 file changed, 14 insertions(+), 17 deletions(-) + +diff --git a/build-aux/scripts/gen-crypt-h b/build-aux/scripts/gen-crypt-h +index 12aecf6d..b113b791 100644 +--- a/build-aux/scripts/gen-crypt-h ++++ b/build-aux/scripts/gen-crypt-h +@@ -12,7 +12,6 @@ use v5.14; # implicit use strict, use feature ':5.14' + use warnings FATAL => 'all'; + use utf8; + use open qw(:std :utf8); +-no if $] >= 5.018, warnings => 'experimental::smartmatch'; + no if $] >= 5.022, warnings => 'experimental::re_strict'; + use if $] >= 5.022, re => 'strict'; + +@@ -37,22 +36,20 @@ sub process_config_h { + local $_; + while (<$fh>) { + chomp; +- # Yes, 'given $_' is really required here. +- given ($_) { +- when ('#define HAVE_SYS_CDEFS_H 1') { +- $have_sys_cdefs_h = 1; +- } +- when ('#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { +- $have_sys_cdefs_begin_end_decls = 1; +- } +- when ('#define HAVE_SYS_CDEFS_THROW 1') { +- $have_sys_cdefs_throw = 1; +- } +- when (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { +- $substs{XCRYPT_VERSION_STR} = $1; +- $substs{XCRYPT_VERSION_MAJOR} = $2; +- $substs{XCRYPT_VERSION_MINOR} = $3; +- } ++ ++ if ($_ eq '#define HAVE_SYS_CDEFS_H 1') { ++ $have_sys_cdefs_h = 1; ++ } ++ elsif ($_ eq '#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { ++ $have_sys_cdefs_begin_end_decls = 1; ++ } ++ elsif ($_ eq '#define HAVE_SYS_CDEFS_THROW 1') { ++ $have_sys_cdefs_throw = 1; ++ } ++ elsif (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { ++ $substs{XCRYPT_VERSION_STR} = $1; ++ $substs{XCRYPT_VERSION_MAJOR} = $2; ++ $substs{XCRYPT_VERSION_MINOR} = $3; + } + } From 698562e7f59249b49e94d3243e3a592d1919fcf5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 31 Aug 2023 21:53:38 +0200 Subject: [PATCH 1814/2890] configs/hifive_unleashed_defconfig: uboot needs OpenSSL Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4987456270 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/hifive_unleashed_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index c9d4a31ede1f..fbc273fffcd7 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -48,6 +48,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_unleashed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" From aab82a29bc66ec1ab03c98cfe72112a9d21a1fc6 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 31 Aug 2023 22:17:37 +0200 Subject: [PATCH 1815/2890] configs/beaglev_defconfig: fix build with binutils >= 2.38 Backport an upstream patch fixing the build with binutils >= 2.38 for riscv's for Zicsr and Zifencei. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4987456149 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...iscv-Fix-build-against-binutils-2.38.patch | 58 +++++++++++++++++++ configs/beaglev_defconfig | 1 + 2 files changed, 59 insertions(+) create mode 100644 board/beaglev/patches/uboot/0001-riscv-Fix-build-against-binutils-2.38.patch diff --git a/board/beaglev/patches/uboot/0001-riscv-Fix-build-against-binutils-2.38.patch b/board/beaglev/patches/uboot/0001-riscv-Fix-build-against-binutils-2.38.patch new file mode 100644 index 000000000000..52b496f05475 --- /dev/null +++ b/board/beaglev/patches/uboot/0001-riscv-Fix-build-against-binutils-2.38.patch @@ -0,0 +1,58 @@ +From 0cf11f3c0478f4286adcfb09bf9137f8b00212e3 Mon Sep 17 00:00:00 2001 +From: Alexandre Ghiti +Date: Mon, 3 Oct 2022 18:07:54 +0200 +Subject: [PATCH] riscv: Fix build against binutils 2.38 + +The following description is copied from the equivalent patch for the +Linux Kernel proposed by Aurelien Jarno: + +>From version 2.38, binutils default to ISA spec version 20191213. This +means that the csr read/write (csrr*/csrw*) instructions and fence.i +instruction has separated from the `I` extension, become two standalone +extensions: Zicsr and Zifencei. As the kernel uses those instruction, +this causes the following build failure: + +arch/riscv/cpu/mtrap.S: Assembler messages: +arch/riscv/cpu/mtrap.S:65: Error: unrecognized opcode `csrr a0,scause' +arch/riscv/cpu/mtrap.S:66: Error: unrecognized opcode `csrr a1,sepc' +arch/riscv/cpu/mtrap.S:67: Error: unrecognized opcode `csrr a2,stval' +arch/riscv/cpu/mtrap.S:70: Error: unrecognized opcode `csrw sepc,a0' + +Signed-off-by: Alexandre Ghiti +Reviewed-by: Bin Meng +Tested-by: Heinrich Schuchardt +Tested-by: Heiko Stuebner +Tested-by: Christian Stewart +Reviewed-by: Rick Chen +(cherry picked from commit 1dde977518f13824b847e23275001191139bc384) +Upstream: https://gitlab.com/u-boot/u-boot/-/commit/1dde977518f13824b847e23275001191139bc384 +Signed-off-by: Romain Naour +--- + arch/riscv/Makefile | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 0b80eb8d864..53d1194ffb6 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y) + CMODEL = medany + endif + +-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \ ++RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C) ++ ++# Newer binutils versions default to ISA spec version 20191213 which moves some ++# instructions from the I extension to the Zicsr and Zifencei extensions. ++toolchain-need-zicsr-zifencei := $(call cc-option-yn, -mabi=$(ABI) -march=$(RISCV_MARCH)_zicsr_zifencei) ++ifeq ($(toolchain-need-zicsr-zifencei),y) ++ RISCV_MARCH := $(RISCV_MARCH)_zicsr_zifencei ++endif ++ ++ARCH_FLAGS = -march=$(RISCV_MARCH) -mabi=$(ABI) \ + -mcmodel=$(CMODEL) + + PLATFORM_CPPFLAGS += $(ARCH_FLAGS) +-- +2.41.0 + diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig index 42c732b97340..a76c1ffb5f16 100644 --- a/configs/beaglev_defconfig +++ b/configs/beaglev_defconfig @@ -40,3 +40,4 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,u-boot,64e BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_vic7100_beagle_v_smode" BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_JH71XX_TOOLS=y +BR2_GLOBAL_PATCH_DIR="board/beaglev/patches" From d44a888c320bd5fc850bccf5a1e09facb9fdad0d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 31 Aug 2023 19:37:36 +0200 Subject: [PATCH 1816/2890] support/testing: python-magic-wormhole: fix random failures The magic-wormhole "receive" command can output "waiting" messages when key receival or verification are longer than a predefined timeout: https://github.com/magic-wormhole/magic-wormhole/blob/0.13.0/src/wormhole/cli/cmd_receive.py#L135 The intent is to have an interactive user experience. This behavior makes the runtime test unreliable as the test always expect the sent message as the exact output. When the test execution is slower, it sometimes get the "waiting" message instead of the expected message. Some test jobs are succeeding: https://gitlab.com/buildroot.org/buildroot/-/jobs/4968059737 while some other are failing. magic-wormhole can override those timers with environment variables. See: https://github.com/magic-wormhole/magic-wormhole/blob/0.13.0/src/wormhole/cli/cmd_receive.py#L26 This commit sets those environment variable to larger values (100 seconds instread of 1 by default), to make sure the test will always pass. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4962923235 Reported-by: Romain Naour Signed-off-by: Julien Olivain Reviewed-by: Romain Naour Tested-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_magic_wormhole.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_python_magic_wormhole.py b/support/testing/tests/package/test_python_magic_wormhole.py index abd34bca50e6..5a0f0277b052 100644 --- a/support/testing/tests/package/test_python_magic_wormhole.py +++ b/support/testing/tests/package/test_python_magic_wormhole.py @@ -50,7 +50,9 @@ def test_run(self): cmd += "sleep 25" self.assertRunOk(cmd, timeout=30) - cmd = wormhole_cmd + " receive {}".format(code) + wormhole_env = "_MAGIC_WORMHOLE_TEST_KEY_TIMER=100 " + wormhole_env += "_MAGIC_WORMHOLE_TEST_VERIFY_TIMER=100 " + cmd = wormhole_env + wormhole_cmd + " receive {}".format(code) output, exit_code = self.emulator.run(cmd, timeout=35) self.assertEqual(exit_code, 0) self.assertEqual(output[0], text) From de9187eca28adc3733b1842d97666c7eb1c6b380 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 30 Aug 2023 10:00:13 +0200 Subject: [PATCH 1817/2890] package/libsrtp: bump to version 2.5.0 https://github.com/cisco/libsrtp/releases/tag/v2.5.0 See detailed change log: https://github.com/cisco/libsrtp/blob/v2.5.0/CHANGES#L3-L43 Dropped patch wich was already upstream. Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...legacy-OpenSSL-to-fix-LibreSSL-build.patch | 86 ------------------- package/libsrtp/libsrtp.hash | 2 +- package/libsrtp/libsrtp.mk | 2 +- 4 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch diff --git a/.checkpackageignore b/.checkpackageignore index e652742f2508..fea853051892 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -781,7 +781,6 @@ package/libsoxr/0001-Add-Libs.private-for-static-linking.patch Upstream package/libspatialindex/0001-allow-building-static-libs.patch Upstream package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch Upstream package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch Upstream -package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch Upstream package/libsvg/0001-fix-expat-static-declaration.patch Upstream package/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch Upstream package/libsvgtiny/0001-disable-debug-printfs.patch Upstream diff --git a/package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch b/package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch deleted file mode 100644 index 68bfb085f70c..000000000000 --- a/package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 16483b18a9980575bee23898b2dbfbe2a4675d84 Mon Sep 17 00:00:00 2001 -From: Klemens Nanni -Date: Sat, 15 Jan 2022 23:19:35 +0300 -Subject: [PATCH] Remove compatibility code for legacy OpenSSL to fix LibreSSL - build - -In current LibreSSL, `HMAC_CTX` aka. `struct hmac_ctx_st` is an opaque -structure as of LibreSSL hmac.h revision 1.15 (14.01.2022) [0], thus -`sizeof(HMAC_CTX)` fails to compile. - -The non-legacy code path should compile with LibreSSL versions as old -as 2.7.0 (21.03.2018). - -Found while building https://github.com/desktop-app/tg_owt which bundles -libsrtp 2.2.0 [1] on OpenBSD 7.0 -CURRENT/with latest LibreSSL. - -Suggestion to remove the legacy code from Theo Buehler, thanks. - -0: http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libcrypto/hmac/hmac.h?rev=1.15&content-type=text/x-cvsweb-markup -1: https://github.com/desktop-app/tg_owt/blob/6708e0d31a73e64fe12f54829bf4060c41b2658e/src/third_party/libsrtp/crypto/hash/hmac_ossl.c#L85 - -[Retrieved from: -https://github.com/cisco/libsrtp/commit/16483b18a9980575bee23898b2dbfbe2a4675d84] -Signed-off-by: Fabrice Fontaine ---- - crypto/hash/hmac_ossl.c | 29 ----------------------------- - 1 file changed, 29 deletions(-) - -diff --git a/crypto/hash/hmac_ossl.c b/crypto/hash/hmac_ossl.c -index ee6b0b58..c23c7f21 100644 ---- a/crypto/hash/hmac_ossl.c -+++ b/crypto/hash/hmac_ossl.c -@@ -78,26 +78,6 @@ static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t **a, - return srtp_err_status_bad_param; - } - --/* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated -- using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER -- { -- /* allocate memory for auth and HMAC_CTX structures */ -- uint8_t *pointer; -- HMAC_CTX *new_hmac_ctx; -- pointer = (uint8_t *)srtp_crypto_alloc(sizeof(HMAC_CTX) + -- sizeof(srtp_auth_t)); -- if (pointer == NULL) { -- return srtp_err_status_alloc_fail; -- } -- *a = (srtp_auth_t *)pointer; -- (*a)->state = pointer + sizeof(srtp_auth_t); -- new_hmac_ctx = (HMAC_CTX *)((*a)->state); -- -- HMAC_CTX_init(new_hmac_ctx); -- } -- --#else - *a = (srtp_auth_t *)srtp_crypto_alloc(sizeof(srtp_auth_t)); - if (*a == NULL) { - return srtp_err_status_alloc_fail; -@@ -109,7 +89,6 @@ static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t **a, - *a = NULL; - return srtp_err_status_alloc_fail; - } --#endif - - /* set pointers */ - (*a)->type = &srtp_hmac; -@@ -126,18 +105,10 @@ static srtp_err_status_t srtp_hmac_dealloc(srtp_auth_t *a) - - hmac_ctx = (HMAC_CTX *)a->state; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER -- HMAC_CTX_cleanup(hmac_ctx); -- -- /* zeroize entire state*/ -- octet_string_set_to_zero(a, sizeof(HMAC_CTX) + sizeof(srtp_auth_t)); -- --#else - HMAC_CTX_free(hmac_ctx); - - /* zeroize entire state*/ - octet_string_set_to_zero(a, sizeof(srtp_auth_t)); --#endif - - /* free memory */ - srtp_crypto_free(a); diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash index 8e51e68ac2b0..f95dc2e7b0b2 100644 --- a/package/libsrtp/libsrtp.hash +++ b/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628 libsrtp-2.4.2.tar.gz +sha256 8a43ef8e9ae2b665292591af62aa1a4ae41e468b6d98d8258f91478735da4e09 libsrtp-2.5.0.tar.gz sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index e7a771c6b207..0ffdd9828375 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSRTP_VERSION = 2.4.2 +LIBSRTP_VERSION = 2.5.0 LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause From f38a2a95ac9cefaf7483d49ba0f2ded6fa97019c Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 31 Aug 2023 11:50:35 +0200 Subject: [PATCH 1818/2890] package/fmt: bump to version 10.1.1 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/fmt/fmt.hash | 2 +- package/fmt/fmt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index 688c86243a3c..5f0e06ef3069 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d725fa83a8b57a3cedf238828fa6b167f963041e8f9f7327649bddc68ae316f4 fmt-10.1.0.zip +sha256 b84e58a310c9b50196cda48d5678d5fa0849bca19e5fdba6b684f0ee93ed9d1b fmt-10.1.1.zip sha256 07580f2a3b35709ce703d523f447b242f6dfec7582a8c0df102c7fa2849375f8 LICENSE.rst diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index 8332b89605da..8f8ba4837f9b 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 10.1.0 +FMT_VERSION = 10.1.1 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception From 9299ea4bff290bd2f178eb81b3a86451c3153a7e Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 31 Aug 2023 20:12:14 +0200 Subject: [PATCH 1819/2890] package/libnss: bump version to 3.93 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index b95c0448b0ae..a3b98b0f8c72 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_92_RTM/src/SHA256SUMS -sha256 3db192d6e882039af02ae7eaf3217ed114bb7ad83414c646772ab8021e24a254 nss-3.92.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_93_RTM/src/SHA256SUMS +sha256 15f54bb72048eb105f8c0e936a04b899e74c3db9a19bbc1e00acee2af9476a8a nss-3.93.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index e9e7c5a27800..e859f479bba9 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.92 +LIBNSS_VERSION = 3.93 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From 86fac42015cb10c8d2926a30882d8e3645e585c8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 31 Aug 2023 21:19:21 +0200 Subject: [PATCH 1820/2890] package/python-magic-wormhole: bump to version 0.13.0 For change log, see [1]. A notable change is that the package changed its HKDF implementation from the python-hkdf package to python-cryptography. See [2]. This commit reflect that change in the runtime dependencies. The python-cryptography was already an indirect dependency; it is now a direct one. [1] https://github.com/magic-wormhole/magic-wormhole/blob/0.13.0/NEWS.md [2] https://github.com/magic-wormhole/magic-wormhole/pull/456 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/python-magic-wormhole/Config.in | 4 ++-- package/python-magic-wormhole/python-magic-wormhole.hash | 4 ++-- package/python-magic-wormhole/python-magic-wormhole.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-magic-wormhole/Config.in b/package/python-magic-wormhole/Config.in index e8429d203bc4..c92af7a95791 100644 --- a/package/python-magic-wormhole/Config.in +++ b/package/python-magic-wormhole/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE bool "python-magic-wormhole" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime select BR2_PACKAGE_PYTHON_AUTOMAT # runtime select BR2_PACKAGE_PYTHON_CLICK # runtime - select BR2_PACKAGE_PYTHON_HKDF # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_HUMANIZE # runtime select BR2_PACKAGE_PYTHON_PYNACL # runtime select BR2_PACKAGE_PYTHON_SIX # runtime diff --git a/package/python-magic-wormhole/python-magic-wormhole.hash b/package/python-magic-wormhole/python-magic-wormhole.hash index 5e880d542711..5a3ffab7320d 100644 --- a/package/python-magic-wormhole/python-magic-wormhole.hash +++ b/package/python-magic-wormhole/python-magic-wormhole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/magic-wormhole/json -md5 ca190d92f56fe32ec8dfd4fc5aab8337 magic-wormhole-0.12.0.tar.gz -sha256 1b0fd8a334da978f3dd96b620fa9b9348cabedf26a87f74baac7a37052928160 magic-wormhole-0.12.0.tar.gz +md5 baf778af8df5416e6d01bb2b95fa5cc5 magic-wormhole-0.13.0.tar.gz +sha256 ac3bd68286270e7f149c06149a8e409e5fa34d7feb0e88844a26d29eed2d1516 magic-wormhole-0.13.0.tar.gz # Locally computed sha256 checksums sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole/python-magic-wormhole.mk b/package/python-magic-wormhole/python-magic-wormhole.mk index 91f0f826d50a..3349bfd4e12e 100644 --- a/package/python-magic-wormhole/python-magic-wormhole.mk +++ b/package/python-magic-wormhole/python-magic-wormhole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAGIC_WORMHOLE_VERSION = 0.12.0 +PYTHON_MAGIC_WORMHOLE_VERSION = 0.13.0 PYTHON_MAGIC_WORMHOLE_SOURCE = magic-wormhole-$(PYTHON_MAGIC_WORMHOLE_VERSION).tar.gz -PYTHON_MAGIC_WORMHOLE_SITE = https://files.pythonhosted.org/packages/d4/62/5e4a86f7c4b111e016577f1b304063ebe604f430db15465ac58b13993608 +PYTHON_MAGIC_WORMHOLE_SITE = https://files.pythonhosted.org/packages/cc/e1/75c31ad5db873268ba0750006b3d0e40c30b0ad39e6f58b1e28a28d6de48 PYTHON_MAGIC_WORMHOLE_SETUP_TYPE = setuptools PYTHON_MAGIC_WORMHOLE_LICENSE = MIT PYTHON_MAGIC_WORMHOLE_LICENSE_FILES = LICENSE From c82de32369d9c5c298058896c87b3e6fa9b465de Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 31 Aug 2023 10:15:16 +0200 Subject: [PATCH 1821/2890] package/linux-firmware: add new option for Marvell prestera firmware Add the Marvell prestera ethernet cards firmwares. Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- package/linux-firmware/Config.in | 5 +++++ package/linux-firmware/linux-firmware.hash | 1 + package/linux-firmware/linux-firmware.mk | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 3ae72564ccaf..46e538776d01 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -489,6 +489,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_INTEL_ICE Firmware files for Intel Ethernet 800 Series Network Adapters (ice) +config BR2_PACKAGE_LINUX_FIRMWARE_MARVELL_PRESTERA + bool "Marvell Prestera" + help + Firmware files for Marvell Prestera ethernet cards + config BR2_PACKAGE_LINUX_FIRMWARE_MICROCHIP_VSC85XX_PHY bool "Microchip VSC85xx PHYs" help diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 7ba9537dd8fb..31bbfddfaa00 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -17,6 +17,7 @@ sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENC sha256 8c45a83562a69f7ac4207e4cb5c0063af2e545791b3947bc81dc82305481c15c LICENSE.ice_enhanced sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x sha256 16d5040c7cf851fc693b7542e20870935b99802533ea1bfd231c377a2305e5c5 LICENCE.iwlwifi_firmware +sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell sha256 0fc67bd715b3395f3f2af464781910e9e69c4ba23da304352229b42dc9e986c3 LICENCE.microchip sha256 59ae206c89108905ebdc9ad4c9336526bd2c0d50fbf988c21e8c2a82719d42a4 LICENCE.moxa sha256 0bd9f7cae3cf72b12a63359a725ccbb76ddbd6831372695a9162144329800dd0 LICENCE.qat_firmware diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index a1cec90de2ca..f8c239d8165b 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -616,6 +616,12 @@ LINUX_FIRMWARE_FILES += \ rtl_nic/rtl8411-2.fw endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MARVELL_PRESTERA),y) +LINUX_FIRMWARE_FILES += \ + mrvl/prestera/mvsw_prestera_fw*.img +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_XCx000),y) LINUX_FIRMWARE_FILES += \ dvb-fe-xc4000-1.4.1.fw \ From a95d65e495ccfbf8bd91c8f9a41bd12574a937cb Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 30 Aug 2023 13:54:40 -0600 Subject: [PATCH 1822/2890] package/vulkan-headers: bump version to 1.3.262 Update the license hash as the license file is now located at LICENSE.md isntead of LICENSE.txt, and add MIT to the list of licenses. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/vulkan-headers/vulkan-headers.hash | 4 ++-- package/vulkan-headers/vulkan-headers.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/vulkan-headers/vulkan-headers.hash b/package/vulkan-headers/vulkan-headers.hash index cf213d8b529d..b38bfcff47aa 100644 --- a/package/vulkan-headers/vulkan-headers.hash +++ b/package/vulkan-headers/vulkan-headers.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e3ee02eff07ebcdb0ddfd06366d986c889f3392b6c4d79615bb06aefc1fda900 vulkan-headers-1.3.257.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 317e467a5fb2eaa6a18b984ec70fdbfaccd93595a3e6f4bcceca7d3fab280505 vulkan-headers-1.3.262.tar.gz +sha256 ac24e5ea920e4318e4d02c4086ae51f53cfb03feed06c18df1019e7ada1ec7bc LICENSE.md diff --git a/package/vulkan-headers/vulkan-headers.mk b/package/vulkan-headers/vulkan-headers.mk index c42b005abec0..5434f69a4092 100644 --- a/package/vulkan-headers/vulkan-headers.mk +++ b/package/vulkan-headers/vulkan-headers.mk @@ -4,10 +4,10 @@ # ################################################################################ -VULKAN_HEADERS_VERSION = 1.3.257 +VULKAN_HEADERS_VERSION = 1.3.262 VULKAN_HEADERS_SITE = $(call github,KhronosGroup,Vulkan-Headers,v$(VULKAN_HEADERS_VERSION)) -VULKAN_HEADERS_LICENSE = Apache-2.0 -VULKAN_HEADERS_LICENSE_FILES = LICENSE.txt +VULKAN_HEADERS_LICENSE = Apache-2.0, MIT +VULKAN_HEADERS_LICENSE_FILES = LICENSE.md VULKAN_HEADERS_INSTALL_STAGING = YES $(eval $(cmake-package)) From 6aa1bc31678ff9f8013084fda34b9f941cc63fc3 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 30 Aug 2023 13:54:41 -0600 Subject: [PATCH 1823/2890] package/vulkan-loader: new package Use $(VULKAN_HEADERS_VERSION) for VULKAN_LOADER_VERSION as the vulkan packages need to all be the same version. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/vulkan-loader/Config.in | 14 ++++++++ package/vulkan-loader/vulkan-loader.hash | 3 ++ package/vulkan-loader/vulkan-loader.mk | 45 ++++++++++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 package/vulkan-loader/Config.in create mode 100644 package/vulkan-loader/vulkan-loader.hash create mode 100644 package/vulkan-loader/vulkan-loader.mk diff --git a/DEVELOPERS b/DEVELOPERS index db0ea49f9048..413054ab84d9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -28,6 +28,7 @@ N: Adam Duskett F: package/firewalld/ +F: package/vulkan-loader/ N: Adam Heinrich F: package/jack1/ diff --git a/package/Config.in b/package/Config.in index 544988480954..41ff89726cc6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -369,6 +369,7 @@ comment "Graphic libraries" source "package/sdl2_ttf/Config.in" source "package/tk/Config.in" source "package/vulkan-headers/Config.in" + source "package/vulkan-loader/Config.in" comment "Other GUIs" source "package/qt5/Config.in" diff --git a/package/vulkan-loader/Config.in b/package/vulkan-loader/Config.in new file mode 100644 index 000000000000..9c215dc9ce82 --- /dev/null +++ b/package/vulkan-loader/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_VULKAN_LOADER + bool "vulkan-loader" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_VULKAN_HEADERS + help + The Khronos official Vulkan ICD desktop loader. + + https://github.com/KhronosGroup/Vulkan-Loader + +comment "vulkan-loader needs a toolchain w/ C++, dynamic library, threads" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/vulkan-loader/vulkan-loader.hash b/package/vulkan-loader/vulkan-loader.hash new file mode 100644 index 000000000000..e09ecda8a9da --- /dev/null +++ b/package/vulkan-loader/vulkan-loader.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 3bbaa5ee64058a89949eb777de66ce94bfe3141892514172cfc9451c756802d5 vulkan-loader-1.3.262.tar.gz +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece LICENSE.txt diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk new file mode 100644 index 000000000000..f6dd9d0ac3dc --- /dev/null +++ b/package/vulkan-loader/vulkan-loader.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# vulkan-loader +# +################################################################################ + +VULKAN_LOADER_VERSION = $(VULKAN_HEADERS_VERSION) +VULKAN_LOADER_SITE = $(call github,KhronosGroup,Vulkan-Loader,v$(VULKAN_LOADER_VERSION)) +VULKAN_LOADER_LICENSE = Apache-2.0 +VULKAN_LOADER_LICENSE_FILES = LICENSE.txt +VULKAN_LOADER_INSTALL_STAGING = YES + +VULKAN_LOADER_DEPENDENCIES = host-pkgconf vulkan-headers + +VULKAN_LOADER_CONF_OPTS += \ + -DASSEMBLER_WORKS=FALSE \ + -DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \ + -DLOADER_CODEGEN=OFF + +ifeq ($(BR2_PACKAGE_DIRECTFB),y) +VULKAN_LOADER_DEPENDENCIES += directfb +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=ON +else +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBXCB),y) +VULKAN_LOADER_DEPENDENCIES += libxcb +VULKAN_LOADER_CONF_OPTS += \ + -DBUILD_WSI_XCB_SUPPORT=ON \ + -DBUILD_WSI_XLIB_SUPPORT=ON +else +VULKAN_LOADER_CONF_OPTS += \ + -DBUILD_WSI_XCB_SUPPORT=OFF \ + -DBUILD_WSI_XLIB_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +VULKAN_LOADER_DEPENDENCIES += wayland +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_WAYLAND_SUPPORT=ON +else +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_WAYLAND_SUPPORT=OFF +endif + +$(eval $(cmake-package)) From d5a7f213ab94d986133760122105adda76676823 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 30 Aug 2023 13:54:42 -0600 Subject: [PATCH 1824/2890] package/vulkan-tools: new package Use $(VULKAN_HEADERS_VERSION) for VULKAN_TOOLS_VERSION as the vulkan packages need to all be the same version. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/vulkan-tools/Config.in | 17 ++++++++++ package/vulkan-tools/vulkan-tools.hash | 3 ++ package/vulkan-tools/vulkan-tools.mk | 47 ++++++++++++++++++++++++++ 5 files changed, 69 insertions(+) create mode 100644 package/vulkan-tools/Config.in create mode 100644 package/vulkan-tools/vulkan-tools.hash create mode 100644 package/vulkan-tools/vulkan-tools.mk diff --git a/DEVELOPERS b/DEVELOPERS index 413054ab84d9..eba7c4aa343a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -29,6 +29,7 @@ N: Adam Duskett F: package/firewalld/ F: package/vulkan-loader/ +F: package/vulkan-tools/ N: Adam Heinrich F: package/jack1/ diff --git a/package/Config.in b/package/Config.in index 41ff89726cc6..b21a2f8c6521 100644 --- a/package/Config.in +++ b/package/Config.in @@ -370,6 +370,7 @@ comment "Graphic libraries" source "package/tk/Config.in" source "package/vulkan-headers/Config.in" source "package/vulkan-loader/Config.in" + source "package/vulkan-tools/Config.in" comment "Other GUIs" source "package/qt5/Config.in" diff --git a/package/vulkan-tools/Config.in b/package/vulkan-tools/Config.in new file mode 100644 index 000000000000..54fa539dabf9 --- /dev/null +++ b/package/vulkan-tools/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_VULKAN_TOOLS + bool "vulkan-tools" + depends on BR2_INSTALL_LIBSTDCPP # vulkan-loader + depends on !BR2_STATIC_LIBS # vullan-loader + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # vulkan-loader + select BR2_PACKAGE_VULKAN_HEADERS + select BR2_PACKAGE_VULKAN_LOADER + + help + The Khronos official Vulkan Tools and Utilities. + + https://github.com/KhronosGroup/Vulkan-Tools + +comment "vulkan-tools needs a toolchain w/ C++, dynamic library, threads, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/vulkan-tools/vulkan-tools.hash b/package/vulkan-tools/vulkan-tools.hash new file mode 100644 index 000000000000..24c06977840b --- /dev/null +++ b/package/vulkan-tools/vulkan-tools.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 8c77d02694d0516ae2ba3f3718745647e87e788ef93faabb2e3674ff32608010 vulkan-tools-1.3.262.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/vulkan-tools/vulkan-tools.mk b/package/vulkan-tools/vulkan-tools.mk new file mode 100644 index 000000000000..68f7c1c04d91 --- /dev/null +++ b/package/vulkan-tools/vulkan-tools.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# vulkan-tools +# +################################################################################ + +VULKAN_TOOLS_VERSION = $(VULKAN_HEADERS_VERSION) +VULKAN_TOOLS_SITE = $(call github,KhronosGroup,Vulkan-Tools,v$(VULKAN_TOOLS_VERSION)) +VULKAN_TOOLS_LICENSE = Apache-2.0 +VULKAN_TOOLS_LICENSE_FILES = LICENSE.txt + +VULKAN_TOOLS_DEPENDENCIES = \ + vulkan-headers \ + vulkan-loader + +VULKAN_TOOLS_CONF_OPTS += \ + -DBUILD_CUBE=OFF \ + -DBUILD_ICD=OFF \ + -DBUILD_VULKANINFO=ON \ + -DINSTALL_ICD=OFF + +ifeq ($(BR2_PACKAGE_DIRECTFB),y) +VULKAN_TOOLS_DEPENDENCIES += directfb +VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=ON +else +VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBXCB),y) +VULKAN_TOOLS_DEPENDENCIES += libxcb +VULKAN_TOOLS_CONF_OPTS += \ + -DBUILD_WSI_XCB_SUPPORT=ON \ + -DBUILD_WSI_XLIB_SUPPORT=ON +else +VULKAN_TOOLS_CONF_OPTS += \ + -DBUILD_WSI_XCB_SUPPORT=OFF \ + -DBUILD_WSI_XLIB_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +VULKAN_TOOLS_DEPENDENCIES += wayland +VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_WAYLAND_SUPPORT=ON +else +VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_WAYLAND_SUPPORT=OFF +endif + +$(eval $(cmake-package)) From 0bc44d52c643711e39bc2ee44ca10a16ed300460 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 30 Aug 2023 13:54:43 -0600 Subject: [PATCH 1825/2890] package/mesa3d: add vulkan broadcom driver support Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/mesa3d/Config.in | 9 +++++++++ package/mesa3d/mesa3d.mk | 1 + 2 files changed, 10 insertions(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index c7ee2a8db049..c3abd662f3d3 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -299,6 +299,15 @@ comment "Gallium VDPAU state tracker needs X.org and gallium drivers r600, radeo comment "Vulkan drivers" +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM + bool "Vulkan broadcom driver" + depends on BR2_arm || BR2_aarch64 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # dri3/libxshmfence + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER + help + Vulkan broadcom driver. + config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL bool "Vulkan Intel driver" depends on BR2_i386 || BR2_x86_64 diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 8f3d2244176a..67573909a38c 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -119,6 +119,7 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D) += v3d MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl # Vulkan Drivers +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM) += broadcom MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) From 028403c47ce297776558173f9833fe64ad2f058f Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 30 Aug 2023 13:54:44 -0600 Subject: [PATCH 1826/2890] package/mesa3d: add vulkan swrast driver support Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/mesa3d/Config.in | 8 ++++++++ package/mesa3d/mesa3d.mk | 1 + 2 files changed, 9 insertions(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index c3abd662f3d3..6be05ef4b55f 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -325,6 +325,14 @@ 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_SWRAST + bool "Vulkan swrast driver" + depends on BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER + help + Vulkan swrast driver. + comment "Off-screen Rendering" config BR2_PACKAGE_MESA3D_OSMESA_GALLIUM diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 67573909a38c..f86140f17e2e 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -121,6 +121,7 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl # Vulkan Drivers MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM) += broadcom MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST) += swrast ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) MESA3D_CONF_OPTS += \ From c6b2a5049ecd9b4c6ba500d9c4793e68e86c36f8 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 30 Aug 2023 13:54:45 -0600 Subject: [PATCH 1827/2890] package/qt5base: add vulkan option Notes: - eglfs/vulkan is only implemented for eglfs_viv (see stub implementation for QEglFSDeviceIntegration::createPlatformVulkanInstance() in src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp and real implementation for QEglFSVivIntegration::createPlatformVulkanInstance() in src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/qeglfsvivintegration.cpp) - or for xcb (see QXcbIntegration::createPlatformVulkanInstance() in src/plugins/platforms/xcb/qxcbintegration.cpp) Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/Config.in | 10 ++++++++++ package/qt5/qt5base/qt5base.mk | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index b876f1948ed2..0c7ed41c46a4 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -180,6 +180,16 @@ config BR2_PACKAGE_QT5BASE_OPENGL_LIB endif +config BR2_PACKAGE_QT5BASE_VULKAN + bool "Vulkan support" + depends on BR2_INSTALL_LIBSTDCPP # vulkan-loader + depends on !BR2_STATIC_LIBS # vulkan-loader + depends on BR2_TOOLCHAIN_HAS_THREADS # vulkan-loader + select BR2_PACKAGE_VULKAN_HEADERS + select BR2_PACKAGE_VULKAN_LOADER + help + This option enables Vulkan support. + config BR2_PACKAGE_QT5BASE_LINUXFB bool "linuxfb support" diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 028236d2ed60..cc29f5523f96 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -206,6 +206,13 @@ else QT5BASE_CONFIGURE_OPTS += -no-opengl endif +ifeq ($(BR2_PACKAGE_QT5BASE_VULKAN),y) +QT5BASE_CONFIGURE_OPTS += -feature-vulkan +QT5BASE_DEPENDENCIES += vulkan-headers vulkan-loader +else +QT5BASE_CONFIGURE_OPTS += -no-feature-vulkan +endif + QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) From 1c27f3a12d77bc3cef97123148ff13929d13d73e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 30 Aug 2023 13:54:46 -0600 Subject: [PATCH 1828/2890] package/qt6base: add vulkan option Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 10 ++++++++++ package/qt6/qt6base/qt6base.mk | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index f9fb2a2ad052..98a7520486b7 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -43,6 +43,16 @@ config BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6BASE_GUI +config BR2_PACKAGE_QT6BASE_VULKAN + bool "Vulkan support" + depends on BR2_INSTALL_LIBSTDCPP # vulkan-loader + depends on !BR2_STATIC_LIBS # vulkan-loader + depends on BR2_TOOLCHAIN_HAS_THREADS # vulkan-loader + select BR2_PACKAGE_VULKAN_HEADERS + select BR2_PACKAGE_VULKAN_LOADER + help + This option enables Vulkan support. + config BR2_PACKAGE_QT6BASE_LINUXFB bool "linuxfb support" diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 4a01bb17b22b..c32089f551bf 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -127,6 +127,13 @@ QT6BASE_CONF_OPTS += \ -DFEATURE_vulkan=OFF QT6BASE_DEPENDENCIES += freetype +ifeq ($(BR2_PACKAGE_QT6BASE_VULKAN),y) +QT6BASE_DEPENDENCIES += vulkan-headers vulkan-loader +QT6BASE_CONFIGURE_OPTS += -DFEATURE_vulkan=ON +else +QT6BASE_CONFIGURE_OPTS += -DFEATURE_vulkan=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON else From 9e057e7897008a6aabcd91109cf004e5ffd957ff Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 2 Sep 2023 11:58:26 +0200 Subject: [PATCH 1829/2890] package/vulkan-headers: add comment on version being shared with other packages Signed-off-by: Thomas Petazzoni --- package/vulkan-headers/vulkan-headers.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/vulkan-headers/vulkan-headers.mk b/package/vulkan-headers/vulkan-headers.mk index 5434f69a4092..20b248364d5c 100644 --- a/package/vulkan-headers/vulkan-headers.mk +++ b/package/vulkan-headers/vulkan-headers.mk @@ -4,6 +4,8 @@ # ################################################################################ +# Note: changing this version will also affect vulkan-loader and +# vulkan-tools, so please update those packages as well. VULKAN_HEADERS_VERSION = 1.3.262 VULKAN_HEADERS_SITE = $(call github,KhronosGroup,Vulkan-Headers,v$(VULKAN_HEADERS_VERSION)) VULKAN_HEADERS_LICENSE = Apache-2.0, MIT From 99674f64ba8f87b7489b5380d0e6bafa25930341 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 2 Sep 2023 12:20:22 +0200 Subject: [PATCH 1830/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index de08f755f665..90ab04805502 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.4.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.4.14" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 066edd9a7d2a..d62fc7de0916 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 5e5511b50bc9fd358bb5d7746fab3c5ea396d42c6bd7a54b2555ede0de5ac8e5 linux-6.4.13.tar.xz -sha256 b27ac1443eea563bc546ee1f67d9802bc8d6c0f6f18707407fba01f9f78c488c linux-6.1.50.tar.xz +sha256 75eae323747ae37b05086c5a51326a744eb611b0e890e7ebe77de362b30450e6 linux-6.4.14.tar.xz +sha256 58b0446d8ea4bc0b26a35e2e3509bd53efcdeb295c9e4f48d33a23b1cdaa103b linux-6.1.51.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 750ec97ce4f1473e392b367a55eca4ea7a6b1e9e65ca2fb3bbca2eaa64802b66 linux-5.15.129.tar.xz -sha256 bd4036da47612d0d8c5f8c43e7700e8c996ae3b51084aa8fc6530c9d00f1ded0 linux-5.10.193.tar.xz -sha256 34d5ed902f47d90f27b9d5d6b8db0d3fa660834111f9452e166d920968a4a061 linux-5.4.255.tar.xz +sha256 ab464e4107329ff5262f1c585c40fc29dc68f17687a9a918f3e90faba5303d62 linux-5.15.130.tar.xz +sha256 240d5e47bb378c6813ecd07704fb887651ea7617159d2771071fd70bf33cd995 linux-5.10.194.tar.xz +sha256 c7a4086ba23507b8539d18534565de0d6591138bfa2e449e93964fd5132e353a linux-5.4.256.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 cd95a8cb8fefb749e32359b8a915c036abc37e80746285da6535cb5a0776b3f0 linux-4.19.293.tar.xz -sha256 24e8b21647a0f270291ea56d9123d59c511fa10efc23f5d28b5cb51611e1d9f0 linux-4.14.324.tar.xz +sha256 ccadbde939a788934436125a1ecd4464175b68ebe6c18072fbc90c8596eea00f linux-4.19.294.tar.xz +sha256 5b69e182ced5190a1fca117682cf7967c5bab24c4cf1364733ee14055b0df784 linux-4.14.325.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 0c0b365473c2..7e67dfad5cfb 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -400,13 +400,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.324" if BR2_KERNEL_HEADERS_4_14 - default "4.19.293" if BR2_KERNEL_HEADERS_4_19 - default "5.4.255" if BR2_KERNEL_HEADERS_5_4 - default "5.10.193" if BR2_KERNEL_HEADERS_5_10 - default "5.15.129" if BR2_KERNEL_HEADERS_5_15 - default "6.1.50" if BR2_KERNEL_HEADERS_6_1 - default "6.4.13" if BR2_KERNEL_HEADERS_6_4 + default "4.14.325" if BR2_KERNEL_HEADERS_4_14 + default "4.19.294" if BR2_KERNEL_HEADERS_4_19 + default "5.4.256" if BR2_KERNEL_HEADERS_5_4 + default "5.10.194" if BR2_KERNEL_HEADERS_5_10 + default "5.15.130" if BR2_KERNEL_HEADERS_5_15 + default "6.1.51" if BR2_KERNEL_HEADERS_6_1 + default "6.4.14" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 571bf3f7a6f937d7625f12a768685fb78d29df9c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 2 Sep 2023 12:44:59 +0200 Subject: [PATCH 1831/2890] package/lua-datafile: bump to version 0.10 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-datafile/lua-datafile.hash | 2 +- package/lua-datafile/lua-datafile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-datafile/lua-datafile.hash b/package/lua-datafile/lua-datafile.hash index e3b415ad4df2..2e993bc8874f 100644 --- a/package/lua-datafile/lua-datafile.hash +++ b/package/lua-datafile/lua-datafile.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b511ce5a4f4072bb6c496bd42760fa92a0576d0c77828b6a2600d68fe9d7e998 datafile-0.7-1.src.rock +sha256 13cb4816f459e71c525f256dbf197a516deb0f6b9ad98a9a0dc0aafe0d415194 datafile-0.10-1.src.rock sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66 datafile/LICENSE diff --git a/package/lua-datafile/lua-datafile.mk b/package/lua-datafile/lua-datafile.mk index 3b4c65d3e34e..943ed9b8bcaf 100644 --- a/package/lua-datafile/lua-datafile.mk +++ b/package/lua-datafile/lua-datafile.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_DATAFILE_VERSION = 0.7-1 +LUA_DATAFILE_VERSION = 0.10-1 LUA_DATAFILE_NAME_UPSTREAM = datafile LUA_DATAFILE_SUBDIR = datafile LUA_DATAFILE_LICENSE = MIT From 464ff28b7a7afc73b51aa9324b24a5aca5bf2ade Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 2 Sep 2023 12:45:00 +0200 Subject: [PATCH 1832/2890] package/luasec: bump to version 1.3.2 diff LICENSE: -LuaSec 1.2.0 license -Copyright (C) 2006-2022 Bruno Silvestre, UFG +LuaSec 1.3.2 license +Copyright (C) 2006-2023 Bruno Silvestre, UFG Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luasec/luasec.hash | 4 ++-- package/luasec/luasec.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index 3c2b7d803b46..0fb9996d3992 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 82d9ea7d11688a2b11fc1c4549a2e7b0aca00790b49e67a41dac0c81f2890f1c luasec-1.2.0-1.src.rock -sha256 bbf73e23eae7df57a4c4ff33bc23c41a2dc4f8707ba33235c2026d20b41405a7 luasec/LICENSE +sha256 f93bf9927bd34a5d4f897f4488b285a12bee89c0e7d54b3b36dfcbf43a7ad4e5 luasec-1.3.2-1.src.rock +sha256 a3eab8badfcce959ae0c50be4ce460b547785dba61e6dcc6a1dbb8f800a18563 luasec/LICENSE diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index c7f3a94d9a5e..6e338a7be3c5 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASEC_VERSION = 1.2.0-1 +LUASEC_VERSION = 1.3.2-1 LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE From 2be2ccb4873f3e63626c40519ed69ac2e5d456b3 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sat, 2 Sep 2023 08:47:49 -0400 Subject: [PATCH 1833/2890] utils/check-package: cleanup line reading Cleanup the implementation for reading lines by having files processed in context managers and utilizing the iterable file object for line reading (instead of needing to call `readlines()`). Signed-off-by: James Knight Signed-off-by: Thomas Petazzoni --- utils/check-package | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/utils/check-package b/utils/check-package index 3de3a72e0cc6..105902303ed7 100755 --- a/utils/check-package +++ b/utils/check-package @@ -233,16 +233,18 @@ def check_file_using_lib(fname): nwarnings += warn lastline = "" - for lineno, text in enumerate(open(fname, "r", errors="surrogateescape").readlines()): - nlines += 1 - for name, cf in objects: - if cf.disable.search(lastline): - continue - warn, fail = print_warnings(cf.check_line(lineno + 1, text), name in xfail) - if fail > 0: - failed.add(name) - nwarnings += warn - lastline = text + with open(fname, "r", errors="surrogateescape") as f: + for lineno, text in enumerate(f): + nlines += 1 + for name, cf in objects: + if cf.disable.search(lastline): + continue + line_sts = cf.check_line(lineno + 1, text) + warn, fail = print_warnings(line_sts, name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn + lastline = text for name, cf in objects: warn, fail = print_warnings(cf.after(), name in xfail) From 5c9f31041a2c36e3b97cd2f9577f68d88ee91174 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 27 Aug 2023 16:59:54 +0200 Subject: [PATCH 1834/2890] boot/edk2: bump to version edk2-stable202308 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For change log since version edk2-stable202305, see: - https://github.com/tianocore/edk2/releases/tag/edk2-stable202308 The main motivations of this bump are the RISC-V QEMU Virt support improvements (not yet supported in Buildroot). Cc: Dick Olsson Cc: Vincent Stehlé Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- boot/edk2/edk2.hash | 2 +- boot/edk2/edk2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash index 34d4b10e2992..17918ee7bb27 100644 --- a/boot/edk2/edk2.hash +++ b/boot/edk2/edk2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ca55351913e6258ebd8c08106f369ac71073d9cfaa80427fc5f131b06d808940 edk2-edk2-stable202305-br1.tar.gz +sha256 9389ad20bc75f2a8fa9e7c1b1948ef07481c94e96dec57ae2f9f9be9c754f92c edk2-edk2-stable202308-br1.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index f49258ecb5b8..186854a14c0c 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDK2_VERSION = edk2-stable202305 +EDK2_VERSION = edk2-stable202308 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git EDK2_LICENSE = BSD-2-Clause-Patent From 2001d3758879bc25496e726edf3da99e9dbee38f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 27 Aug 2023 16:59:55 +0200 Subject: [PATCH 1835/2890] package/edk2-platforms: bump in sync with edk2-stable202308 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump the edk2-platforms commit to the one corresponding to version edk2-stable202308 of edk2, based on the timestamps. Cc: Dick Olsson Cc: Vincent Stehlé Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/edk2-platforms/edk2-platforms.hash | 2 +- package/edk2-platforms/edk2-platforms.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash index ae88b672a631..4c74c7dfb6ae 100644 --- a/package/edk2-platforms/edk2-platforms.hash +++ b/package/edk2-platforms/edk2-platforms.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 31257160ac51a4a5f63db92d26482d6a005286ed040dafe89d01f0ee906b111e edk2-platforms-b71f2bda9e4fc183068eef5d1d90a631181a2506.tar.gz +sha256 c240a8ec7816bc5963d881c84eb18d880e9269c117cfc46a3106b0c5e6e80c66 edk2-platforms-e509ac5a729ebe2a3bc905aed1df23226aca4dc9.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk index 9e8ff9415642..7bd86ff15945 100644 --- a/package/edk2-platforms/edk2-platforms.mk +++ b/package/edk2-platforms/edk2-platforms.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_PLATFORMS_VERSION = b71f2bda9e4fc183068eef5d1d90a631181a2506 +EDK2_PLATFORMS_VERSION = e509ac5a729ebe2a3bc905aed1df23226aca4dc9 EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent EDK2_PLATFORMS_LICENSE_FILES = License.txt From a51213b2702853e7897aa1f8be3a679280ab5e24 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 27 Aug 2023 16:59:56 +0200 Subject: [PATCH 1836/2890] package/edk2-non-osi: bump in sync with edk2-stable202308 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump the edk2-non-osi commit to the one corresponding to version edk2-stable202308 of edk2, based on the timestamps. Cc: Dick Olsson Cc: Vincent Stehlé Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/edk2-non-osi/edk2-non-osi.hash | 2 +- package/edk2-non-osi/edk2-non-osi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/edk2-non-osi/edk2-non-osi.hash b/package/edk2-non-osi/edk2-non-osi.hash index 2593324bc117..e4e84f1cef43 100644 --- a/package/edk2-non-osi/edk2-non-osi.hash +++ b/package/edk2-non-osi/edk2-non-osi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c048101d6532d9bb4f6450095e0b50812d9a831f7e3c119db48e5caf2bf020a6 edk2-non-osi-41876073afb7c7309018223baa1a6f8108bf23f0.tar.gz +sha256 6fe059c4ee5d4fad6245a6eb53ed6b62b8890e9481cfb52c9fbdb83a5b2e0edb edk2-non-osi-8c09bd0955338db38813e0d8ae1faa634f545f73.tar.gz sha256 38d73db2f9dfb32e1666d898cb9d7c1ccd78302dd9922d5fac4a9cf61fa872d9 Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf diff --git a/package/edk2-non-osi/edk2-non-osi.mk b/package/edk2-non-osi/edk2-non-osi.mk index 110377276817..d787c882b382 100644 --- a/package/edk2-non-osi/edk2-non-osi.mk +++ b/package/edk2-non-osi/edk2-non-osi.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_NON_OSI_VERSION = 41876073afb7c7309018223baa1a6f8108bf23f0 +EDK2_NON_OSI_VERSION = 8c09bd0955338db38813e0d8ae1faa634f545f73 EDK2_NON_OSI_SITE = $(call github,tianocore,edk2-non-osi,$(EDK2_NON_OSI_VERSION)) EDK2_NON_OSI_INSTALL_TARGET = NO EDK2_NON_OSI_INSTALL_STAGING = YES From 855f78edd40cc95f61f53cb8b01bf54c786fc74a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Aug 2023 13:18:39 +0200 Subject: [PATCH 1837/2890] package/pam: fix uclibc compile error Following build failure occurs: opasswd.c: In function 'compare_password': opasswd.c:142:3: error: 'retval' undeclared (first use in this function); did you mean 'outval'? 142 | retval = outval != NULL && strcmp(outval, oldpass) == 0; | ^~~~~~ | outval Add a patch from upstream to fix it. Happens since the update to 1.5.3 in Buildroot commit: f8147e27cdac8f998ec6644a09ce4e8d62b6433c Fixes: - http://autobuild.buildroot.net/results/576/576fc4b9ccbc6cff82569692bdec82192e89f036 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...Fix-build-if-crypt_r-isn-t-available.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch diff --git a/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch b/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch new file mode 100644 index 000000000000..c7fdd8be36b7 --- /dev/null +++ b/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch @@ -0,0 +1,37 @@ +From b82acc21f1e2f76d4cb0c75bb4958751562039ab Mon Sep 17 00:00:00 2001 +From: Bernhard Rosenkränzer +Date: Wed, 7 Jun 2023 19:49:01 +0200 +Subject: [PATCH] Fix build if crypt_r isn't available +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +retval was being defined only in #ifdef HAVE_CRYPT_R, but used +unconditionally. + +Signed-off-by: Bernhard Rosenkränzer +Fixes: bcba17939e1b ("modules: make use of secure memory erasure") +Signed-off-by: Waldemar Brodkorb +Upstream: https://github.com/linux-pam/linux-pam/commit/b82acc21f1e2f76d4cb0c75bb4958751562039ab +--- + modules/pam_pwhistory/opasswd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c +index 479e3fc4..fc610e2f 100644 +--- a/modules/pam_pwhistory/opasswd.c ++++ b/modules/pam_pwhistory/opasswd.c +@@ -128,9 +128,9 @@ static int + compare_password(const char *newpass, const char *oldpass) + { + char *outval; ++ int retval; + #ifdef HAVE_CRYPT_R + struct crypt_data output; +- int retval; + + output.initialized = 0; + +-- +2.39.2 + From 39ae14faabb82703c2cee2ddf23e5925a0f0f251 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 27 Aug 2023 17:18:28 +0200 Subject: [PATCH 1838/2890] package/mesa3d-demos: update optional opengl patch due to new glu dependency in util matrix-code from es2gears has been moved to util in version 9.0.0 [1] so now es2gears is linked with mesa3d-demo libutil (idep_util). But at the same time the dependency on glu (dep_glu) has been added to libutil [2]. dep_glu requires opengl (FULL_GL) to build. In order to keep the es2gears for egl only builds we have to split the libutil files list to build readtex.c and showbuffer.c only if opengl is available. Add back dep_glu since it's used in util's meson. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4936948236 https://gitlab.com/buildroot.org/buildroot/-/jobs/4936948042 [1] https://gitlab.freedesktop.org/mesa/demos/-/commit/c33e2f731c2eab86bbad7b6a028f8a90ea40a00c [2] https://gitlab.freedesktop.org/mesa/demos/-/commit/ef24aae22978d4d357340074ca9a1c04d9cf81e6 Signed-off-by: Romain Naour Cc: Julien Olivain Reviewed-by: Julien Olivain Tested-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...s-makes-opengl-an-optional-component.patch | 95 ++++++++++--------- 1 file changed, 50 insertions(+), 45 deletions(-) diff --git a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch index af929003db71..72bf72719c96 100644 --- a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch +++ b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch @@ -1,25 +1,44 @@ -From 9ec9f7b4d0ef5e799ca4cc5103163e4630d184d8 Mon Sep 17 00:00:00 2001 +From 5b45f98255b74589015d5cb0d8ca31d7169c9f34 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 16 Sep 2022 22:30:59 +0200 Subject: [PATCH] demos: makes opengl an optional component This patch is a port of [1] for the new meson build system. +matrix-code from es2gears has been moved to util in version 9.0.0 [2] +so now es2gears is linked with mesa3d-demo libutil (idep_util). +But at the same time the dependency on glu (dep_glu) has been added +to libutil [3]. dep_glu requires opengl (FULL_GL) to build. + +In order to keep the es2gears for egl only builds we have to +split the libutil files list to build readtex.c and showbuffer.c +only if opengl is available. + +Add back dep_glu since it's used in util's meson. + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/jobs/4936948236 +https://gitlab.com/buildroot.org/buildroot/-/jobs/4936948042 + [1]. https://git.busybox.net/buildroot/tree/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch?h=2022.08 +[2] https://gitlab.freedesktop.org/mesa/demos/-/commit/c33e2f731c2eab86bbad7b6a028f8a90ea40a00c +[3] https://gitlab.freedesktop.org/mesa/demos/-/commit/ef24aae22978d4d357340074ca9a1c04d9cf81e6 Signed-off-by: Julien Olivain [Bernd: rebased for version 9.0.0] Signed-off-by: Bernd Kuhls +[Romain: fix egl only builds in util] +Signed-off-by: Romain Naour --- - meson.build | 19 ++++++++++++------- - meson_options.txt | 1 + - src/egl/meson.build | 5 ++++- - src/meson.build | 4 +++- - 4 files changed, 20 insertions(+), 9 deletions(-) + meson.build | 5 ++++- + meson_options.txt | 1 + + src/egl/meson.build | 5 ++++- + src/util/meson.build | 12 +++++++++--- + 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build -index e1968fab..a15699d6 100644 +index 3e39b5a2..f27e1a18 100644 --- a/meson.build +++ b/meson.build @@ -39,7 +39,10 @@ add_project_arguments( @@ -34,34 +53,8 @@ index e1968fab..a15699d6 100644 dep_epoll = dependency('epoll-shim', required : false) dep_gles1 = dependency('glesv1_cm', required : get_option('gles1')) -@@ -87,15 +87,17 @@ - - dep_threads = dependency('threads') - --dep_glu = dependency('glu', required : false) --# GLU is part of OpenGL.Framework --if not dep_glu.found() and host_machine.system() != 'darwin' -- _glu_name = 'GLU' -- if host_machine.system() == 'windows' -- _glu_name = 'glu32' -+if dep_gl.found() -+ dep_glu = dependency('glu', required : false) -+ # GLU is part of OpenGL.Framework -+ if not dep_glu.found() and host_machine.system() != 'darwin' -+ _glu_name = 'GLU' -+ if host_machine.system() == 'windows' -+ _glu_name = 'glu32' -+ endif -+ dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h', -+ required : dep_x11.found()) - endif -- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h', -- required : dep_x11.found()) - endif - - dep_glx = dependency('glx', required: false, disabler : true) diff --git a/meson_options.txt b/meson_options.txt -index ddadd2e3..f5405698 100644 +index 832b916a..c954a710 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,6 @@ @@ -87,21 +80,33 @@ index d1846921..42bf8ecd 100644 if dep_gles1.found() subdir('opengles1') -diff --git a/src/meson.build b/src/meson.build -index 39cac78d..7607c6de 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -20,7 +20,9 @@ +diff --git a/src/util/meson.build b/src/util/meson.build +index b4fe614f..4420f28a 100644 +--- a/src/util/meson.build ++++ b/src/util/meson.build +@@ -22,13 +22,19 @@ inc_util = include_directories('.') - subdir('glad') + files_libutil = files( + 'glinfo_common.c', +- 'readtex.c', +- 'showbuffer.c', + 'trackball.c', + 'matrix.c', + ) --subdir('util') +-_deps = [dep_glu, dep_m] ++_deps = [dep_m] +if dep_gl.found() -+ subdir('util') ++ files_libutil += files( ++ 'readtex.c', ++ 'showbuffer.c', ++ ) ++ _deps += dep_glu +endif - ++ if dep_glut.found() - subdir('demos') + files_libutil += files('shaderutil.c') + _deps += dep_glut -- -2.37.3 +2.41.0 From 925b09f7edf97b2f57b9269c1fd73e2e6f5a9f13 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 27 Aug 2023 13:40:02 -0600 Subject: [PATCH 1839/2890] package/python-distlib: new host package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/python-distlib/python-distlib.hash | 5 +++++ package/python-distlib/python-distlib.mk | 14 ++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 package/python-distlib/python-distlib.hash create mode 100644 package/python-distlib/python-distlib.mk diff --git a/DEVELOPERS b/DEVELOPERS index eba7c4aa343a..3af43d2d2713 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1431,6 +1431,7 @@ F: package/python-cbor2/ F: package/python-cchardet/ F: package/python-charset-normalizer/ F: package/python-cssselect2/ +F: package/python-distlib/ F: package/python-editables/ F: package/python-flatbuffers/ F: package/python-fonttools/ diff --git a/package/python-distlib/python-distlib.hash b/package/python-distlib/python-distlib.hash new file mode 100644 index 000000000000..506d10824c95 --- /dev/null +++ b/package/python-distlib/python-distlib.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/distlib/json +md5 44e4357e35bbd77fdf1b81e174e34f20 distlib-0.3.7.tar.gz +sha256 9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8 distlib-0.3.7.tar.gz +# Locally computed sha256 checksums +sha256 808e10c8a6ab8deb149ff9b3fb19f447a808094606d712a9ca57fead3552599d LICENSE.txt diff --git a/package/python-distlib/python-distlib.mk b/package/python-distlib/python-distlib.mk new file mode 100644 index 000000000000..cae025dbdbd6 --- /dev/null +++ b/package/python-distlib/python-distlib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-distlib +# +################################################################################ + +PYTHON_DISTLIB_VERSION = 0.3.7 +PYTHON_DISTLIB_SOURCE = distlib-$(PYTHON_DISTLIB_VERSION).tar.gz +PYTHON_DISTLIB_SITE = https://files.pythonhosted.org/packages/29/34/63be59bdf57b3a8a8dcc252ef45c40f3c018777dc8843d45dd9b869868f0 +PYTHON_DISTLIB_SETUP_TYPE = setuptools +PYTHON_DISTLIB_LICENSE = PSF-2.0 +PYTHON_DISTLIB_LICENSE_FILES = LICENSE.txt + +$(eval $(host-python-package)) From d8e9505922cf76ff498e6cd31dd7e543f9b0dc4b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 27 Aug 2023 13:40:03 -0600 Subject: [PATCH 1840/2890] package/qemu: add recommended host-python-distlib dependency The docs here: https://wiki.qemu.org/ChangeLog/8.1#Build_Dependencies Indicates: It is recommended to install distlib as well, but the build process tries to cope with its absence and it shouldn't be necessary. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 84166958bb58..4d2135a3c6d8 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -26,6 +26,7 @@ QEMU_DEPENDENCIES = \ host-meson \ host-pkgconf \ host-python3 \ + host-python-distlib \ libglib2 \ zlib @@ -339,6 +340,7 @@ HOST_QEMU_DEPENDENCIES = \ host-pixman \ host-pkgconf \ host-python3 \ + host-python-distlib \ host-slirp \ host-zlib From 3fa1ae00681ca17fb709dcf1e281b8ee0ede0d5f Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Wed, 12 Jul 2023 19:01:19 -0300 Subject: [PATCH 1841/2890] package/qemu: add option to enable tracing Tracing is a development feature for debugging, profiling, and observing QEMU execution. It does not make sense to enable it by default, so add a config to enable the "log" tracing backend (the default one). Options to select other backends may be added in the future. Also pull a patch already reviewed upstream to install the trace events file only if necessary: https://patchwork.kernel.org/project/qemu-devel/patch/20230408010410.281263-1-casantos@redhat.com/ Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- ...-trace-events-file-only-if-necessary.patch | 30 +++++++++++++++++++ package/qemu/Config.in | 9 ++++++ package/qemu/qemu.mk | 6 ++++ 3 files changed, 45 insertions(+) create mode 100644 package/qemu/0004-tracing-install-trace-events-file-only-if-necessary.patch diff --git a/package/qemu/0004-tracing-install-trace-events-file-only-if-necessary.patch b/package/qemu/0004-tracing-install-trace-events-file-only-if-necessary.patch new file mode 100644 index 000000000000..36bdaa4978ad --- /dev/null +++ b/package/qemu/0004-tracing-install-trace-events-file-only-if-necessary.patch @@ -0,0 +1,30 @@ +From 5c43da1e4983cc3c209b325a5228b6149e0a0ccf Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Fri, 24 Mar 2023 21:40:22 -0300 +Subject: [PATCH] tracing: install trace events file only if necessary + +It is not useful when configuring with --enable-trace-backends=nop. + +Upstream: https://patchwork.kernel.org/project/qemu-devel/patch/20230408010410.281263-1-casantos@redhat.com/ +Signed-off-by: Carlos Santos +Signed-off-by: Carlos Santos +--- + trace/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/trace/meson.build b/trace/meson.build +index 8e80be895c..30b1d942eb 100644 +--- a/trace/meson.build ++++ b/trace/meson.build +@@ -64,7 +64,7 @@ trace_events_all = custom_target('trace-events-all', + input: trace_events_files, + command: [ 'cat', '@INPUT@' ], + capture: true, +- install: true, ++ install: get_option('trace_backends') != [ 'nop' ], + install_dir: qemu_datadir) + + if 'ust' in get_option('trace_backends') +-- +2.31.1 + diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 6fb34a0dae09..8d53ced300f7 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -106,6 +106,15 @@ config BR2_PACKAGE_QEMU_FDT Say 'y' here to have QEMU capable of constructing Device Trees, and passing them to the VMs. +config BR2_PACKAGE_QEMU_TRACING + bool "Enable tracing" + help + Say 'y' to enable the "log" tracing infrastructure in QEMU, + used for debugging, profiling, and observing execution. For + detailed documentation, see + + https://www.qemu.org/docs/master/devel/tracing.html + endif # BR2_PACKAGE_QEMU_SYSTEM comment "systems emulation needs a toolchain w/ dynamic library" diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 4d2135a3c6d8..87ecad5b522b 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -160,6 +160,12 @@ else QEMU_OPTS += --disable-fdt endif +ifeq ($(BR2_PACKAGE_QEMU_TRACING),y) +QEMU_OPTS += --enable-trace-backends=log +else +QEMU_OPTS += --enable-trace-backends=nop +endif + ifeq ($(BR2_PACKAGE_QEMU_TOOLS),y) QEMU_OPTS += --enable-tools else From 84b0d834a4a0b0fab4bf80d85533db7b5975a09e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 2 Sep 2023 18:29:02 +0200 Subject: [PATCH 1842/2890] package/mesa3d-demos: add dependency on libxkbcommon for wayland support Since the bump of mesa3d-demos to version 9.0.0 in Buildroot commit 80304d9911f34f8a0173a4f37d52f93177478cc7, libxkbcommon is needed for the wayland support. Without libxkbcommon, the build fails with: Run-time dependency wayland-client, wayland-egl, xkbcommon found: NO (tried pkgconfig and cmake) ../output-1/build/mesa3d-demos-9.0.0/meson.build:62:14: ERROR: Dependency "wayland-client, wayland-egl, xkbcommon" not found, tried pkgconfig and cmake Fixes: http://autobuild.buildroot.net/results/1c01da4966b054de9c15f0eb3d738806c7d5d315/ Signed-off-by: Bernd Kuhls [Thomas: patch extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20230716145003.339645-2-bernd@kuhls.net/] Signed-off-by: Thomas Petazzoni --- package/mesa3d-demos/Config.in | 1 + package/mesa3d-demos/mesa3d-demos.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mesa3d-demos/Config.in b/package/mesa3d-demos/Config.in index 7848bb6faf6f..1761494c3a19 100644 --- a/package/mesa3d-demos/Config.in +++ b/package/mesa3d-demos/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_MESA3D_DEMOS select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND help OpenGL demos from the Mesa 3D project. diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 29cb00bb8a42..a9c92836600c 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -63,7 +63,7 @@ MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -MESA3D_DEMOS_DEPENDENCIES += wayland +MESA3D_DEMOS_DEPENDENCIES += libxkbcommon wayland MESA3D_DEMOS_CONF_OPTS += -Dwayland=enabled else MESA3D_DEMOS_CONF_OPTS += -Dwayland=disabled From cb4e9360b4a2b225a627dc37b7da24bd265e8065 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Jul 2023 16:50:02 +0200 Subject: [PATCH 1843/2890] package/libdecor: new package Needed for wayland support in mesa3d-demos. Signed-off-by: Bernd Kuhls Reviewed-by: Sebastian Weyer Tested-by: Sebastian Weyer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libdecor/Config.in | 25 +++++++++++++++++++++++++ package/libdecor/libdecor.hash | 3 +++ package/libdecor/libdecor.mk | 22 ++++++++++++++++++++++ 5 files changed, 52 insertions(+) create mode 100644 package/libdecor/Config.in create mode 100644 package/libdecor/libdecor.hash create mode 100644 package/libdecor/libdecor.mk diff --git a/DEVELOPERS b/DEVELOPERS index 9b500f3701a5..26d0a0c22315 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -365,6 +365,7 @@ F: package/libcec/ F: package/libcodec2/ F: package/libcrossguid/ F: package/libde265/ +F: package/libdecor/ F: package/libdeflate/ F: package/libdisplay-info/ F: package/libdrm/ diff --git a/package/Config.in b/package/Config.in index 54cddc39140d..42a9ec59d1a7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1608,6 +1608,7 @@ menu "Graphics" source "package/leptonica/Config.in" source "package/lesstif/Config.in" source "package/libart/Config.in" + source "package/libdecor/Config.in" source "package/libdmtx/Config.in" source "package/libdri2/Config.in" source "package/libdrm/Config.in" diff --git a/package/libdecor/Config.in b/package/libdecor/Config.in new file mode 100644 index 000000000000..782fe855b4a7 --- /dev/null +++ b/package/libdecor/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_LIBDECOR + bool "libdecor" + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_USE_MMU # pango + depends on BR2_USE_WCHAR # pango + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango + depends on BR2_INSTALL_LIBSTDCPP # pango + depends on BR2_TOOLCHAIN_HAS_THREADS # pango, wayland + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_PANGO + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + help + libdecor is a library that can help Wayland clients draw + window decorations for them. It aims to provide multiple + backends that implements the decoration drawing. + + https://gitlab.freedesktop.org/libdecor/libdecor + +comment "libdecor needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libdecor/libdecor.hash b/package/libdecor/libdecor.hash new file mode 100644 index 000000000000..9e51e9059375 --- /dev/null +++ b/package/libdecor/libdecor.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 82adece5baeb6194292b0d1a91b4b3d10da41115f352a5e6c5844b20b88a0512 libdecor-0.1.1.tar.gz +sha256 508a77d2e7b51d98adeed32648ad124b7b30241a8e70b2e72c99f92d8e5874d1 LICENSE diff --git a/package/libdecor/libdecor.mk b/package/libdecor/libdecor.mk new file mode 100644 index 000000000000..b9657262924d --- /dev/null +++ b/package/libdecor/libdecor.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# libdecor +# +################################################################################ + +LIBDECOR_VERSION = 0.1.1 +LIBDECOR_SITE = https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/$(LIBDECOR_VERSION) +LIBDECOR_LICENSE = MIT +LIBDECOR_LICENSE_FILES = LICENSE +LIBDECOR_INSTALL_STAGING = YES +LIBDECOR_DEPENDENCIES = cairo pango wayland wayland-protocols +LIBDECOR_CONF_OPTS = -Ddemo=false + +ifeq ($(BR2_PACKAGE_DBUS),y) +LIBDECOR_CONF_OPTS += -Ddbus=enabled +LIBDECOR_DEPENDENCIES += dbus +else +LIBDECOR_CONF_OPTS += -Ddbus=disabled +endif + +$(eval $(meson-package)) From 7ec2df1e9a65c41a542a796d5b65b13f0db45742 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Jul 2023 16:50:03 +0200 Subject: [PATCH 1844/2890] package/mesa3d-demos: add dependency on libdecor for wayland support libdecor cannot be selected due to a circular dependency: package/wayland/Config.in:1:error: recursive dependency detected! package/wayland/Config.in:1: symbol BR2_PACKAGE_WAYLAND is selected by BR2_PACKAGE_LIBDECOR package/libdecor/Config.in:1: symbol BR2_PACKAGE_LIBDECOR is selected by BR2_PACKAGE_MESA3D_DEMOS package/mesa3d-demos/Config.in:1: symbol BR2_PACKAGE_MESA3D_DEMOS is selected by BR2_PACKAGE_PIGLIT package/piglit/Config.in:1: symbol BR2_PACKAGE_PIGLIT depends on BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND package/waffle/Config.in:7: symbol BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND depends on BR2_PACKAGE_WAYLAND Without libdecor, the build fails since the bump of mesa3d-demos to version 9.0.0 in 80304d9911f34f8a0173a4f37d52f93177478cc7: """ Run-time dependency libdecor-0 found: NO (tried pkgconfig and cmake) Looking for a fallback subproject for the dependency libdecor-0 ../output-1/build/mesa3d-demos-9.0.0/meson.build:88:17: ERROR: Automatic wrap-based subproject downloading is disabled """ Fixes: http://autobuild.buildroot.net/results/8de50be8233f0133aadc26bda71b48d7ec329e04/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-demos/mesa3d-demos.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index a9c92836600c..8acba9270af5 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -62,8 +62,8 @@ else MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif -ifeq ($(BR2_PACKAGE_WAYLAND),y) -MESA3D_DEMOS_DEPENDENCIES += libxkbcommon wayland +ifeq ($(BR2_PACKAGE_LIBDECOR)$(BR2_PACKAGE_WAYLAND),yy) +MESA3D_DEMOS_DEPENDENCIES += libdecor libxkbcommon wayland MESA3D_DEMOS_CONF_OPTS += -Dwayland=enabled else MESA3D_DEMOS_CONF_OPTS += -Dwayland=disabled From fea8852c681c26a785557353caea4a669dcc35be Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 2 Sep 2023 23:40:31 +0200 Subject: [PATCH 1845/2890] package/poppler: backport patch to fix CVE-2023-34872 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...em-open-Fix-crash-on-malformed-files.patch | 45 +++++++++++++++++++ package/poppler/poppler.mk | 2 + 2 files changed, 47 insertions(+) create mode 100644 package/poppler/0001-OutlineItem-open-Fix-crash-on-malformed-files.patch diff --git a/package/poppler/0001-OutlineItem-open-Fix-crash-on-malformed-files.patch b/package/poppler/0001-OutlineItem-open-Fix-crash-on-malformed-files.patch new file mode 100644 index 000000000000..478759e0ccf2 --- /dev/null +++ b/package/poppler/0001-OutlineItem-open-Fix-crash-on-malformed-files.patch @@ -0,0 +1,45 @@ +From e5cc11e0b5b867f4705fd28ff1b981c1224be1cd Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 17 May 2023 22:42:05 +0200 +Subject: [PATCH] OutlineItem::open: Fix crash on malformed files + +Fixes #1399 + +Upstream: https://gitlab.freedesktop.org/poppler/poppler/-/commit/591235c8b6c65a2eee88991b9ae73490fd9afdfe +[Thomas: backported to fix CVE-2023-34872] +Signed-off-by: Thomas Petazzoni +--- + poppler/Outline.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/poppler/Outline.cc b/poppler/Outline.cc +index cbb6cb49..4c68be99 100644 +--- a/poppler/Outline.cc ++++ b/poppler/Outline.cc +@@ -14,7 +14,7 @@ + // under GPL version 2 or later + // + // Copyright (C) 2005 Marco Pesenti Gritti +-// Copyright (C) 2008, 2016-2019, 2021 Albert Astals Cid ++// Copyright (C) 2008, 2016-2019, 2021, 2023 Albert Astals Cid + // Copyright (C) 2009 Nick Jones + // Copyright (C) 2016 Jason Crain + // Copyright (C) 2017 Adrian Johnson +@@ -483,8 +483,12 @@ void OutlineItem::open() + { + if (!kids) { + Object itemDict = xref->fetch(ref); +- const Object &firstRef = itemDict.dictLookupNF("First"); +- kids = readItemList(this, &firstRef, xref, doc); ++ if (itemDict.isDict()) { ++ const Object &firstRef = itemDict.dictLookupNF("First"); ++ kids = readItemList(this, &firstRef, xref, doc); ++ } else { ++ kids = new std::vector(); ++ } + } + } + +-- +2.41.0 + diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 5524bfc420f7..4c6017a5f50e 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -11,6 +11,8 @@ POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING POPPLER_CPE_ID_VENDOR = freedesktop +# 0001-OutlineItem-open-Fix-crash-on-malformed-files.patch +POPPLER_IGNORE_CVES += CVE-2023-34872 POPPLER_INSTALL_STAGING = YES POPPLER_CONF_OPTS = \ From f3ab33c62fac662b5f0aca9f4342d798a41e2736 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 2 Sep 2023 23:40:32 +0200 Subject: [PATCH 1846/2890] package/poppler: bump version to latest in 22.x series This commit updates poppler to the latest version in the 22.x series, with only has bug fixes. Here is the list of commits between 22.10.0 and 22.12.0: df568263c51950ceed6f1fb42f80e99a2614c275 (tag: poppler-22.12.0) poppler 22.12.0 198dc1d0674c0a462668e6868c35b1ee0e731005 Form::addFontToDefaultResources: Be stubborn in finding a font we can use a5952ab70716a2d4f792a943c2dcf3068f1d6885 Revert "CI: Fix Debian brokenness" 8fcaa7c622d24761a9ecb3922f95d072077d6f34 CI: Fix Debian brokenness cc665f757af6b87dd245d36e079dd44d8d2d2182 (tag: poppler-22.11.0) poppler 22.11.0 a296982e1d5b4968b2bd044d80647ae6f9267526 Do not include a poppler/ file from a splash/ header bc4a0d9a2abfcd75d9b0ee4be3f7600905fe6001 Form: Provide Unicode marker when ensuring fonts 111f38a722eedddd94faa52dda8c5e0da561fb41 Cairo: Update font after restore 907d05a6a141284aee22fbd16ab0a2fb4e0f2724 Fix crash in file that wants to do huge transparency group e53f5aae3bce7d09788f2ad62be998895fb9807b PSOutputDev::setupResources: Fix stack overflow in malformed doc a4ca3a96a6b1f65b335a1ea362e6c202e46ae055 topIdx can't be negative e471f8e09bf2e38df0cf5df1acecbcca70685573 Init all the fields of JPXStreamPrivate 5190c0d4369bd9f501922585140be4ec736e24f2 No need to store smaskInData in priv 6263bb90b09326103b10e4c4edfbc5b84c884921 Page label ranges can't start in < 0 Note: this version bump does not include the fix for CVE-2023-34872, so we still need the backported patch. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/poppler/poppler.hash | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash index 93681e04af28..bb07b2ee6af3 100644 --- a/package/poppler/poppler.hash +++ b/package/poppler/poppler.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 04e40fad924a6de62e63017a6fd4c04696c1f526dedc2ba5ef275cedf646292a poppler-22.10.0.tar.xz +sha256 d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0 poppler-22.12.0.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 4c6017a5f50e..776fb4d5667f 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -4,7 +4,7 @@ # ################################################################################ -POPPLER_VERSION = 22.10.0 +POPPLER_VERSION = 22.12.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = https://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf From 2397349fa99787a4ccbf75917e113087fa1a67d3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Sep 2023 00:12:17 +0200 Subject: [PATCH 1847/2890] package/python-django: security bump to 4.1.10 4.1.9 is affected by CVE-2023-36053, and 4.1.10 was released to fix it. The changes between 4.1.9 and 4.1.10 are just: f9a14b8f0668029fb7e0aebcae57b60dcec4a529 (tag: 4.1.10) [4.1.x] Bumped version for 4.1.10 release. beb3f3d55940d9aa7198bf9d424ab74e873aec3d [4.1.x] Fixed CVE-2023-36053 -- Prevented potential ReDoS in EmailValidator and URLValidator. 3b48fe413f91612fb8c43fe9d489860d10c84bf7 [4.1.x] Added stub release notes for 4.1.10 and 3.2.20. 0e5948b8df5d25deb48a505cbf16f010d9dc603c [4.1.x] Fixed MultipleFileFieldTest.test_file_multiple_validation() test if Pillow isn't installed. 66e1e9b006618ba00e804d18bd90d3a9e94801b3 [4.1.x] Added CVE-2023-31047 to security archive. d1385cc51b142b05b21b721d9d68fc461bc7241f [4.1.x] Post-release version bump. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 922f468a67ad..ee1776b44fec 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 1a6f4e5318e3272deaa9cfd61e252fab Django-4.1.9.tar.gz -sha256 e9f074a84930662104871bfcea55c3c180c50a0a47739db82435deae6cbaf032 Django-4.1.9.tar.gz +md5 3720c85a8c25cacbce2f95d345d0f5ad Django-4.1.10.tar.gz +sha256 56343019a9fd839e2e5bf203daf45f25af79d5bffa4c71d56eae4f4404d82ade Django-4.1.10.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index fa58f657978f..61dfd54dcd1d 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,11 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.9 +PYTHON_DJANGO_VERSION = 4.1.10 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/11/ea/8b514434c57c3bef89a475b75f74d768471d8e1bc61f4e5c79daeae9b5ef - +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/70/d4/eded564fa5928f68771d082ec0eef4d023f9d19dfa1d2923305bc3e62afe PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From 57229c22f17fa892c18dff1e424dedc7e3d05358 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Sep 2023 00:14:24 +0200 Subject: [PATCH 1848/2890] package/python-pip: ignore CVE-2018-20225 See https://security-tracker.debian.org/tracker/CVE-2018-20225 for the rationale of ignoring this CVE. Things basically work as intended. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/python-pip/python-pip.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 35ad7bede26d..040767930e79 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -12,6 +12,9 @@ PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt PYTHON_PIP_CPE_ID_VENDOR = pypa PYTHON_PIP_CPE_ID_PRODUCT = pip +# Disputed CVE: things work as designed, and only affects the +# --extra-index-url option. This CVE will never be fixed. +PYTHON_PIP_IGNORE_CVES += CVE-2018-20225 $(eval $(python-package)) $(eval $(host-python-package)) From 317c4b8f60d1c81a87cb16d01a4f15ac733d858e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Sep 2023 00:31:28 +0200 Subject: [PATCH 1849/2890] package/python-tornado: backport fix for CVE-2023-28370 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...n-open-redirect-in-StaticFileHandler.patch | 42 +++++++++++++++++++ package/python-tornado/python-tornado.mk | 2 + 2 files changed, 44 insertions(+) create mode 100644 package/python-tornado/0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch diff --git a/package/python-tornado/0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch b/package/python-tornado/0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch new file mode 100644 index 000000000000..357c6f2f129c --- /dev/null +++ b/package/python-tornado/0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch @@ -0,0 +1,42 @@ +From ac79778c91bd9a4a92111f7e06d4b12674571113 Mon Sep 17 00:00:00 2001 +From: Ben Darnell +Date: Sat, 13 May 2023 20:58:52 -0400 +Subject: [PATCH] web: Fix an open redirect in StaticFileHandler + +Under some configurations the default_filename redirect could be exploited +to redirect to an attacker-controlled site. This change refuses to redirect +to URLs that could be misinterpreted. + +A test case for the specific vulnerable configuration will follow after the +patch has been available. + +Upstream: https://github.com/tornadoweb/tornado/commit/32ad07c54e607839273b4e1819c347f5c8976b2f +[Thomas: backported to fix CVE-2023-28370] +Signed-off-by: Thomas Petazzoni +--- + tornado/web.py | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/tornado/web.py b/tornado/web.py +index cd6a81b4..05b571eb 100644 +--- a/tornado/web.py ++++ b/tornado/web.py +@@ -2806,6 +2806,15 @@ class StaticFileHandler(RequestHandler): + # but there is some prefix to the path that was already + # trimmed by the routing + if not self.request.path.endswith("/"): ++ if self.request.path.startswith("//"): ++ # A redirect with two initial slashes is a "protocol-relative" URL. ++ # This means the next path segment is treated as a hostname instead ++ # of a part of the path, making this effectively an open redirect. ++ # Reject paths starting with two slashes to prevent this. ++ # This is only reachable under certain configurations. ++ raise HTTPError( ++ 403, "cannot redirect path with two initial slashes" ++ ) + self.redirect(self.request.path + "/", permanent=True) + return None + absolute_path = os.path.join(absolute_path, self.default_filename) +-- +2.41.0 + diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index 2af86ecb18a0..f4a4c97d2a20 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -12,5 +12,7 @@ PYTHON_TORNADO_LICENSE_FILES = LICENSE PYTHON_TORNADO_CPE_ID_VENDOR = tornadoweb PYTHON_TORNADO_CPE_ID_PRODUCT = tornado PYTHON_TORNADO_SETUP_TYPE = setuptools +# 0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch +PYTHON_TORNADO_IGNORE_CVES += CVE-2023-28370 $(eval $(python-package)) From a9c74c5b7f4b2fb35ee32c2f1f8fffdd16d4db85 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Sep 2023 00:07:50 +0200 Subject: [PATCH 1850/2890] package/python-ipython: ignore CVE-2023-24816 It affects only Windows, so we don't care in the context of Buildroot. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/python-ipython/python-ipython.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index f5a114c2f308..aa274314eb9a 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -11,6 +11,8 @@ PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython PYTHON_IPYTHON_CPE_ID_PRODUCT = ipython +# Affects only Windows. Can be dropped once we update to >= 8.10.0 +PYTHON_IPYTHON_IGNORE_CVES += CVE-2023-24816 PYTHON_IPYTHON_SETUP_TYPE = setuptools $(eval $(python-package)) From 19921699b3aaed330343e65418ddca6833bb3cd1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 2 Sep 2023 19:21:03 +0200 Subject: [PATCH 1851/2890] package/pixman: ignore CVE-2023-37769 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pixman/pixman.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 6e6d787d27e6..37eb974c46cb 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -24,6 +24,13 @@ PIXMAN_CONF_OPTS = \ --disable-loongson-mmi \ --disable-arm-iwmmxt +# Affects only tests, and we don't build tests (see +# 0001-Disable-tests.patch). See +# https://gitlab.freedesktop.org/pixman/pixman/-/issues/76, which says +# "not sure why NVD keeps assigning CVEs like this. This is just a +# test executable". +PIXMAN_IGNORE_CVES += CVE-2023-37769 + # The ARM SIMD code from pixman requires a recent enough ARM core, but # there is a runtime CPU check that makes sure it doesn't get used if # the HW doesn't support it. The only case where the ARM SIMD code From b7488b4d685657e7d724d18ab1e7982e2148e271 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 4 Sep 2023 18:34:36 +0200 Subject: [PATCH 1852/2890] package/libtommath: security bump to version 1.2.1 This is a bugfix release only containing the fix to a potential integer underflow which got assigned CVE-2023-36328. Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- .../0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch | 2 +- package/libtommath/libtommath.hash | 2 +- package/libtommath/libtommath.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch b/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch index c25002ba7042..1cf411b3913c 100644 --- a/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch +++ b/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch @@ -20,7 +20,7 @@ diff --git a/demo/test.c b/demo/test.c index 998f14b3..f719709d 100644 --- a/demo/test.c +++ b/demo/test.c -@@ -522,7 +522,7 @@ static int test_mp_invmod(void) +@@ -625,7 +625,7 @@ static int test_mp_invmod(void) } diff --git a/package/libtommath/libtommath.hash b/package/libtommath/libtommath.hash index 9af489ef1a37..4f5dd40231a6 100644 --- a/package/libtommath/libtommath.hash +++ b/package/libtommath/libtommath.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1 ltm-1.2.0.tar.xz +sha256 986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f ltm-1.2.1.tar.xz # Hashes for license files: sha256 2fa64b163659f41965c9815882a8296d3d03ff546b76153e11445f9bdecf955a LICENSE diff --git a/package/libtommath/libtommath.mk b/package/libtommath/libtommath.mk index bd3957d6c25e..25d4e836bbd7 100644 --- a/package/libtommath/libtommath.mk +++ b/package/libtommath/libtommath.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTOMMATH_VERSION = 1.2.0 +LIBTOMMATH_VERSION = 1.2.1 LIBTOMMATH_SITE = https://github.com/libtom/libtommath/releases/download/v$(LIBTOMMATH_VERSION) LIBTOMMATH_SOURCE = ltm-$(LIBTOMMATH_VERSION).tar.xz LIBTOMMATH_LICENSE = Unlicense From 0ef48995a14389a2d8a40fa47ba0d0a731903fc5 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2023 11:20:52 -0600 Subject: [PATCH 1853/2890] package/zeromq: Fix building against gcc-13 `gcc-13` added an assert to standard headers to make sure custom allocators have intended implementation of rebind type instead of inherited rebind. gcc change: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7 Taken from upstream commit bdd471fa17100fe84f64da348951dab3ee4780bb Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- .../0001-define-missing-rebind-type.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/zeromq/0001-define-missing-rebind-type.patch diff --git a/package/zeromq/0001-define-missing-rebind-type.patch b/package/zeromq/0001-define-missing-rebind-type.patch new file mode 100644 index 000000000000..f7484931e8a4 --- /dev/null +++ b/package/zeromq/0001-define-missing-rebind-type.patch @@ -0,0 +1,62 @@ +From 438d5d88392baffa6c2c5e0737d9de19d6686f0d Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Tue, 20 Dec 2022 21:45:16 +0000 +Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type + +`gcc-13` added an assert to standard headers to make sure custom +allocators have intended implementation of rebind type instead +of inherited rebind. gcc change: + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7 + +Without the fix build fails on this week's `gcc-13` as: + + [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o + In file included from /<>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34, + from /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64, + from /<>/gcc-13.0.0/include/c++/13.0.0/memory:69, + from tests/../src/secure_allocator.hpp:42, + from tests/../src/curve_client_tools.hpp:49, + from tests/test_security_curve.cpp:53: + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind, unsigned char, void>': + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t; _Up = unsigned char]' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template template using std::allocator_traits< >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t]' + /<>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits, unsigned char>::rebind' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base >' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector >' + tests/../src/curve_client_tools.hpp:64:76: required from here + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits::rebind_alloc must be A + 70 | _Tp>::value, + | ^~~~~ + +The change adds trivial `rebind` definition with expected return type +and satisfies conversion requirements. + +Upstream: merged. Commit: bdd471fa17100fe84f64da348951dab3ee4780bb +Signed-off-by: Sergei Trofimovich +Signed-off-by: Adam Duskett +--- + src/secure_allocator.hpp | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/secure_allocator.hpp b/src/secure_allocator.hpp +index e0871dcc99..5e97368911 100644 +--- a/src/secure_allocator.hpp ++++ b/src/secure_allocator.hpp +@@ -99,6 +99,17 @@ bool operator!= (const secure_allocator_t &, const secure_allocator_t &) + #else + template struct secure_allocator_t : std::allocator + { ++ secure_allocator_t () ZMQ_DEFAULT; ++ ++ template ++ secure_allocator_t (const secure_allocator_t &) ZMQ_NOEXCEPT ++ { ++ } ++ ++ template struct rebind ++ { ++ typedef secure_allocator_t other; ++ }; + }; + #endif + } From 79c7a67a4cbc93cdff3f70797b7a24fb09d17b11 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 3 Sep 2023 22:06:05 +0200 Subject: [PATCH 1854/2890] package/dt: fix Kconfig package URL The old package URL is no longer working. This commit updates it to the one advertised at [1]. [1] https://github.com/RobinTMiller/dt/blob/b30eb7a123cfba900f26ceda413ea8ae49c3817e/html/dt.html#L33 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/dt/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dt/Config.in b/package/dt/Config.in index 826a66ebd5d6..af20cc9bcad7 100644 --- a/package/dt/Config.in +++ b/package/dt/Config.in @@ -18,4 +18,4 @@ config BR2_PACKAGE_DT before exiting. Since verification of data is performed, dt can be thought of as a generic diagnostic tool. - http://www.scsifaq.org/RMiller_Tools/dt.html + https://github.com/RobinTMiller/dt From d8ce1deff96c48a5d5dacf0ab82d9bce92c8cc6c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 6 Sep 2023 21:54:35 +0200 Subject: [PATCH 1855/2890] Update for 2023.08 Signed-off-by: Peter Korsgaard --- CHANGES | 14 ++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 18 ++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index b17193a12c78..260e8839732d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +2023.08, released September 6th, 2023 + + Various fixes. + + Defconfigs: BeagleV: Fix build issue with binutils >= + 2.38. Hifive unleashed: U-Boot needs OpenSSL + + Updated/fixed packages: dt, grub2, heirloom-mailx, libgpgme, + libtommath, libxcrypt, log4cxx, mesa3d-demos, openjdk, + openjdk-bin, pam, pcm-tools, pixman, poppler, python-django, + python-ipython, python-pip, python-tornado, zeromq + + New packages: libdecor + 2023.08-rc3, released August 29th, 2023 Fixes all over the tree. diff --git a/Makefile b/Makefile index 8c7327356ef4..d017b7e0eb85 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.08-rc3 +export BR2_VERSION := 2023.08 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1693313000 +BR2_VERSION_EPOCH = 1694030000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 725cf62b2c7a..46db748c8237 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,40 +42,40 @@

                          buildroot-2023.02.4.tar.xz

                          -

                          Latest stable release: 2023.05.2

                          +

                          Latest stable release: 2023.08

                          - +
                          - +
                          -

                          buildroot-2023.05.2.tar.gz

                          -

                          PGP signature

                          +

                          buildroot-2023.08.tar.gz

                          +

                          PGP signature

                          - +
                          - +
                          -

                          buildroot-2023.05.2.tar.xz

                          -

                          PGP signature

                          +

                          buildroot-2023.08.tar.xz

                          +

                          PGP signature

                          - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
                        diff --git a/docs/website/news.html b/docs/website/news.html index aeca36bc6875..2983d385b2e2 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,24 @@

                        News

                          +
                        • +
                          +
                          +
                          +

                          2023.08 released

                          +

                          6 September 2023

                          +
                          +
                          +

                          The stable 2023.08 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2023.08 release.

                          +
                          +
                          +
                          • +
                        • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 75aae858b7d4..340d931d1a31 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.05.2' +RELEASE='2023.08' ### Change here for more memory/cores ### VM_MEMORY=2048 From 8c79ba009d66aa0998b15beb75836c35d521ebd2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 6 Sep 2023 22:56:43 +0200 Subject: [PATCH 1856/2890] docs/website/news.html: add 2023.08 announcement link Signed-off-by: Peter Korsgaard --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index 2983d385b2e2..1eeb162e1018 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

                          2023.08 released

                          The stable 2023.08 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2023.08 release.

                          From 56c674e155175ed696d6d300ed323510c1f6ff4c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 6 Sep 2023 22:57:36 +0200 Subject: [PATCH 1857/2890] Kickoff 2023.11 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d017b7e0eb85..19bd8268344b 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.08 +export BR2_VERSION := 2023.11-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1694030000 From 4e80116562a126e4ea0936b6a052e269f660b71e Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 7 Sep 2023 11:23:24 +0200 Subject: [PATCH 1858/2890] package/docker-engine: bump version to v24.0.6 Bug fixes in containerd storage backend and Docker itself and a single new warning about old Docker image format deprecation. https://github.com/moby/moby/releases/tag/v24.0.6 Signed-off-by: Stefan Agner Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 061999464ea9..7a8b17d3f312 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 837d7d667fb64508bf6e53cb5915b4b5ef356599294ffdd5ca8678168230cb38 docker-engine-24.0.5.tar.gz +sha256 29a8ee54e9ea008b40eebca42dec8b67ab257eb8ac175f67e79c110e4187d7d2 docker-engine-24.0.6.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 22cd2c58ed7b..a8f47254a459 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 24.0.5 +DOCKER_ENGINE_VERSION = 24.0.6 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 9204d644a9e81bb51b938a4fe09f7ff9ea5e974c Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 7 Sep 2023 11:23:25 +0200 Subject: [PATCH 1859/2890] package/docker-cli: bump version to v24.0.6 Bug fixes in containerd storage backend and Docker itself and a single new warning about old Docker image format deprecation. https://github.com/moby/moby/releases/tag/v24.0.6 Signed-off-by: Stefan Agner Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 95050be88bbb..5d8c1b0f591d 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fa32b5f3c2f85fba9ef6e1b5099a4b608fa20af45ba71b3da2194e8728037eec docker-cli-24.0.5.tar.gz +sha256 c1a4a580ced3633e489c5c9869a20198415da44df7023fdc200d425cdf5fa652 docker-cli-24.0.6.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 4c38e7cba568..53c9ddb6b804 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 24.0.5 +DOCKER_CLI_VERSION = 24.0.6 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From f9abda63520b0b2c14353af90b9b6160d4fadea9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 8 Sep 2023 12:09:08 +0200 Subject: [PATCH 1860/2890] package/gmp: fix !RISC-V RVM conditional after merge of next This was added both on master and next, but the symbol was also renamed in next by commit cbd91e89e43d6 (arch/Config.in.riscv: allow extensions for generic) and resolved wrong. Ensure we use the new symbol name. Signed-off-by: Peter Korsgaard --- package/gmp/gmp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 33399f51661c..bd401c6a80ea 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -21,7 +21,7 @@ GMP_CONF_OPTS += --disable-assembly endif # GMP needs M extension for riscv assembly -ifeq ($(BR2_riscv):$(BR2_RISCV_ISA_CUSTOM_RVM),y:) +ifeq ($(BR2_riscv):$(BR2_RISCV_ISA_RVM),y:) GMP_CONF_OPTS += --disable-assembly endif From 5d95b4d90dcbf412894de5439f2db55dda8e8630 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Sep 2023 13:09:51 -0700 Subject: [PATCH 1861/2890] package/go: security bump to version 1.21.1 go1.21.1 (released 2023-09-06) includes four security fixes to the cmd/go, crypto/tls, and html/template packages, as well as bug fixes to the compiler, the go command, the linker, the runtime, and the context, crypto/tls, encoding/gob, encoding/xml, go/types, net/http, os, and path/filepath packages. Security fixes: CVE-2023-39320: cmd/go: go.mod toolchain directive allows arbitrary execution CVE-2023-39318: html/template: improper handling of HTML-like comments within script contexts CVE-2023-39319: html/template: improper handling of special tags within script contexts CVE-2023-39321: crypto/tls: panic when processing post-handshake message on QUIC connections https://go.dev/doc/devel/release#go1.21.0 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 2289442a72b7..be8af438b3a6 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a go1.21.0.src.tar.gz +sha256 bfa36bf75e9a1e9cbbdb9abcf9d1707e479bd3a07880a8ae3564caee5711cb99 go1.21.1.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 04aa6122569a..aa5d7f97b504 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.0 +GO_VERSION = 1.21.1 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 9bf196ce287ecb4e772a935614132d492f5884a5 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2023 12:06:01 -0600 Subject: [PATCH 1862/2890] package/php: bump version to 8.2.10 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/php/0003-configure-disable-the-phar-tool.patch | 2 +- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/php/0003-configure-disable-the-phar-tool.patch b/package/php/0003-configure-disable-the-phar-tool.patch index ab3aecdaa397..6bfaf6640ffe 100644 --- a/package/php/0003-configure-disable-the-phar-tool.patch +++ b/package/php/0003-configure-disable-the-phar-tool.patch @@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac index 0dfab302..6026fb66 100644 --- a/configure.ac +++ b/configure.ac -@@ -1566,13 +1566,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" +@@ -1638,13 +1638,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" diff --git a/package/php/php.hash b/package/php/php.hash index 02cc1e6c7ae6..b8ff7ccc5c4e 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 1e6cb77f997613864ab3127fbfc6a8c7fdaa89a95e8ed6167617b913b4de4765 php-8.2.9.tar.xz +sha256 561dc4acd5386e47f25be76f2c8df6ae854756469159248313bcf276e282fbb3 php-8.2.10.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 836949a91747..ede09806297d 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.9 +PHP_VERSION = 8.2.10 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 1c0ec66203ca841f0d4af383403300f7024990f9 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2023 12:06:02 -0600 Subject: [PATCH 1863/2890] package/php-amqp: bump version to 2.0.0 Drop upstream patches Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 - .../0001-add-build-support-for-php-8.patch | 54 - .../php-amqp/0002-more-work-for-php-8.patch | 1265 ----------------- package/php-amqp/php-amqp.hash | 2 +- package/php-amqp/php-amqp.mk | 2 +- 5 files changed, 2 insertions(+), 1323 deletions(-) delete mode 100644 package/php-amqp/0001-add-build-support-for-php-8.patch delete mode 100644 package/php-amqp/0002-more-work-for-php-8.patch diff --git a/.checkpackageignore b/.checkpackageignore index a19453ca883e..4062d0cb9aa1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1110,8 +1110,6 @@ package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch U package/perl-net-ssleay/0001-fix-build-system.patch Upstream package/perl-sys-cpu/0001-remove-extraneous-include.patch Upstream package/perl-xml-libxml/0001-Makefile-PL.patch Upstream -package/php-amqp/0001-add-build-support-for-php-8.patch Upstream -package/php-amqp/0002-more-work-for-php-8.patch Upstream package/php-geoip/0001-add-build-support-for-php8.patch Upstream package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch Upstream package/php-lua/0001-ZEND_ACC_ALLOW_STATIC-ZEND_ACC_STATIC-for-static-met.patch Upstream diff --git a/package/php-amqp/0001-add-build-support-for-php-8.patch b/package/php-amqp/0001-add-build-support-for-php-8.patch deleted file mode 100644 index 6fe09ad3bde7..000000000000 --- a/package/php-amqp/0001-add-build-support-for-php-8.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438 Mon Sep 17 00:00:00 2001 -From: mmokhi -Date: Thu, 30 Jul 2020 11:25:33 +0200 -Subject: [PATCH] Add build support for PHP8.0 (#381) - -From upstream commit: 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438 - -Signed-off-by: mmokhi -Signed-off-by: Adam Duskett ---- - amqp_envelope.h | 7 +++++++ - php7_support.h | 11 +++++++++++ - 2 files changed, 18 insertions(+) - -diff --git a/amqp_envelope.h b/amqp_envelope.h -index e63a3a5..e315682 100644 ---- a/amqp_envelope.h -+++ b/amqp_envelope.h -@@ -20,6 +20,13 @@ - | - Jonathan Tansavatdi | - +----------------------------------------------------------------------+ - */ -+ -+#if PHP_MAJOR_VERSION >= 7 -+ #include "php7_support.h" -+#else -+ #include "php5_support.h" -+#endif -+ - extern zend_class_entry *amqp_envelope_class_entry; - - void convert_amqp_envelope_to_zval(amqp_envelope_t *amqp_envelope, zval *envelope TSRMLS_DC); -diff --git a/php7_support.h b/php7_support.h -index 47ce983..c9e8f5b 100644 ---- a/php7_support.h -+++ b/php7_support.h -@@ -101,6 +101,17 @@ typedef zval PHP5to7_zend_resource_le_t; - - #define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL - -+/* Small change to let it build after a major internal change for php8.0 -+ * More info: -+ * https://github.com/php/php-src/blob/php-8.0.0alpha3/UPGRADING.INTERNALS#L47 -+ */ -+#if PHP_MAJOR_VERSION >= 8 -+# define TSRMLS_DC -+# define TSRMLS_D -+# define TSRMLS_CC -+# define TSRMLS_C -+# endif -+ - #endif //PHP_AMQP_PHP7_SUPPORT_H - - /* diff --git a/package/php-amqp/0002-more-work-for-php-8.patch b/package/php-amqp/0002-more-work-for-php-8.patch deleted file mode 100644 index 3651f5a0d3bb..000000000000 --- a/package/php-amqp/0002-more-work-for-php-8.patch +++ /dev/null @@ -1,1265 +0,0 @@ -From df1241852b359cf12c346beaa68de202257efdf1 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 9 Dec 2020 17:00:46 +0100 -Subject: [PATCH] more work for PHP 8 (#383) - -* more work for PHP 8 - -* split test - -Signed-off-by: Remi Collet -Signed-off-by: Adam Duskett ---- - amqp_basic_properties.c | 84 +++++++++++++-------------- - amqp_channel.c | 49 +++++++++------- - amqp_connection.c | 106 +++++++++++++++++----------------- - amqp_connection_resource.c | 12 ++-- - amqp_decimal.c | 8 +-- - amqp_envelope.c | 12 ++-- - amqp_exchange.c | 22 +++---- - amqp_queue.c | 38 ++++++------ - amqp_timestamp.c | 6 +- - amqp_type.c | 6 +- - php5_support.h | 2 + - php7_support.h | 9 +++ - php_amqp.h | 8 +-- - tests/amqptimestamp.phpt | 4 +- - tests/amqptimestamp_php8.phpt | 60 +++++++++++++++++++ - tests/bug_61533.phpt | 2 +- - 16 files changed, 254 insertions(+), 174 deletions(-) - create mode 100644 tests/amqptimestamp_php8.phpt - -diff --git a/amqp_basic_properties.c b/amqp_basic_properties.c -index 69b813e..5375f44 100644 ---- a/amqp_basic_properties.c -+++ b/amqp_basic_properties.c -@@ -70,7 +70,7 @@ void php_amqp_basic_properties_set_empty_headers(zval *obj TSRMLS_DC) { - PHP5to7_MAYBE_INIT(headers); - PHP5to7_ARRAY_INIT(headers); - -- zend_update_property(this_ce, obj, ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC); - - PHP5to7_MAYBE_DESTROY(headers); - } -@@ -118,29 +118,29 @@ static PHP_METHOD(AMQPBasicProperties, __construct) { - ) == FAILURE) { - return; - } -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("content_type"), content_type, content_type_len TSRMLS_CC); -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("content_encoding"), content_encoding, content_encoding_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("content_type"), content_type, content_type_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("content_encoding"), content_encoding, content_encoding_len TSRMLS_CC); - - if (headers != NULL) { -- zend_update_property(this_ce, getThis(), ZEND_STRL("headers"), headers TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("headers"), headers TSRMLS_CC); - } else { - php_amqp_basic_properties_set_empty_headers(getThis() TSRMLS_CC); - } - -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("delivery_mode"), delivery_mode TSRMLS_CC); -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("priority"), priority TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("delivery_mode"), delivery_mode TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("priority"), priority TSRMLS_CC); - -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("correlation_id"), correlation_id, correlation_id_len TSRMLS_CC); -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("reply_to"), reply_to, reply_to_len TSRMLS_CC); -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("expiration"), expiration, expiration_len TSRMLS_CC); -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("message_id"), message_id, message_id_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("correlation_id"), correlation_id, correlation_id_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("reply_to"), reply_to, reply_to_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("expiration"), expiration, expiration_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("message_id"), message_id, message_id_len TSRMLS_CC); - -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("timestamp"), timestamp TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("timestamp"), timestamp TSRMLS_CC); - -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("type"), type, type_len TSRMLS_CC); -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("user_id"), user_id, user_id_len TSRMLS_CC); -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("app_id"), app_id, app_id_len TSRMLS_CC); -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("cluster_id"), cluster_id, cluster_id_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("type"), type, type_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("user_id"), user_id, user_id_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("app_id"), app_id, app_id_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("cluster_id"), cluster_id, cluster_id_len TSRMLS_CC); - } - /* }}} */ - -@@ -460,7 +460,7 @@ void parse_amqp_table(amqp_table_t *table, zval *result TSRMLS_DC) { - object_init_ex(PHP5to7_MAYBE_PTR(value), amqp_timestamp_class_entry); - - zend_call_method_with_1_params( -- &value, -+ PHP5to8_OBJ_PROP(&value), - amqp_timestamp_class_entry, - NULL, - "__construct", -@@ -488,7 +488,7 @@ void parse_amqp_table(amqp_table_t *table, zval *result TSRMLS_DC) { - object_init_ex(PHP5to7_MAYBE_PTR(value), amqp_decimal_class_entry); - - zend_call_method_with_2_params( -- &value, -+ PHP5to8_OBJ_PROP(&value), - amqp_decimal_class_entry, - NULL, - "__construct", -@@ -525,93 +525,93 @@ void php_amqp_basic_properties_extract(amqp_basic_properties_t *p, zval *obj TSR - PHP5to7_ARRAY_INIT(headers); - - if (p->_flags & AMQP_BASIC_CONTENT_TYPE_FLAG) { -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("content_type"), (const char *) p->content_type.bytes, (PHP5to7_param_str_len_type_t) p->content_type.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("content_type"), (const char *) p->content_type.bytes, (PHP5to7_param_str_len_type_t) p->content_type.len TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("content_type"), "", 0 TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("content_type"), "", 0 TSRMLS_CC); - } - - if (p->_flags & AMQP_BASIC_CONTENT_ENCODING_FLAG) { -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("content_encoding"), (const char *) p->content_encoding.bytes, (PHP5to7_param_str_len_type_t) p->content_encoding.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("content_encoding"), (const char *) p->content_encoding.bytes, (PHP5to7_param_str_len_type_t) p->content_encoding.len TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("content_encoding"), "", 0 TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("content_encoding"), "", 0 TSRMLS_CC); - } - - if (p->_flags & AMQP_BASIC_HEADERS_FLAG) { - parse_amqp_table(&(p->headers), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC); - } - -- zend_update_property(this_ce, obj, ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC); - - if (p->_flags & AMQP_BASIC_DELIVERY_MODE_FLAG) { -- zend_update_property_long(this_ce, obj, ZEND_STRL("delivery_mode"), (PHP5to7_param_long_type_t) p->delivery_mode TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("delivery_mode"), (PHP5to7_param_long_type_t) p->delivery_mode TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_long(this_ce, obj, ZEND_STRL("delivery_mode"), AMQP_DELIVERY_NONPERSISTENT TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("delivery_mode"), AMQP_DELIVERY_NONPERSISTENT TSRMLS_CC); - } - - if (p->_flags & AMQP_BASIC_PRIORITY_FLAG) { -- zend_update_property_long(this_ce, obj, ZEND_STRL("priority"), (PHP5to7_param_long_type_t) p->priority TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("priority"), (PHP5to7_param_long_type_t) p->priority TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_long(this_ce, obj, ZEND_STRL("priority"), 0 TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("priority"), 0 TSRMLS_CC); - } - - if (p->_flags & AMQP_BASIC_CORRELATION_ID_FLAG) { -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("correlation_id"), (const char *) p->correlation_id.bytes, (PHP5to7_param_str_len_type_t) p->correlation_id.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("correlation_id"), (const char *) p->correlation_id.bytes, (PHP5to7_param_str_len_type_t) p->correlation_id.len TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("correlation_id"), "", 0 TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("correlation_id"), "", 0 TSRMLS_CC); - } - - if (p->_flags & AMQP_BASIC_REPLY_TO_FLAG) { -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("reply_to"), (const char *) p->reply_to.bytes, (PHP5to7_param_str_len_type_t) p->reply_to.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("reply_to"), (const char *) p->reply_to.bytes, (PHP5to7_param_str_len_type_t) p->reply_to.len TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("reply_to"), "", 0 TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("reply_to"), "", 0 TSRMLS_CC); - } - - if (p->_flags & AMQP_BASIC_EXPIRATION_FLAG) { -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("expiration"), (const char *) p->expiration.bytes, (PHP5to7_param_str_len_type_t) p->expiration.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("expiration"), (const char *) p->expiration.bytes, (PHP5to7_param_str_len_type_t) p->expiration.len TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("expiration"), "", 0 TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("expiration"), "", 0 TSRMLS_CC); - } - - if (p->_flags & AMQP_BASIC_MESSAGE_ID_FLAG) { -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("message_id"), (const char *) p->message_id.bytes, (PHP5to7_param_str_len_type_t) p->message_id.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("message_id"), (const char *) p->message_id.bytes, (PHP5to7_param_str_len_type_t) p->message_id.len TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("message_id"), "", 0 TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("message_id"), "", 0 TSRMLS_CC); - } - - if (p->_flags & AMQP_BASIC_TIMESTAMP_FLAG) { -- zend_update_property_long(this_ce, obj, ZEND_STRL("timestamp"), (PHP5to7_param_long_type_t) p->timestamp TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("timestamp"), (PHP5to7_param_long_type_t) p->timestamp TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_long(this_ce, obj, ZEND_STRL("timestamp"), 0 TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("timestamp"), 0 TSRMLS_CC); - } - - if (p->_flags & AMQP_BASIC_TYPE_FLAG) { -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("type"), (const char *) p->type.bytes, (PHP5to7_param_str_len_type_t) p->type.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("type"), (const char *) p->type.bytes, (PHP5to7_param_str_len_type_t) p->type.len TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("type"), "", 0 TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("type"), "", 0 TSRMLS_CC); - } - - if (p->_flags & AMQP_BASIC_USER_ID_FLAG) { -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("user_id"), (const char *) p->user_id.bytes, (PHP5to7_param_str_len_type_t) p->user_id.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("user_id"), (const char *) p->user_id.bytes, (PHP5to7_param_str_len_type_t) p->user_id.len TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("user_id"), "", 0 TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("user_id"), "", 0 TSRMLS_CC); - } - - if (p->_flags & AMQP_BASIC_APP_ID_FLAG) { -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("app_id"), (const char *) p->app_id.bytes, (PHP5to7_param_str_len_type_t) p->app_id.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("app_id"), (const char *) p->app_id.bytes, (PHP5to7_param_str_len_type_t) p->app_id.len TSRMLS_CC); - } else { - /* BC */ -- zend_update_property_stringl(this_ce, obj, ZEND_STRL("app_id"), "", 0 TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("app_id"), "", 0 TSRMLS_CC); - } - - PHP5to7_MAYBE_DESTROY(headers); -diff --git a/amqp_channel.c b/amqp_channel.c -index ef9552a..493c6d3 100644 ---- a/amqp_channel.c -+++ b/amqp_channel.c -@@ -152,10 +152,15 @@ static zval * php_amqp_get_fci_gc_data(zend_fcall_info *fci, zval *gc_data) { - return gc_data; - } - -+#if PHP_MAJOR_VERSION < 8 - static HashTable *amqp_channel_gc(zval *object, zval **table, int *n) /* {{{ */ - { -- amqp_channel_object *channel = PHP_AMQP_GET_CHANNEL(object); -- -+ amqp_channel_object *channel = PHP_AMQP_GET_CHANNEL(object); -+#else -+static HashTable *amqp_channel_gc(zend_object *object, zval **table, int *n) /* {{{ */ -+{ -+ amqp_channel_object *channel = php_amqp_channel_object_fetch(object); -+#endif - int basic_return_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_return.fci); - int basic_ack_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_ack.fci); - int basic_nack_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_nack.fci); -@@ -249,7 +254,7 @@ static HashTable *amqp_channel_gc(zval *object, zval ***table, int *n TSRMLS_DC) - *table = channel->gc_data; - *n = cnt; - -- return zend_std_get_properties(object TSRMLS_CC); -+ return zend_std_get_properties(PHP5to8_OBJ_PROP(object) TSRMLS_CC); - } /* }}} */ - - #endif -@@ -331,7 +336,7 @@ static PHP_METHOD(amqp_channel_class, __construct) - amqp_connection_object *connection; - - /* Parse out the method parameters */ -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &connection_object) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &connection_object, amqp_connection_class_entry) == FAILURE) { - zend_throw_exception(amqp_channel_exception_class_entry, "Parameter must be an instance of AMQPConnection.", 0 TSRMLS_CC); - RETURN_NULL(); - } -@@ -341,7 +346,7 @@ static PHP_METHOD(amqp_channel_class, __construct) - PHP5to7_MAYBE_INIT(consumers); - PHP5to7_ARRAY_INIT(consumers); - -- zend_update_property(this_ce, getThis(), ZEND_STRL("consumers"), PHP5to7_MAYBE_PTR(consumers) TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("consumers"), PHP5to7_MAYBE_PTR(consumers) TSRMLS_CC); - - PHP5to7_MAYBE_DESTROY(consumers); - -@@ -351,16 +356,16 @@ static PHP_METHOD(amqp_channel_class, __construct) - #endif - - /* Set the prefetch count */ -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), INI_INT("amqp.prefetch_count") TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_count"), INI_INT("amqp.prefetch_count") TSRMLS_CC); - - /* Set the prefetch size */ -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), INI_INT("amqp.prefetch_size") TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_size"), INI_INT("amqp.prefetch_size") TSRMLS_CC); - - /* Set the global prefetch count */ -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), INI_INT("amqp.global_prefetch_count") TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_count"), INI_INT("amqp.global_prefetch_count") TSRMLS_CC); - - /* Set the global prefetch size */ -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), INI_INT("amqp.global_prefetch_size") TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_size"), INI_INT("amqp.global_prefetch_size") TSRMLS_CC); - - /* Pull out and verify the connection */ - connection = PHP_AMQP_GET_CONNECTION(connection_object); -@@ -376,7 +381,7 @@ static PHP_METHOD(amqp_channel_class, __construct) - return; - } - -- zend_update_property(this_ce, getThis(), ZEND_STRL("connection"), connection_object TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection"), connection_object TSRMLS_CC); - - channel_resource = (amqp_channel_resource*)ecalloc(1, sizeof(amqp_channel_resource)); - channel->channel_resource = channel_resource; -@@ -580,8 +585,8 @@ static PHP_METHOD(amqp_channel_class, setPrefetchCount) - } - - /* Set the prefetch count - the implication is to disable the size */ -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), prefetch_count TSRMLS_CC); -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), 0 TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_count"), prefetch_count TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_size"), 0 TSRMLS_CC); - - RETURN_TRUE; - } -@@ -659,8 +664,8 @@ static PHP_METHOD(amqp_channel_class, setPrefetchSize) - } - - /* Set the prefetch size - the implication is to disable the count */ -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), 0 TSRMLS_CC); -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), prefetch_size TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_count"), 0 TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_size"), prefetch_size TSRMLS_CC); - - RETURN_TRUE; - } -@@ -715,8 +720,8 @@ static PHP_METHOD(amqp_channel_class, setGlobalPrefetchCount) - } - - /* Set the global prefetch count - the implication is to disable the size */ -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), global_prefetch_count TSRMLS_CC); -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), 0 TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_count"), global_prefetch_count TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_size"), 0 TSRMLS_CC); - - RETURN_TRUE; - } -@@ -771,8 +776,8 @@ static PHP_METHOD(amqp_channel_class, setGlobalPrefetchSize) - } - - /* Set the global prefetch size - the implication is to disable the count */ -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), 0 TSRMLS_CC); -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), global_prefetch_size TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_count"), 0 TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_size"), global_prefetch_size TSRMLS_CC); - - RETURN_TRUE; - } -@@ -808,11 +813,11 @@ static PHP_METHOD(amqp_channel_class, qos) - - /* Set the prefetch size and prefetch count */ - if (global) { -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), prefetch_size TSRMLS_CC); -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), prefetch_count TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_size"), prefetch_size TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_count"), prefetch_count TSRMLS_CC); - } else { -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), prefetch_size TSRMLS_CC); -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), prefetch_count TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_size"), prefetch_size TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_count"), prefetch_count TSRMLS_CC); - } - - /* If we are already connected, set the new prefetch count */ -diff --git a/amqp_connection.c b/amqp_connection.c -index 5891a4f..466501a 100644 ---- a/amqp_connection.c -+++ b/amqp_connection.c -@@ -68,9 +68,9 @@ zend_object_handlers amqp_connection_object_handlers; - convert_to_string(PHP5to7_MAYBE_DEREF(zdata)); \ - } \ - if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) { \ -- zend_update_property_string(this_ce, getThis(), ZEND_STRL(name), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); \ -+ zend_update_property_string(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); \ - } else { \ -- zend_update_property_string(this_ce, getThis(), ZEND_STRL(name), INI_STR("amqp." name) TSRMLS_CC); \ -+ zend_update_property_string(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), INI_STR("amqp." name) TSRMLS_CC); \ - } - - #define PHP_AMQP_EXTRACT_CONNECTION_BOOL(name) \ -@@ -80,9 +80,9 @@ zend_object_handlers amqp_connection_object_handlers; - convert_to_long(PHP5to7_MAYBE_DEREF(zdata)); \ - } \ - if (zdata) { \ -- zend_update_property_bool(this_ce, getThis(), ZEND_STRL(name), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); \ -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); \ - } else { \ -- zend_update_property_bool(this_ce, getThis(), ZEND_STRL(name), INI_INT("amqp." name) TSRMLS_CC); \ -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), INI_INT("amqp." name) TSRMLS_CC); \ - } - - static int php_amqp_connection_resource_deleter(PHP5to7_zend_resource_le_t *el, amqp_connection_resource *connection_resource TSRMLS_DC) -@@ -344,13 +344,13 @@ static PHP_METHOD(amqp_connection_class, __construct) - /* Validate the given login */ - if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) { - if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) { -- zend_update_property(this_ce, getThis(), ZEND_STRL("login"), PHP5to7_MAYBE_DEREF(zdata)TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("login"), PHP5to7_MAYBE_DEREF(zdata)TSRMLS_CC); - } else { - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'login' exceeds 128 character limit.", 0 TSRMLS_CC); - return; - } - } else { -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("login"), INI_STR("amqp.login"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.login")) > 128 ? 128 : strlen(INI_STR("amqp.login"))) TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("login"), INI_STR("amqp.login"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.login")) > 128 ? 128 : strlen(INI_STR("amqp.login"))) TSRMLS_CC); - } - - /* Pull the password out of the $params array */ -@@ -362,13 +362,13 @@ static PHP_METHOD(amqp_connection_class, __construct) - /* Validate the given password */ - if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) { - if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) { -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("password"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("password"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } else { - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'password' exceeds 128 character limit.", 0 TSRMLS_CC); - return; - } - } else { -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("password"), INI_STR("amqp.password"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.password")) > 128 ? 128 : strlen(INI_STR("amqp.password"))) TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("password"), INI_STR("amqp.password"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.password")) > 128 ? 128 : strlen(INI_STR("amqp.password"))) TSRMLS_CC); - } - - /* Pull the host out of the $params array */ -@@ -380,13 +380,13 @@ static PHP_METHOD(amqp_connection_class, __construct) - /* Validate the given host */ - if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) { - if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) { -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("host"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("host"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } else { - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'host' exceeds 128 character limit.", 0 TSRMLS_CC); - return; - } - } else { -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("host"), INI_STR("amqp.host"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.host")) > 128 ? 128 : strlen(INI_STR("amqp.host"))) TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("host"), INI_STR("amqp.host"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.host")) > 128 ? 128 : strlen(INI_STR("amqp.host"))) TSRMLS_CC); - } - - /* Pull the vhost out of the $params array */ -@@ -398,25 +398,25 @@ static PHP_METHOD(amqp_connection_class, __construct) - /* Validate the given vhost */ - if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) { - if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) { -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("vhost"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("vhost"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } else { - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'vhost' exceeds 128 character limit.", 0 TSRMLS_CC); - return; - } - } else { -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("vhost"), INI_STR("amqp.vhost"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.vhost")) > 128 ? 128 : strlen(INI_STR("amqp.vhost"))) TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("vhost"), INI_STR("amqp.vhost"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.vhost")) > 128 ? 128 : strlen(INI_STR("amqp.vhost"))) TSRMLS_CC); - - } - -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("port"), INI_INT("amqp.port") TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("port"), INI_INT("amqp.port") TSRMLS_CC); - - if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "port", sizeof("port"), zdata)) { - SEPARATE_ZVAL(zdata); - convert_to_long(PHP5to7_MAYBE_DEREF(zdata)); -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("port"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("port"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } - -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC); - - if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "read_timeout", sizeof("read_timeout"), zdata)) { - SEPARATE_ZVAL(zdata); -@@ -424,7 +424,7 @@ static PHP_METHOD(amqp_connection_class, __construct) - if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) { - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'read_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC); - } else { -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } - - if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "timeout", sizeof("timeout"), zdata)) { -@@ -441,7 +441,7 @@ static PHP_METHOD(amqp_connection_class, __construct) - if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) { - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'timeout' must be greater than or equal to zero.", 0 TSRMLS_CC); - } else { -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } - } else { - -@@ -450,17 +450,17 @@ static PHP_METHOD(amqp_connection_class, __construct) - php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "INI setting 'amqp.timeout' is deprecated; use 'amqp.read_timeout' instead"); - - if (strcmp(DEFAULT_READ_TIMEOUT, INI_STR("amqp.read_timeout")) == 0) { -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.timeout") TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), INI_FLT("amqp.timeout") TSRMLS_CC); - } else { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "INI setting 'amqp.read_timeout' will be used instead of 'amqp.timeout'"); -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC); - } - } else { -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC); - } - } - -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("write_timeout"), INI_FLT("amqp.write_timeout") TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("write_timeout"), INI_FLT("amqp.write_timeout") TSRMLS_CC); - - if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "write_timeout", sizeof("write_timeout"), zdata)) { - SEPARATE_ZVAL(zdata); -@@ -468,11 +468,11 @@ static PHP_METHOD(amqp_connection_class, __construct) - if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) { - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'write_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC); - } else { -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("write_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("write_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } - } - -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("rpc_timeout"), INI_FLT("amqp.rpc_timeout") TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("rpc_timeout"), INI_FLT("amqp.rpc_timeout") TSRMLS_CC); - - if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "rpc_timeout", sizeof("rpc_timeout"), zdata)) { - SEPARATE_ZVAL(zdata); -@@ -480,11 +480,11 @@ static PHP_METHOD(amqp_connection_class, __construct) - if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) { - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'rpc_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC); - } else { -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("rpc_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("rpc_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } - } - -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("connect_timeout"), INI_FLT("amqp.connect_timeout") TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connect_timeout"), INI_FLT("amqp.connect_timeout") TSRMLS_CC); - - if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "connect_timeout", sizeof("connect_timeout"), zdata)) { - SEPARATE_ZVAL(zdata); -@@ -492,12 +492,12 @@ static PHP_METHOD(amqp_connection_class, __construct) - if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) { - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'connect_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC); - } else { -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("connect_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connect_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - - } - } - -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("channel_max"), INI_INT("amqp.channel_max") TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("channel_max"), INI_INT("amqp.channel_max") TSRMLS_CC); - - if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "channel_max", sizeof("channel_max"), zdata)) { - SEPARATE_ZVAL(zdata); -@@ -506,14 +506,14 @@ static PHP_METHOD(amqp_connection_class, __construct) - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'channel_max' is out of range.", 0 TSRMLS_CC); - } else { - if(Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) == 0) { -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("channel_max"), PHP_AMQP_DEFAULT_CHANNEL_MAX TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("channel_max"), PHP_AMQP_DEFAULT_CHANNEL_MAX TSRMLS_CC); - } else { -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("channel_max"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("channel_max"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } - } - } - -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("frame_max"), INI_INT("amqp.frame_max") TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("frame_max"), INI_INT("amqp.frame_max") TSRMLS_CC); - - if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "frame_max", sizeof("frame_max"), zdata)) { - SEPARATE_ZVAL(zdata); -@@ -522,14 +522,14 @@ static PHP_METHOD(amqp_connection_class, __construct) - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'frame_max' is out of range.", 0 TSRMLS_CC); - } else { - if(Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) == 0) { -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("frame_max"), PHP_AMQP_DEFAULT_FRAME_MAX TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("frame_max"), PHP_AMQP_DEFAULT_FRAME_MAX TSRMLS_CC); - } else { -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("frame_max"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("frame_max"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } - } - } - -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("heartbeat"), INI_INT("amqp.heartbeat") TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("heartbeat"), INI_INT("amqp.heartbeat") TSRMLS_CC); - - if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "heartbeat", sizeof("heartbeat"), zdata)) { - SEPARATE_ZVAL(zdata); -@@ -537,16 +537,16 @@ static PHP_METHOD(amqp_connection_class, __construct) - if (Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0 || Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) > PHP_AMQP_MAX_HEARTBEAT) { - zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'heartbeat' is out of range.", 0 TSRMLS_CC); - } else { -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("heartbeat"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("heartbeat"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } - } - -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("sasl_method"), INI_INT("amqp.sasl_method") TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("sasl_method"), INI_INT("amqp.sasl_method") TSRMLS_CC); - - if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "sasl_method", sizeof("sasl_method"), zdata)) { - SEPARATE_ZVAL(zdata); - convert_to_long(PHP5to7_MAYBE_DEREF(zdata)); -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("sasl_method"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("sasl_method"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } - - -@@ -563,7 +563,7 @@ static PHP_METHOD(amqp_connection_class, __construct) - convert_to_string(PHP5to7_MAYBE_DEREF(zdata)); - } - if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) { -- zend_update_property_string(this_ce, getThis(), ZEND_STRL("connection_name"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); -+ zend_update_property_string(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection_name"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); - } - } - /* }}} */ -@@ -789,7 +789,7 @@ static PHP_METHOD(amqp_connection_class, setLogin) - return; - } - -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("login"), login, login_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("login"), login, login_len TSRMLS_CC); - - RETURN_TRUE; - } -@@ -823,7 +823,7 @@ static PHP_METHOD(amqp_connection_class, setPassword) - return; - } - -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("password"), password, password_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("password"), password, password_len TSRMLS_CC); - - RETURN_TRUE; - } -@@ -858,7 +858,7 @@ static PHP_METHOD(amqp_connection_class, setHost) - return; - } - -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("host"), host, host_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("host"), host, host_len TSRMLS_CC); - - RETURN_TRUE; - } -@@ -910,7 +910,7 @@ static PHP_METHOD(amqp_connection_class, setPort) - return; - } - -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("port"), port TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("port"), port TSRMLS_CC); - - RETURN_TRUE; - } -@@ -943,7 +943,7 @@ static PHP_METHOD(amqp_connection_class, setVhost) - return; - } - -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("vhost"), vhost, vhost_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("vhost"), vhost, vhost_len TSRMLS_CC); - - RETURN_TRUE; - } -@@ -986,7 +986,7 @@ static PHP_METHOD(amqp_connection_class, setTimeout) - /* Get the connection object out of the store */ - connection = PHP_AMQP_GET_CONNECTION(getThis()); - -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), read_timeout TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), read_timeout TSRMLS_CC); - - if (connection->connection_resource && connection->connection_resource->is_connected) { - if (php_amqp_set_resource_read_timeout(connection->connection_resource, read_timeout TSRMLS_CC) == 0) { -@@ -1032,7 +1032,7 @@ static PHP_METHOD(amqp_connection_class, setReadTimeout) - /* Get the connection object out of the store */ - connection = PHP_AMQP_GET_CONNECTION(getThis()); - -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), read_timeout TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), read_timeout TSRMLS_CC); - - if (connection->connection_resource && connection->connection_resource->is_connected) { - if (php_amqp_set_resource_read_timeout(connection->connection_resource, read_timeout TSRMLS_CC) == 0) { -@@ -1078,7 +1078,7 @@ static PHP_METHOD(amqp_connection_class, setWriteTimeout) - /* Get the connection object out of the store */ - connection = PHP_AMQP_GET_CONNECTION(getThis()); - -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("write_timeout"), write_timeout TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("write_timeout"), write_timeout TSRMLS_CC); - - if (connection->connection_resource && connection->connection_resource->is_connected) { - if (php_amqp_set_resource_write_timeout(connection->connection_resource, write_timeout TSRMLS_CC) == 0) { -@@ -1124,7 +1124,7 @@ static PHP_METHOD(amqp_connection_class, setRpcTimeout) - /* Get the connection object out of the store */ - connection = PHP_AMQP_GET_CONNECTION(getThis()); - -- zend_update_property_double(this_ce, getThis(), ZEND_STRL("rpc_timeout"), rpc_timeout TSRMLS_CC); -+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("rpc_timeout"), rpc_timeout TSRMLS_CC); - - if (connection->connection_resource && connection->connection_resource->is_connected) { - if (php_amqp_set_resource_rpc_timeout(connection->connection_resource, rpc_timeout TSRMLS_CC) == 0) { -@@ -1255,7 +1255,7 @@ static PHP_METHOD(amqp_connection_class, setCACert) - return; - } - -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("cacert"), str, str_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("cacert"), str, str_len TSRMLS_CC); - - RETURN_TRUE; - } -@@ -1279,7 +1279,7 @@ static PHP_METHOD(amqp_connection_class, setCert) - return; - } - -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("cert"), str, str_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("cert"), str, str_len TSRMLS_CC); - - RETURN_TRUE; - } -@@ -1303,7 +1303,7 @@ static PHP_METHOD(amqp_connection_class, setKey) - return; - } - -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("key"), str, str_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("key"), str, str_len TSRMLS_CC); - - RETURN_TRUE; - } -@@ -1328,7 +1328,7 @@ static PHP_METHOD(amqp_connection_class, setVerify) - return; - } - -- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("verify"), verify TSRMLS_CC); -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("verify"), verify TSRMLS_CC); - - RETURN_TRUE; - } -@@ -1361,7 +1361,7 @@ static PHP_METHOD(amqp_connection_class, setSaslMethod) - return; - } - -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("sasl_method"), method TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("sasl_method"), method TSRMLS_CC); - - RETURN_TRUE; - } -@@ -1385,9 +1385,9 @@ static PHP_METHOD(amqp_connection_class, setConnectionName) - return; - } - if (str == NULL) { -- zend_update_property_null(this_ce, getThis(), ZEND_STRL("connection_name") TSRMLS_CC); -+ zend_update_property_null(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection_name") TSRMLS_CC); - } else { -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("connection_name"), str, str_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection_name"), str, str_len TSRMLS_CC); - } - - -diff --git a/amqp_connection_resource.c b/amqp_connection_resource.c -index 7e20a5c..b0e065a 100644 ---- a/amqp_connection_resource.c -+++ b/amqp_connection_resource.c -@@ -112,15 +112,15 @@ static void php_amqp_close_connection_from_server(amqp_rpc_reply_t reply, char * - - if (!reply.reply.id) { - PHP_AMQP_G(error_code) = -1; -- spprintf(message, 0, "Server connection error: %d, message: %s", -- PHP_AMQP_G(error_code), -+ spprintf(message, 0, "Server connection error: %ld, message: %s", -+ (long)PHP_AMQP_G(error_code), - "unexpected response" - ); - } else { - PHP_AMQP_G(error_code) = m->reply_code; - spprintf(message, 0, "Server connection error: %d, message: %.*s", - m->reply_code, -- (PHP5to7_param_str_len_type_t) m->reply_text.len, -+ (int) m->reply_text.len, - (char *) m->reply_text.bytes - ); - } -@@ -156,15 +156,15 @@ static void php_amqp_close_channel_from_server(amqp_rpc_reply_t reply, char **me - - if (!reply.reply.id) { - PHP_AMQP_G(error_code) = -1; -- spprintf(message, 0, "Server channel error: %d, message: %s", -- PHP_AMQP_G(error_code), -+ spprintf(message, 0, "Server channel error: %ld, message: %s", -+ (long)PHP_AMQP_G(error_code), - "unexpected response" - ); - } else { - PHP_AMQP_G(error_code) = m->reply_code; - spprintf(message, 0, "Server channel error: %d, message: %.*s", - m->reply_code, -- (PHP5to7_param_str_len_type_t) m->reply_text.len, -+ (int) m->reply_text.len, - (char *)m->reply_text.bytes - ); - } -diff --git a/amqp_decimal.c b/amqp_decimal.c -index 83c9f20..8fd92c1 100644 ---- a/amqp_decimal.c -+++ b/amqp_decimal.c -@@ -53,7 +53,7 @@ static PHP_METHOD(amqp_decimal_class, __construct) - } - - if (exponent > AMQP_DECIMAL_EXPONENT_MAX) { -- zend_throw_exception_ex(amqp_value_exception_class_entry, 0 TSRMLS_CC, "Decimal exponent value must be less than %u.", AMQP_DECIMAL_EXPONENT_MAX); -+ zend_throw_exception_ex(amqp_value_exception_class_entry, 0 TSRMLS_CC, "Decimal exponent value must be less than %u.", (unsigned)AMQP_DECIMAL_EXPONENT_MAX); - return; - } - if (significand < AMQP_DECIMAL_SIGNIFICAND_MIN) { -@@ -62,12 +62,12 @@ static PHP_METHOD(amqp_decimal_class, __construct) - } - - if (significand > AMQP_DECIMAL_SIGNIFICAND_MAX) { -- zend_throw_exception_ex(amqp_value_exception_class_entry, 0 TSRMLS_CC, "Decimal significand value must be less than %u.", AMQP_DECIMAL_SIGNIFICAND_MAX); -+ zend_throw_exception_ex(amqp_value_exception_class_entry, 0 TSRMLS_CC, "Decimal significand value must be less than %u.", (unsigned)AMQP_DECIMAL_SIGNIFICAND_MAX); - return; - } - -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("exponent"), exponent TSRMLS_CC); -- zend_update_property_long(this_ce, getThis(), ZEND_STRL("significand"), significand TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("exponent"), exponent TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("significand"), significand TSRMLS_CC); - } - /* }}} */ - -diff --git a/amqp_envelope.c b/amqp_envelope.c -index 8127bed..b7a7a45 100644 ---- a/amqp_envelope.c -+++ b/amqp_envelope.c -@@ -67,13 +67,13 @@ void convert_amqp_envelope_to_zval(amqp_envelope_t *amqp_envelope, zval *envelop - amqp_basic_properties_t *p = &amqp_envelope->message.properties; - amqp_message_t *message = &amqp_envelope->message; - -- zend_update_property_stringl(this_ce, envelope, ZEND_STRL("body"), (const char *) message->body.bytes, (PHP5to7_param_str_len_type_t) message->body.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("body"), (const char *) message->body.bytes, (PHP5to7_param_str_len_type_t) message->body.len TSRMLS_CC); - -- zend_update_property_stringl(this_ce, envelope, ZEND_STRL("consumer_tag"), (const char *) amqp_envelope->consumer_tag.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->consumer_tag.len TSRMLS_CC); -- zend_update_property_long(this_ce, envelope, ZEND_STRL("delivery_tag"), (PHP5to7_param_long_type_t) amqp_envelope->delivery_tag TSRMLS_CC); -- zend_update_property_bool(this_ce, envelope, ZEND_STRL("is_redelivery"), (PHP5to7_param_long_type_t) amqp_envelope->redelivered TSRMLS_CC); -- zend_update_property_stringl(this_ce, envelope, ZEND_STRL("exchange_name"), (const char *) amqp_envelope->exchange.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->exchange.len TSRMLS_CC); -- zend_update_property_stringl(this_ce, envelope, ZEND_STRL("routing_key"), (const char *) amqp_envelope->routing_key.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->routing_key.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("consumer_tag"), (const char *) amqp_envelope->consumer_tag.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->consumer_tag.len TSRMLS_CC); -+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("delivery_tag"), (PHP5to7_param_long_type_t) amqp_envelope->delivery_tag TSRMLS_CC); -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("is_redelivery"), (PHP5to7_param_long_type_t) amqp_envelope->redelivered TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("exchange_name"), (const char *) amqp_envelope->exchange.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->exchange.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("routing_key"), (const char *) amqp_envelope->routing_key.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->routing_key.len TSRMLS_CC); - - php_amqp_basic_properties_extract(p, envelope TSRMLS_CC); - } -diff --git a/amqp_exchange.c b/amqp_exchange.c -index 4f80d3b..4bfe397 100644 ---- a/amqp_exchange.c -+++ b/amqp_exchange.c -@@ -65,20 +65,20 @@ static PHP_METHOD(amqp_exchange_class, __construct) - zval *channelObj; - amqp_channel_resource *channel_resource; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &channelObj) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &channelObj, amqp_channel_class_entry) == FAILURE) { - return; - } - - PHP5to7_MAYBE_INIT(arguments); - PHP5to7_ARRAY_INIT(arguments); -- zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), PHP5to7_MAYBE_PTR(arguments) TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("arguments"), PHP5to7_MAYBE_PTR(arguments) TSRMLS_CC); - PHP5to7_MAYBE_DESTROY(arguments); - - channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(channelObj); - PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not create exchange."); - -- zend_update_property(this_ce, getThis(), ZEND_STRL("channel"), channelObj TSRMLS_CC); -- zend_update_property(this_ce, getThis(), ZEND_STRL("connection"), PHP_AMQP_READ_OBJ_PROP(amqp_channel_class_entry, channelObj, "connection") TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("channel"), channelObj TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection"), PHP_AMQP_READ_OBJ_PROP(amqp_channel_class_entry, channelObj, "connection") TSRMLS_CC); - } - /* }}} */ - -@@ -119,7 +119,7 @@ static PHP_METHOD(amqp_exchange_class, setName) - } - - /* Set the exchange name */ -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("name"), name, name_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("name"), name, name_len TSRMLS_CC); - } - /* }}} */ - -@@ -168,10 +168,10 @@ static PHP_METHOD(amqp_exchange_class, setFlags) - /* Set the flags based on the bitmask we were given */ - flagBitmask = flagBitmask ? flagBitmask & PHP_AMQP_EXCHANGE_FLAGS : flagBitmask; - -- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("passive"), IS_PASSIVE(flagBitmask) TSRMLS_CC); -- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("durable"), IS_DURABLE(flagBitmask) TSRMLS_CC); -- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("auto_delete"), IS_AUTODELETE(flagBitmask) TSRMLS_CC); -- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("internal"), IS_INTERNAL(flagBitmask) TSRMLS_CC); -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("passive"), IS_PASSIVE(flagBitmask) TSRMLS_CC); -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("durable"), IS_DURABLE(flagBitmask) TSRMLS_CC); -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("auto_delete"), IS_AUTODELETE(flagBitmask) TSRMLS_CC); -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("internal"), IS_INTERNAL(flagBitmask) TSRMLS_CC); - } - /* }}} */ - -@@ -204,7 +204,7 @@ static PHP_METHOD(amqp_exchange_class, setType) - return; - } - -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("type"), type, type_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("type"), type, type_len TSRMLS_CC); - } - /* }}} */ - -@@ -273,7 +273,7 @@ static PHP_METHOD(amqp_exchange_class, setArguments) - return; - } - -- zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), zvalArguments TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("arguments"), zvalArguments TSRMLS_CC); - - RETURN_TRUE; - } -diff --git a/amqp_queue.c b/amqp_queue.c -index c13629c..eeba144 100644 ---- a/amqp_queue.c -+++ b/amqp_queue.c -@@ -68,20 +68,20 @@ static PHP_METHOD(amqp_queue_class, __construct) - zval *channelObj; - amqp_channel_resource *channel_resource; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &channelObj) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &channelObj, amqp_channel_class_entry) == FAILURE) { - return; - } - - PHP5to7_MAYBE_INIT(arguments); - PHP5to7_ARRAY_INIT(arguments); -- zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), PHP5to7_MAYBE_PTR(arguments) TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("arguments"), PHP5to7_MAYBE_PTR(arguments) TSRMLS_CC); - PHP5to7_MAYBE_DESTROY(arguments); - - channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(channelObj); - PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not create queue."); - -- zend_update_property(this_ce, getThis(), ZEND_STRL("channel"), channelObj TSRMLS_CC); -- zend_update_property(this_ce, getThis(), ZEND_STRL("connection"), PHP_AMQP_READ_OBJ_PROP(amqp_channel_class_entry, channelObj, "connection") TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("channel"), channelObj TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection"), PHP_AMQP_READ_OBJ_PROP(amqp_channel_class_entry, channelObj, "connection") TSRMLS_CC); - - } - /* }}} */ -@@ -122,7 +122,7 @@ static PHP_METHOD(amqp_queue_class, setName) - } - - /* Set the queue name */ -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("name"), name, name_len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("name"), name, name_len TSRMLS_CC); - - /* BC */ - RETURN_TRUE; -@@ -175,10 +175,10 @@ static PHP_METHOD(amqp_queue_class, setFlags) - /* Set the flags based on the bitmask we were given */ - flagBitmask = flagBitmask ? flagBitmask & PHP_AMQP_QUEUE_FLAGS : flagBitmask; - -- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("passive"), IS_PASSIVE(flagBitmask) TSRMLS_CC); -- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("durable"), IS_DURABLE(flagBitmask) TSRMLS_CC); -- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("exclusive"), IS_EXCLUSIVE(flagBitmask) TSRMLS_CC); -- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("auto_delete"), IS_AUTODELETE(flagBitmask) TSRMLS_CC); -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("passive"), IS_PASSIVE(flagBitmask) TSRMLS_CC); -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("durable"), IS_DURABLE(flagBitmask) TSRMLS_CC); -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("exclusive"), IS_EXCLUSIVE(flagBitmask) TSRMLS_CC); -+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("auto_delete"), IS_AUTODELETE(flagBitmask) TSRMLS_CC); - - /* BC */ - RETURN_TRUE; -@@ -250,7 +250,7 @@ static PHP_METHOD(amqp_queue_class, setArguments) - return; - } - -- zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), zvalArguments TSRMLS_CC); -+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("arguments"), zvalArguments TSRMLS_CC); - - RETURN_TRUE; - } -@@ -342,7 +342,7 @@ static PHP_METHOD(amqp_queue_class, declareQueue) - - /* Set the queue name, in case it is an autogenerated queue name */ - name = php_amqp_type_amqp_bytes_to_char(r->queue); -- zend_update_property_string(this_ce, getThis(), ZEND_STRL("name"), name TSRMLS_CC); -+ zend_update_property_string(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("name"), name TSRMLS_CC); - efree(name); - - php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource); -@@ -525,7 +525,7 @@ static PHP_METHOD(amqp_queue_class, consume) - } - - zval *channel_zv = PHP_AMQP_READ_THIS_PROP("channel"); -- zval *consumers = zend_read_property(amqp_channel_class_entry, channel_zv, ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC); -+ zval *consumers = zend_read_property(amqp_channel_class_entry, PHP5to8_OBJ_PROP(channel_zv), ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC); - - if (IS_ARRAY != Z_TYPE_P(consumers)) { - zend_throw_exception(amqp_queue_exception_class_entry, "Invalid channel consumers, forgot to call channel constructor?", 0 TSRMLS_CC); -@@ -594,7 +594,7 @@ static PHP_METHOD(amqp_queue_class, consume) - efree(key); - - /* Set the consumer tag name, in case it is an autogenerated consumer tag name */ -- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("consumer_tag"), (const char *) r->consumer_tag.bytes, (PHP5to7_param_str_len_type_t) r->consumer_tag.len TSRMLS_CC); -+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("consumer_tag"), (const char *) r->consumer_tag.bytes, (PHP5to7_param_str_len_type_t) r->consumer_tag.len TSRMLS_CC); - } - - if (!ZEND_FCI_INITIALIZED(fci)) { -@@ -674,7 +674,7 @@ static PHP_METHOD(amqp_queue_class, consume) - current_channel_zv = current_channel_resource->parent->this_ptr; - #endif - -- consumers = zend_read_property(amqp_channel_class_entry, PHP5to7_MAYBE_PTR(current_channel_zv), ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC); -+ consumers = zend_read_property(amqp_channel_class_entry, PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PTR(current_channel_zv)), ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC); - - if (IS_ARRAY != Z_TYPE_P(consumers)) { - zend_throw_exception(amqp_queue_exception_class_entry, "Invalid channel consumers, forgot to call channel constructor?", 0 TSRMLS_CC); -@@ -689,8 +689,8 @@ static PHP_METHOD(amqp_queue_class, consume) - PHP5to7_zval_t exception PHP5to7_MAYBE_SET_TO_NULL; - PHP5to7_MAYBE_INIT(exception); - object_init_ex(PHP5to7_MAYBE_PTR(exception), amqp_envelope_exception_class_entry); -- zend_update_property_string(zend_exception_get_default(TSRMLS_C), PHP5to7_MAYBE_PTR(exception), ZEND_STRL("message"), "Orphaned envelope" TSRMLS_CC); -- zend_update_property(amqp_envelope_exception_class_entry, PHP5to7_MAYBE_PTR(exception), ZEND_STRL("envelope"), PHP5to7_MAYBE_PTR(message) TSRMLS_CC); -+ zend_update_property_string(zend_exception_get_default(TSRMLS_C), PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PTR(exception)), ZEND_STRL("message"), "Orphaned envelope" TSRMLS_CC); -+ zend_update_property(amqp_envelope_exception_class_entry, PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PTR(exception)), ZEND_STRL("envelope"), PHP5to7_MAYBE_PTR(message) TSRMLS_CC); - - zend_throw_exception_object(PHP5to7_MAYBE_PTR(exception) TSRMLS_CC); - -@@ -946,7 +946,7 @@ static PHP_METHOD(amqp_queue_class, cancel) - } - - zval *channel_zv = PHP_AMQP_READ_THIS_PROP("channel"); -- zval *consumers = zend_read_property(amqp_channel_class_entry, channel_zv, ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC); -+ zval *consumers = zend_read_property(amqp_channel_class_entry, PHP5to8_OBJ_PROP(channel_zv), ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC); - zend_bool has_consumer_tag = (zend_bool) (IS_STRING == Z_TYPE_P(PHP_AMQP_READ_THIS_PROP("consumer_tag"))); - - if (IS_ARRAY != Z_TYPE_P(consumers)) { -@@ -977,8 +977,8 @@ static PHP_METHOD(amqp_queue_class, cancel) - return; - } - -- if (!consumer_tag_len || has_consumer_tag && strcmp(consumer_tag, PHP_AMQP_READ_THIS_PROP_STR("consumer_tag")) != 0) { -- zend_update_property_null(this_ce, getThis(), ZEND_STRL("consumer_tag") TSRMLS_CC); -+ if (!consumer_tag_len || (has_consumer_tag && strcmp(consumer_tag, PHP_AMQP_READ_THIS_PROP_STR("consumer_tag")) != 0)) { -+ zend_update_property_null(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("consumer_tag") TSRMLS_CC); - } - - char *key; -diff --git a/amqp_timestamp.c b/amqp_timestamp.c -index d9eec39..ed07ab6 100644 ---- a/amqp_timestamp.c -+++ b/amqp_timestamp.c -@@ -61,7 +61,7 @@ static PHP_METHOD(amqp_timestamp_class, __construct) - #if PHP_MAJOR_VERSION >= 7 - zend_string *str; - str = _php_math_number_format_ex(timestamp, 0, "", 0, "", 0); -- zend_update_property_str(this_ce, getThis(), ZEND_STRL("timestamp"), str); -+ zend_update_property_str(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("timestamp"), str); - zend_string_delref(str); - #else - char *str; -@@ -104,7 +104,11 @@ ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_timestamp_class_getTimestamp, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0) - ZEND_END_ARG_INFO() - -+#if PHP_MAJOR_VERSION < 8 - ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_timestamp_class_toString, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0) -+#else -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_amqp_timestamp_class_toString, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, IS_STRING, 0) -+#endif - ZEND_END_ARG_INFO() - - zend_function_entry amqp_timestamp_class_functions[] = { -diff --git a/amqp_type.c b/amqp_type.c -index fb87727..5f1ab91 100644 ---- a/amqp_type.c -+++ b/amqp_type.c -@@ -250,7 +250,7 @@ zend_bool php_amqp_type_internal_convert_php_to_amqp_field_value(zval *value, am - if (instanceof_function(Z_OBJCE_P(value), amqp_timestamp_class_entry TSRMLS_CC)) { - PHP5to7_zval_t result_zv PHP5to7_MAYBE_SET_TO_NULL; - -- zend_call_method_with_0_params(PHP5to7_MAYBE_PARAM_PTR(value), amqp_timestamp_class_entry, NULL, "gettimestamp", &result_zv); -+ zend_call_method_with_0_params(PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PARAM_PTR(value)), amqp_timestamp_class_entry, NULL, "gettimestamp", &result_zv); - - field->kind = AMQP_FIELD_KIND_TIMESTAMP; - field->value.u64 = strtoimax(Z_STRVAL(PHP5to7_MAYBE_DEREF(result_zv)), NULL, 10); -@@ -262,11 +262,11 @@ zend_bool php_amqp_type_internal_convert_php_to_amqp_field_value(zval *value, am - field->kind = AMQP_FIELD_KIND_DECIMAL; - PHP5to7_zval_t result_zv PHP5to7_MAYBE_SET_TO_NULL; - -- zend_call_method_with_0_params(PHP5to7_MAYBE_PARAM_PTR(value), amqp_decimal_class_entry, NULL, "getexponent", &result_zv); -+ zend_call_method_with_0_params(PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PARAM_PTR(value)), amqp_decimal_class_entry, NULL, "getexponent", &result_zv); - field->value.decimal.decimals = (uint8_t)Z_LVAL(PHP5to7_MAYBE_DEREF(result_zv)); - PHP5to7_MAYBE_DESTROY(result_zv); - -- zend_call_method_with_0_params(PHP5to7_MAYBE_PARAM_PTR(value), amqp_decimal_class_entry, NULL, "getsignificand", &result_zv); -+ zend_call_method_with_0_params(PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PARAM_PTR(value)), amqp_decimal_class_entry, NULL, "getsignificand", &result_zv); - field->value.decimal.value = (uint32_t)Z_LVAL(PHP5to7_MAYBE_DEREF(result_zv)); - - PHP5to7_MAYBE_DESTROY(result_zv); -diff --git a/php5_support.h b/php5_support.h -index 5c57620..25c2d96 100644 ---- a/php5_support.h -+++ b/php5_support.h -@@ -109,6 +109,8 @@ typedef zend_rsrc_list_entry PHP5to7_zend_resource_le_t; - #define ZEND_ULONG_FMT "%" PRIu64 - #define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL_CLASS - -+#define PHP5to8_OBJ_PROP(zv) (zv) -+ - #endif //PHP_AMQP_PHP5_SUPPORT_H - - /* -diff --git a/php7_support.h b/php7_support.h -index c9e8f5b..0dbd6b2 100644 ---- a/php7_support.h -+++ b/php7_support.h -@@ -101,15 +101,24 @@ typedef zval PHP5to7_zend_resource_le_t; - - #define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL - -+ - /* Small change to let it build after a major internal change for php8.0 - * More info: - * https://github.com/php/php-src/blob/php-8.0.0alpha3/UPGRADING.INTERNALS#L47 - */ - #if PHP_MAJOR_VERSION >= 8 -+ - # define TSRMLS_DC - # define TSRMLS_D - # define TSRMLS_CC - # define TSRMLS_C -+ -+#define PHP5to8_OBJ_PROP(zv) Z_OBJ_P(zv) -+ -+#else -+ -+#define PHP5to8_OBJ_PROP(zv) (zv) -+ - # endif - - #endif //PHP_AMQP_PHP7_SUPPORT_H -diff --git a/php_amqp.h b/php_amqp.h -index 752edd7..686741d 100644 ---- a/php_amqp.h -+++ b/php_amqp.h -@@ -221,14 +221,14 @@ struct _amqp_connection_object { - #define PHP_AMQP_NOPARAMS() if (zend_parse_parameters_none() == FAILURE) { return; } - - #define PHP_AMQP_RETURN_THIS_PROP(prop_name) \ -- zval * _zv = zend_read_property(this_ce, getThis(), ZEND_STRL(prop_name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC); \ -+ zval * _zv = zend_read_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(prop_name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC); \ - RETURN_ZVAL(_zv, 1, 0); - --#define PHP_AMQP_READ_OBJ_PROP(cls, obj, name) zend_read_property((cls), (obj), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC) -+#define PHP_AMQP_READ_OBJ_PROP(cls, obj, name) zend_read_property((cls), PHP5to8_OBJ_PROP(obj), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC) - #define PHP_AMQP_READ_OBJ_PROP_DOUBLE(cls, obj, name) Z_DVAL_P(PHP_AMQP_READ_OBJ_PROP((cls), (obj), (name))) - --#define PHP_AMQP_READ_THIS_PROP_CE(name, ce) zend_read_property((ce), getThis(), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC) --#define PHP_AMQP_READ_THIS_PROP(name) zend_read_property(this_ce, getThis(), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC) -+#define PHP_AMQP_READ_THIS_PROP_CE(name, ce) zend_read_property((ce), PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC) -+#define PHP_AMQP_READ_THIS_PROP(name) zend_read_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC) - #define PHP_AMQP_READ_THIS_PROP_BOOL(name) Z_BVAL_P(PHP_AMQP_READ_THIS_PROP(name)) - #define PHP_AMQP_READ_THIS_PROP_STR(name) Z_STRVAL_P(PHP_AMQP_READ_THIS_PROP(name)) - #define PHP_AMQP_READ_THIS_PROP_STRLEN(name) (Z_TYPE_P(PHP_AMQP_READ_THIS_PROP(name)) == IS_STRING ? Z_STRLEN_P(PHP_AMQP_READ_THIS_PROP(name)) : 0) -diff --git a/tests/amqptimestamp.phpt b/tests/amqptimestamp.phpt -index 9835883..6424f8b 100644 ---- a/tests/amqptimestamp.phpt -+++ b/tests/amqptimestamp.phpt -@@ -2,7 +2,7 @@ - AMQPTimestamp - --SKIPIF-- - ')) { - print "skip"; - } - --FILE-- -@@ -52,4 +52,4 @@ bool(true) - string(20) "18446744073709551616" - string(1) "0" - --==END== -\ No newline at end of file -+==END== -diff --git a/tests/amqptimestamp_php8.phpt b/tests/amqptimestamp_php8.phpt -new file mode 100644 -index 0000000..dabecc5 ---- /dev/null -+++ b/tests/amqptimestamp_php8.phpt -@@ -0,0 +1,60 @@ -+--TEST-- -+AMQPTimestamp -+--SKIPIF-- -+getTimestamp(), (string) $timestamp); -+ -+$timestamp = new AMQPTimestamp(100000.1); -+var_dump($timestamp->getTimestamp(), (string) $timestamp); -+ -+try { -+ new AMQPTimestamp(); -+} catch(ArgumentCountError $e) { -+ echo $e->getMessage() . "\n"; -+} -+try { -+ new AMQPTimestamp("string"); -+} catch(TypeError $e) { -+ echo $e->getMessage() . "\n"; -+} -+ -+try { -+ new AMQPTimestamp(AMQPTimestamp::MIN - 1); -+} catch (AMQPValueException $e) { -+ echo $e->getMessage() . "\n"; -+} -+ -+try { -+ new AMQPTimestamp(INF); -+} catch (AMQPValueException $e) { -+ echo $e->getMessage() . "\n"; -+} -+ -+var_dump((new ReflectionClass("AMQPTimestamp"))->isFinal()); -+ -+var_dump(AMQPTimestamp::MAX); -+var_dump(AMQPTimestamp::MIN); -+?> -+ -+==END== -+--EXPECTF-- -+string(6) "100000" -+string(6) "100000" -+string(6) "100000" -+string(6) "100000" -+AMQPTimestamp::__construct() expects exactly 1 parameter, 0 given -+AMQPTimestamp::__construct(): Argument #1 ($timestamp) must be of type float, string given -+The timestamp parameter must be greater than 0. -+The timestamp parameter must be less than 18446744073709551616. -+bool(true) -+string(20) "18446744073709551616" -+string(1) "0" -+ -+==END== -diff --git a/tests/bug_61533.phpt b/tests/bug_61533.phpt -index ecb5213..f53c315 100644 ---- a/tests/bug_61533.phpt -+++ b/tests/bug_61533.phpt -@@ -21,4 +21,4 @@ try { - - ?> - --EXPECTF-- --%s: Argument 1 passed to AMQPQueue::__construct() must be an instance of AMQPChannel, instance of AMQPConnection given%s -+%s AMQPChannel%s AMQPConnection%s diff --git a/package/php-amqp/php-amqp.hash b/package/php-amqp/php-amqp.hash index bce8ac0c9aca..159a157a497d 100644 --- a/package/php-amqp/php-amqp.hash +++ b/package/php-amqp/php-amqp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0ebc61052eb12406dddf5eabfe8749a12d52c566816b8aab04fb9916d0c26ed2 amqp-1.10.2.tgz +sha256 2de740da9a884ade2caf0e59e5521bbf80da16155fa6a6205630b473aed5e6dd amqp-2.0.0.tgz sha256 ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8 LICENSE diff --git a/package/php-amqp/php-amqp.mk b/package/php-amqp/php-amqp.mk index 981f8274a988..7e58234d1fe3 100644 --- a/package/php-amqp/php-amqp.mk +++ b/package/php-amqp/php-amqp.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_AMQP_VERSION = 1.10.2 +PHP_AMQP_VERSION = 2.0.0 PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz PHP_AMQP_SITE = https://pecl.php.net/get PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ From c024ab1732b5fdf131ac8cfad5530225b976f610 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2023 12:06:03 -0600 Subject: [PATCH 1864/2890] package/php-apcu: bump version to 5.1.22 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/php-apcu/php-apcu.hash | 2 +- package/php-apcu/php-apcu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php-apcu/php-apcu.hash b/package/php-apcu/php-apcu.hash index 3aae4120d2af..4a5eadf80345 100644 --- a/package/php-apcu/php-apcu.hash +++ b/package/php-apcu/php-apcu.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b99d40fafec06f4d132fcee53e7526ddbfc1d041ea6e04e17389dfad28f9c390 apcu-5.1.20.tgz +sha256 010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e apcu-5.1.22.tgz sha256 ecc8b74820c32fb82ddee80446205408585d75d1632ac959fb3cdf8eaf3877b5 LICENSE diff --git a/package/php-apcu/php-apcu.mk b/package/php-apcu/php-apcu.mk index d381c9054f1d..b8eeb9de7c16 100644 --- a/package/php-apcu/php-apcu.mk +++ b/package/php-apcu/php-apcu.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_APCU_VERSION = 5.1.20 +PHP_APCU_VERSION = 5.1.22 PHP_APCU_SITE = http://pecl.php.net/get PHP_APCU_SOURCE = apcu-$(PHP_APCU_VERSION).tgz PHP_APCU_LICENSE = PHP-3.01 From c69f12d1c192cdc635c768fb144b6c5186ae6b5e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2023 12:06:04 -0600 Subject: [PATCH 1865/2890] package/php-gnupg: bump version to 1.5.1 Drop upstream patch Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...0001-Remove-inlining-_phpc_res_close.patch | 33 ------------------- package/php-gnupg/php-gnupg.hash | 2 +- package/php-gnupg/php-gnupg.mk | 2 +- 4 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch diff --git a/.checkpackageignore b/.checkpackageignore index 4062d0cb9aa1..c407581d2cde 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1111,7 +1111,6 @@ package/perl-net-ssleay/0001-fix-build-system.patch Upstream package/perl-sys-cpu/0001-remove-extraneous-include.patch Upstream package/perl-xml-libxml/0001-Makefile-PL.patch Upstream package/php-geoip/0001-add-build-support-for-php8.patch Upstream -package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch Upstream package/php-lua/0001-ZEND_ACC_ALLOW_STATIC-ZEND_ACC_STATIC-for-static-met.patch Upstream package/php-lua/0002-php8-explicitly-declare-arginfo.patch Upstream package/php-zmq/0001-updates-for-php7.4-and-php8.0.patch Upstream diff --git a/package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch b/package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch deleted file mode 100644 index 9b94cb7e4f2c..000000000000 --- a/package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 887b0899d7e7423baec691255c2d8b56bb348ecd Mon Sep 17 00:00:00 2001 -From: Jakub Zelenka -Date: Sun, 14 Mar 2021 18:52:21 +0000 -Subject: [PATCH] Remove inlining _phpc_res_close - -[Retrieved from: -https://github.com/bukka/phpc/commit/887b0899d7e7423baec691255c2d8b56bb348ecd] -Signed-off-by: Fabrice Fontaine ---- - phpc.h | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/phpc/phpc.h b/phpc/phpc.h -index dc5887e..9206105 100644 ---- a/phpc/phpc.h -+++ b/phpc/phpc.h -@@ -945,16 +945,8 @@ typedef zend_resource * phpc_res_value_t; - zend_fetch_resource2(Z_RES_P(_pz_res), _res_type_name, _res_type_1, _res_type_2) - #define PHPC_RES_DELETE(_pz_res) \ - zend_list_delete(Z_RES_P(_pz_res)) --#if PHP_MAJOR_VERSION < 8 - #define PHPC_RES_CLOSE(_pz_res) \ - zend_list_close(Z_RES_P(_pz_res)) --#else --inline int _phpc_res_close(zval *zres) { -- zend_list_close(Z_RES_P(zres)); -- return SUCCESS; --} --#define PHPC_RES_CLOSE _phpc_res_close --#endif - - /* resource to zval */ - #define PHPC_RES_PZVAL(_res, _pzv) \ diff --git a/package/php-gnupg/php-gnupg.hash b/package/php-gnupg/php-gnupg.hash index 99ffe87f461e..084de7750a58 100644 --- a/package/php-gnupg/php-gnupg.hash +++ b/package/php-gnupg/php-gnupg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d4f5f79aa483908f3df08e5b343ea3593c6d725b9ed2103e30242627659e0a64 gnupg-1.5.0.tgz +sha256 a9906f465ab2343cb2f3127ee209c72760238745c34878d9bbc1576486219252 gnupg-1.5.1.tgz sha256 da1136d4d9326317cbd320dadddf7e9b4b4edffd973eb083cb7b9754fb6a15d9 LICENSE diff --git a/package/php-gnupg/php-gnupg.mk b/package/php-gnupg/php-gnupg.mk index a89f0978af5b..89054f5f7c0e 100644 --- a/package/php-gnupg/php-gnupg.mk +++ b/package/php-gnupg/php-gnupg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_GNUPG_VERSION = 1.5.0 +PHP_GNUPG_VERSION = 1.5.1 PHP_GNUPG_SOURCE = gnupg-$(PHP_GNUPG_VERSION).tgz PHP_GNUPG_SITE = https://pecl.php.net/get # phpize does the autoconf magic From 25e18c30636b5d3156dee860a0a0ab0e2b5fdb32 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2023 12:06:05 -0600 Subject: [PATCH 1866/2890] package/php-memcached: bump version to 3.2.0 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/php-memcached/php-memcached.hash | 2 +- package/php-memcached/php-memcached.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php-memcached/php-memcached.hash b/package/php-memcached/php-memcached.hash index 7e918c17f6e1..162d25f79593 100644 --- a/package/php-memcached/php-memcached.hash +++ b/package/php-memcached/php-memcached.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b288e45f839593e16c4d8508b241de51a86df4f7322153e6becb9e1c819021fd memcached-3.1.5.tgz +sha256 2a41143a7b29f4a962a3805b77aa207a99e4566e2d314ce98a051cd24d6e9636 memcached-3.2.0.tgz sha256 24e8e3a9529204ead9422fa17cf3ddd75d292a8763b87fdb20591964f2e6ebe0 LICENSE sha256 a453a7a272fbd24105b39959f76996d50dad80b22d1c310f6c67f74f62ae4054 fastlz/LICENSE sha256 bba8cb50c660842c5ca459c5004395bdef8f01c1b64f97a9978f1053f173cb82 g_fmt.h diff --git a/package/php-memcached/php-memcached.mk b/package/php-memcached/php-memcached.mk index 068fbb786be9..f92a8ddf4cb9 100644 --- a/package/php-memcached/php-memcached.mk +++ b/package/php-memcached/php-memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_MEMCACHED_VERSION = 3.1.5 +PHP_MEMCACHED_VERSION = 3.2.0 PHP_MEMCACHED_SOURCE = memcached-$(PHP_MEMCACHED_VERSION).tgz PHP_MEMCACHED_SITE = https://pecl.php.net/get PHP_MEMCACHED_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ From 0d68ad6afec153ad1268dafa8b98fb2197c2ef61 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2023 12:06:06 -0600 Subject: [PATCH 1867/2890] package/php-pam: bump version to 2.2.4 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/php-pam/php-pam.hash | 2 +- package/php-pam/php-pam.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php-pam/php-pam.hash b/package/php-pam/php-pam.hash index c3eb49fbe7f6..be15237f7dca 100644 --- a/package/php-pam/php-pam.hash +++ b/package/php-pam/php-pam.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 fda3b5f719d51cb278351eedd3d7a96db75661324d81fdcf8072a4309121bc92 pam-2.2.3.tgz +sha256 d5c818c73c9cde4d2118bb08322dec0b532f3be48c3ef7d3f23a05af5080eb24 pam-2.2.4.tgz sha256 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 LICENSE diff --git a/package/php-pam/php-pam.mk b/package/php-pam/php-pam.mk index c35ad4f5d00c..a348fb9d44f3 100644 --- a/package/php-pam/php-pam.mk +++ b/package/php-pam/php-pam.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_PAM_VERSION = 2.2.3 +PHP_PAM_VERSION = 2.2.4 PHP_PAM_SITE = http://pecl.php.net/get PHP_PAM_SOURCE = pam-$(PHP_PAM_VERSION).tgz PHP_PAM_LICENSE = PHP-3.01 From c142cd2354846885ce9ddb6a3bb8becd2b261740 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2023 12:06:07 -0600 Subject: [PATCH 1868/2890] package/php-pecl-dbus: bump version to b147624d480c3353e6c700e9a2d0c6f14d853941 Drop upstream patches. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/php-pecl-dbus/0001-php8-compat.patch | 158 ------------------ ...lity-with-php8-call_user_function_ex.patch | 32 ---- package/php-pecl-dbus/php-pecl-dbus.hash | 2 +- package/php-pecl-dbus/php-pecl-dbus.mk | 2 +- 4 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 package/php-pecl-dbus/0001-php8-compat.patch delete mode 100644 package/php-pecl-dbus/0002-Fix-compatibility-with-php8-call_user_function_ex.patch diff --git a/package/php-pecl-dbus/0001-php8-compat.patch b/package/php-pecl-dbus/0001-php8-compat.patch deleted file mode 100644 index acca6e1d49c9..000000000000 --- a/package/php-pecl-dbus/0001-php8-compat.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 7fde4dd4d26d2a4b7957a1010c6ea9e4b940fc62 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Mon, 18 Jan 2021 23:22:52 +0200 -Subject: [PATCH] php8 compat - -Upstream: https://github.com/derickr/pecl-dbus/pull/8 -Signed-off-by: Herve Codina ---- - dbus.c | 55 ++++++++++++++++++++++++++++++------------------------ - php_dbus.h | 10 ++++++++++ - 2 files changed, 41 insertions(+), 24 deletions(-) - -diff --git a/dbus.c b/dbus.c -index 9fde647..a98e2ea 100644 ---- a/dbus.c -+++ b/dbus.c -@@ -38,6 +38,9 @@ - #define Z_ADDREF_P(z) ((z)->refcount++) - #endif - -+ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0) -+ZEND_END_ARG_INFO() -+ - /* {{{ arginfo */ - ZEND_BEGIN_ARG_INFO_EX(arginfo_dbus_object___call, 0, 0, 2) - ZEND_ARG_INFO(0, function_name) -@@ -46,44 +49,44 @@ ZEND_END_ARG_INFO() - /* }}} */ - - const zend_function_entry dbus_funcs_dbus[] = { -- PHP_ME(Dbus, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -- PHP_ME(Dbus, addWatch, NULL, ZEND_ACC_PUBLIC) -- PHP_ME(Dbus, waitLoop, NULL, ZEND_ACC_PUBLIC) -- PHP_ME(Dbus, requestName, NULL, ZEND_ACC_PUBLIC) -- PHP_ME(Dbus, registerObject, NULL, ZEND_ACC_PUBLIC) -- PHP_ME(Dbus, createProxy, NULL, ZEND_ACC_PUBLIC) -+ PHP_ME(Dbus, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -+ PHP_ME(Dbus, addWatch, arginfo_void, ZEND_ACC_PUBLIC) -+ PHP_ME(Dbus, waitLoop, arginfo_void, ZEND_ACC_PUBLIC) -+ PHP_ME(Dbus, requestName, arginfo_void, ZEND_ACC_PUBLIC) -+ PHP_ME(Dbus, registerObject, arginfo_void, ZEND_ACC_PUBLIC) -+ PHP_ME(Dbus, createProxy, arginfo_void, ZEND_ACC_PUBLIC) - PHP_FE_END - }; - - const zend_function_entry dbus_funcs_dbus_object[] = { -- PHP_ME(DbusObject, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PRIVATE) -+ PHP_ME(DbusObject, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PRIVATE) - PHP_ME(DbusObject, __call, arginfo_dbus_object___call, ZEND_ACC_PUBLIC) - PHP_FE_END - }; - - const zend_function_entry dbus_funcs_dbus_signal[] = { -- PHP_ME(DbusSignal, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -- PHP_ME(DbusSignal, matches, NULL, ZEND_ACC_PUBLIC) -- PHP_ME(DbusSignal, getData, NULL, ZEND_ACC_PUBLIC) -- PHP_ME(DbusSignal, send, NULL, ZEND_ACC_PUBLIC) -+ PHP_ME(DbusSignal, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -+ PHP_ME(DbusSignal, matches, arginfo_void, ZEND_ACC_PUBLIC) -+ PHP_ME(DbusSignal, getData, arginfo_void, ZEND_ACC_PUBLIC) -+ PHP_ME(DbusSignal, send, arginfo_void, ZEND_ACC_PUBLIC) - PHP_FE_END - }; - - const zend_function_entry dbus_funcs_dbus_array[] = { -- PHP_ME(DbusArray, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -- PHP_ME(DbusArray, getData, NULL, ZEND_ACC_PUBLIC) -+ PHP_ME(DbusArray, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -+ PHP_ME(DbusArray, getData, arginfo_void, ZEND_ACC_PUBLIC) - PHP_FE_END - }; - - const zend_function_entry dbus_funcs_dbus_dict[] = { -- PHP_ME(DbusDict, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -- PHP_ME(DbusDict, getData, NULL, ZEND_ACC_PUBLIC) -+ PHP_ME(DbusDict, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -+ PHP_ME(DbusDict, getData, arginfo_void, ZEND_ACC_PUBLIC) - PHP_FE_END - }; - - #define PHP_DBUS_INT_WRAPPER_DEF(s,t) \ - const zend_function_entry dbus_funcs_dbus_##s[] = { \ -- PHP_ME(Dbus##t, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) \ -+ PHP_ME(Dbus##t, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) \ - PHP_FE_END \ - }; - -@@ -98,26 +101,26 @@ PHP_DBUS_INT_WRAPPER_DEF(uint64,UInt64); - PHP_DBUS_INT_WRAPPER_DEF(double, Double); - - const zend_function_entry dbus_funcs_dbus_variant[] = { -- PHP_ME(DbusVariant, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -- PHP_ME(DbusVariant, getData, NULL, ZEND_ACC_PUBLIC) -+ PHP_ME(DbusVariant, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -+ PHP_ME(DbusVariant, getData, arginfo_void, ZEND_ACC_PUBLIC) - PHP_FE_END - }; - - const zend_function_entry dbus_funcs_dbus_set[] = { -- PHP_ME(DbusSet, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -- PHP_ME(DbusSet, getData, NULL, ZEND_ACC_PUBLIC) -+ PHP_ME(DbusSet, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -+ PHP_ME(DbusSet, getData, arginfo_void, ZEND_ACC_PUBLIC) - PHP_FE_END - }; - - const zend_function_entry dbus_funcs_dbus_struct[] = { -- PHP_ME(DbusStruct, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -- PHP_ME(DbusStruct, getData, NULL, ZEND_ACC_PUBLIC) -+ PHP_ME(DbusStruct, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -+ PHP_ME(DbusStruct, getData, arginfo_void, ZEND_ACC_PUBLIC) - PHP_FE_END - }; - - const zend_function_entry dbus_funcs_dbus_object_path[] = { -- PHP_ME(DbusObjectPath, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -- PHP_ME(DbusObjectPath, getData, NULL, ZEND_ACC_PUBLIC) -+ PHP_ME(DbusObjectPath, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) -+ PHP_ME(DbusObjectPath, getData, arginfo_void, ZEND_ACC_PUBLIC) - PHP_FE_END - }; - -@@ -405,7 +408,11 @@ static void dbus_register_classes(TSRMLS_D) - dbus_ce_dbus = zend_register_internal_class_ex(&ce_dbus, NULL); - memcpy(&dbus_object_handlers_dbus, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); - dbus_object_handlers_dbus.clone_obj = dbus_object_clone_dbus; -+#if PHP_VERSION_ID < 80000 - dbus_object_handlers_dbus.compare_objects = dbus_object_compare_dbus; -+#else -+ dbus_object_handlers_dbus.compare = dbus_object_compare_dbus; -+#endif - - zend_declare_class_constant_long(dbus_ce_dbus, "BYTE", sizeof("BYTE")-1, DBUS_TYPE_BYTE TSRMLS_CC); - zend_declare_class_constant_long(dbus_ce_dbus, "BOOLEAN", sizeof("BOOLEAN")-1, DBUS_TYPE_BOOLEAN TSRMLS_CC); -diff --git a/php_dbus.h b/php_dbus.h -index 8817544..1f0f551 100644 ---- a/php_dbus.h -+++ b/php_dbus.h -@@ -25,6 +25,16 @@ - #include "config.h" - #endif - -+#if PHP_VERSION_ID >= 80000 -+#ifndef TSRMLS_D -+#define TSRMLS_D void -+#define TSRMLS_DC -+#define TSRMLS_C -+#define TSRMLS_CC -+#define TSRMLS_FETCH() -+#endif -+#endif /* PHP_VERSION_ID >= 80000 */ -+ - #include "Zend/zend_hash.h" - - #define PHP_DBUS_VERSION "0.2.0" --- -2.31.1 - diff --git a/package/php-pecl-dbus/0002-Fix-compatibility-with-php8-call_user_function_ex.patch b/package/php-pecl-dbus/0002-Fix-compatibility-with-php8-call_user_function_ex.patch deleted file mode 100644 index 5babce94b45c..000000000000 --- a/package/php-pecl-dbus/0002-Fix-compatibility-with-php8-call_user_function_ex.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8cf66c4b5dd657ca14552b27a42901db0a5e9280 Mon Sep 17 00:00:00 2001 -From: Herve Codina -Date: Mon, 4 Oct 2021 17:13:45 +0200 -Subject: [PATCH] Fix compatibility with php8 - call_user_function_ex - -This patch fixes compatibility with php8 replacing -call_user_function_ex by call_user_function. - -Upstream: https://github.com/derickr/pecl-dbus/pull/8 -Signed-off-by: Herve Codina ---- - dbus.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dbus.c b/dbus.c -index a98e2ea..6fa9897 100644 ---- a/dbus.c -+++ b/dbus.c -@@ -1015,8 +1015,8 @@ php_dbus_do_method_call(php_dbus_obj *dbus, - method_args = safe_emalloc(sizeof(zval *), num_elems, 0); - } - -- if (call_user_function_ex(EG(function_table), object, &callback, &retval, -- num_elems, method_args, 0, NULL) == SUCCESS) { -+ if (call_user_function(EG(function_table), object, &callback, &retval, -+ num_elems, method_args) == SUCCESS) { - if (!Z_ISUNDEF(retval)) { - reply = dbus_message_new_method_return(msg); - php_dbus_append_parameters(reply, &retval, NULL, --- -2.31.1 - diff --git a/package/php-pecl-dbus/php-pecl-dbus.hash b/package/php-pecl-dbus/php-pecl-dbus.hash index f43e2c8b5131..122636913c14 100644 --- a/package/php-pecl-dbus/php-pecl-dbus.hash +++ b/package/php-pecl-dbus/php-pecl-dbus.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 c48761c645c6fa42b57af0e65d893217dc69bcd8d879ace74d6abbf1c5f73a8f php-pecl-dbus-315d17558c7614d02e923d898231e51c86a25789.tar.gz +sha256 652db988457479682ef1bbe00952d746b54150e77f06a4d75ffa3a696f5321ba php-pecl-dbus-b147624d480c3353e6c700e9a2d0c6f14d853941.tar.gz sha256 ecc8b74820c32fb82ddee80446205408585d75d1632ac959fb3cdf8eaf3877b5 LICENSE diff --git a/package/php-pecl-dbus/php-pecl-dbus.mk b/package/php-pecl-dbus/php-pecl-dbus.mk index a70a2e7ae1d3..84cc373bb719 100644 --- a/package/php-pecl-dbus/php-pecl-dbus.mk +++ b/package/php-pecl-dbus/php-pecl-dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_PECL_DBUS_VERSION = 315d17558c7614d02e923d898231e51c86a25789 +PHP_PECL_DBUS_VERSION = b147624d480c3353e6c700e9a2d0c6f14d853941 PHP_PECL_DBUS_SITE = $(call github,derickr,pecl-dbus,$(PHP_PECL_DBUS_VERSION)) PHP_PECL_DBUS_LICENSE = PHP-3.01 PHP_PECL_DBUS_LICENSE_FILES = LICENSE From 73a78cbac480e0d6740637c61d2d348bae8f9442 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2023 12:06:08 -0600 Subject: [PATCH 1869/2890] package/php-ssh2: bump version to 1.4 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/php-ssh2/php-ssh2.hash | 2 +- package/php-ssh2/php-ssh2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php-ssh2/php-ssh2.hash b/package/php-ssh2/php-ssh2.hash index 3fbb0b24c811..69e0b920710e 100644 --- a/package/php-ssh2/php-ssh2.hash +++ b/package/php-ssh2/php-ssh2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9093a1f8d24dc65836027b0e239c50de8d5eaebf8396bc3331fdd38c5d69afd9 ssh2-1.3.1.tgz +sha256 988b52e0315bb5ed725050cb02de89b541034b7be6b94623dcb2baa33f811d87 ssh2-1.4.tgz sha256 ac7c56f1e416ce6e60abcf26269395128bc9e5a2e4f3293e5dcc124aac606508 LICENSE diff --git a/package/php-ssh2/php-ssh2.mk b/package/php-ssh2/php-ssh2.mk index b79ac04179b1..e7955a2c0728 100644 --- a/package/php-ssh2/php-ssh2.mk +++ b/package/php-ssh2/php-ssh2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_SSH2_VERSION = 1.3.1 +PHP_SSH2_VERSION = 1.4 PHP_SSH2_SOURCE = ssh2-$(PHP_SSH2_VERSION).tgz PHP_SSH2_SITE = https://pecl.php.net/get PHP_SSH2_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ From ec3d0ccc9da4f9b29378c327e83043bdbdb3ba0c Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2023 12:06:09 -0600 Subject: [PATCH 1870/2890] package/php-xdebug: bump version to 3.2.2 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/php-xdebug/php-xdebug.hash | 2 +- package/php-xdebug/php-xdebug.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash index fa92ee82ed36..2509e6e2eee1 100644 --- a/package/php-xdebug/php-xdebug.hash +++ b/package/php-xdebug/php-xdebug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7 xdebug-3.2.0.tgz +sha256 f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157 xdebug-3.2.2.tgz sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index 9429d4afeebf..c5a1e10ebc50 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_XDEBUG_VERSION = 3.2.0 +PHP_XDEBUG_VERSION = 3.2.2 PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz PHP_XDEBUG_SITE = https://xdebug.org/files PHP_XDEBUG_INSTALL_STAGING = YES From 07b843ac04d47de46dec1778e7a8d19d449ccf0a Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2023 12:06:10 -0600 Subject: [PATCH 1871/2890] package/php-yaml: bump version to 2.2.3 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/php-yaml/php-yaml.hash | 2 +- package/php-yaml/php-yaml.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php-yaml/php-yaml.hash b/package/php-yaml/php-yaml.hash index b4d14c5a30ce..4fa5dfbc162a 100644 --- a/package/php-yaml/php-yaml.hash +++ b/package/php-yaml/php-yaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 119052f0461d57d86f44c252f9c9b2dd743486c701c1a0aba0aebecdd0d8b82a yaml-2.2.2.tgz +sha256 5937eb9722ddf6d64626799cfa024598ff2452ea157992e4e67331a253f90236 yaml-2.2.3.tgz sha256 68d9700294396c72089bfc7bf38a5b3654a53ae415f3bd37768848c14e86f338 LICENSE diff --git a/package/php-yaml/php-yaml.mk b/package/php-yaml/php-yaml.mk index 39a422e25d28..e825e3146fab 100644 --- a/package/php-yaml/php-yaml.mk +++ b/package/php-yaml/php-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_YAML_VERSION = 2.2.2 +PHP_YAML_VERSION = 2.2.3 PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz PHP_YAML_SITE = https://pecl.php.net/get PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ From f862a1abf167dd95c419758ad84e7652cbbc2b68 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 7 Sep 2023 03:45:45 -0700 Subject: [PATCH 1872/2890] package/conmon: bump version to 2.1.8 Bug fixes. https://github.com/containers/conmon/releases/tag/v2.1.8 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/conmon/conmon.hash | 2 +- package/conmon/conmon.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/conmon/conmon.hash b/package/conmon/conmon.hash index 82d1d14ba331..f2e89b8a92ec 100644 --- a/package/conmon/conmon.hash +++ b/package/conmon/conmon.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7d0f9a2f7cb8a76c51990128ac837aaf0cc89950b6ef9972e94417aa9cf901fe conmon-2.1.7.tar.gz +sha256 e72c090210a03ca3b43a0fad53f15bca90bbee65105c412468009cf3a5988325 conmon-2.1.8.tar.gz sha256 9c9d771d4004725237a31ada889fe06c85a24fd0a29e41825181ab4cde54f016 LICENSE diff --git a/package/conmon/conmon.mk b/package/conmon/conmon.mk index f3567a4305ba..29deb2af4738 100644 --- a/package/conmon/conmon.mk +++ b/package/conmon/conmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONMON_VERSION = 2.1.7 +CONMON_VERSION = 2.1.8 CONMON_SITE = $(call github,containers,conmon,v$(CONMON_VERSION)) CONMON_LICENSE = Apache-2.0 CONMON_LICENSE_FILES = LICENSE From 54b6eced24326ce02328d64d415753a5c0c79e00 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Thu, 7 Sep 2023 00:12:00 +0000 Subject: [PATCH 1873/2890] package/erlang: support building on aarch64 Erlang has good support for aarch64 hosts, and this allows it to be built without a warning. Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/erlang/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/erlang/Config.in b/package/erlang/Config.in index 8f9700bf5c7b..d3fe0dbec10f 100644 --- a/package/erlang/Config.in +++ b/package/erlang/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS bool + default y if BR2_HOSTARCH = "aarch64" default y if BR2_HOSTARCH = "x86_64" default y if BR2_HOSTARCH = "x86" From b25f1cb47c55dab9de706d61809936839cfe8f5f Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Wed, 6 Sep 2023 21:49:51 +0200 Subject: [PATCH 1874/2890] package/libiec61850: ignore CVE-2023-27772 Segmentation fault in example code can be exploited. BUILD_EXAMPLES is disabled for all cmake projects. See https://github.com/mz-automation/libiec61850/issues/442 Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/libiec61850/libiec61850.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 9bd55cb76a91..4b61e40c6d12 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -11,5 +11,8 @@ LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING LIBIEC61850_CPE_ID_VENDOR = mz-automation LIBIEC61850_CONF_OPTS = -DBUILD_PYTHON_BINDINGS=OFF +# Examples aren't build +# https://github.com/mz-automation/libiec61850/issues/442 +LIBIEC61850_IGNORE_CVES += CVE-2023-27772 $(eval $(cmake-package)) From 177170f42fa882d60f89e2f5402a14e416fb67de Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 5 Sep 2023 14:46:34 -0600 Subject: [PATCH 1875/2890] DEVELOPERS: add myself as developer for all python packages Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 71 +----------------------------------------------------- 1 file changed, 1 insertion(+), 70 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 6daf4657dd1e..648058fcbeb2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1403,76 +1403,7 @@ F: package/lilv/ F: package/lv2/ F: package/neon-2-sse/ F: package/pipewire/ -F: package/python-aioconsole/ -F: package/python-aiodns/ -F: package/python-aiohttp/ -F: package/python-aiohttp-cors/ -F: package/python-aiohttp-debugtoolbar/ -F: package/python-aiohttp-jinja2/ -F: package/python-aiohttp-mako/ -F: package/python-aiohttp-remotes/ -F: package/python-aiohttp-security/ -F: package/python-aiohttp-session/ -F: package/python-aiohttp-sse/ -F: package/python-aiologstash/ -F: package/python-aiomonitor/ -F: package/python-aiojobs/ -F: package/python-aioprocessing/ -F: package/python-aiorwlock/ -F: package/python-aiosignal/ -F: package/python-aiozipkin/ -F: package/python-argon2-cffi/ -F: package/python-argon2-cffi-bindings/ -F: package/python-async-generator/ -F: package/python-async-lru/ -F: package/python-async-timeout/ -F: package/python-bidict/ -F: package/python-brotli/ -F: package/python-cbor2/ -F: package/python-cchardet/ -F: package/python-charset-normalizer/ -F: package/python-cssselect2/ -F: package/python-distlib/ -F: package/python-editables/ -F: package/python-flatbuffers/ -F: package/python-fonttools/ -F: package/python-frozenlist/ -F: package/python-greenlet/ -F: package/python-h11/ -F: package/python-hatchling/ -F: package/python-hatch-fancy-pypi-readme/ -F: package/python-hatch-vcs/ -F: package/python-installer/ -F: package/python-janus/ -F: package/python-logstash/ -F: package/python-maturin/ -F: package/python-multidict/ -F: package/python-mypy-extensions/ -F: package/python-outcome/ -F: package/python-pathspec/ -F: package/python-pycares/ -F: package/python-pydyf/ -F: package/python-pypa-build/ -F: package/python-pyphen/ -F: package/python-pyproject-hooks/ -F: package/python-rpds-py/ -F: package/python-rtoml/ -F: package/python-selenium/ -F: package/python-snappy/ -F: package/python-sniffio/ -F: package/python-sockjs/ -F: package/python-terminaltables/ -F: package/python-tinycss2/ -F: package/python-tomli/ -F: package/python-trio/ -F: package/python-trio-websocket/ -F: package/python-typeguard/ -F: package/python-typing-inspect/ -F: package/python-uhid/ -F: package/python-weasyprint/ -F: package/python-wsproto/ -F: package/python-yarl/ -F: package/python-zopfli/ +F: package/python* F: package/rtl8192eu/ F: package/serd/ F: package/sord/ From b0f2709e6f9654deff5e6d386454fa389f853b5a Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Tue, 5 Sep 2023 09:45:54 +0300 Subject: [PATCH 1876/2890] package/timescaledb: bump version to 2.11.2 Release notes: https://github.com/timescale/timescaledb/blob/2.11.2/CHANGELOG.md Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index aa8b3ac49737..0f2269986e70 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 06a653881dd2460a9c9007dd823be8827ef83fae90a4b628d0b0d5066f60f496 timescaledb-2.11.1.tar.gz +sha256 acca5f6ec5684722374eece92f73d7763bd171075074fd2e6bd0244bda9fbc25 timescaledb-2.11.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index a32641e09d23..fe7bcbc36e0c 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.11.1 +TIMESCALEDB_VERSION = 2.11.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 25408f767d85ee77937bd2ec56e08a7e893d48a2 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Tue, 5 Sep 2023 10:11:19 +0300 Subject: [PATCH 1877/2890] package/osm2pgsql: bump version to 1.9.2 Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.9.2 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/osm2pgsql/Config.in | 1 + package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index 3e73572a800e..c6a38f318065 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_OSM2PGSQL select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_JSON_FOR_MODERN_CPP select BR2_PACKAGE_LIBOSMIUM select BR2_PACKAGE_PROTOZERO select BR2_PACKAGE_ZLIB diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index cc13bf741d9c..0b4eb17c99a3 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9e3cd9e13893fd7a153c7b42089bd23338867190c91b157cbdb4ff7176ecba62 osm2pgsql-1.8.1.tar.gz +sha256 dc30a3ad9a27f944e4169be9a8e07ee09711901536ddc8fcf4a292bd3aec51d9 osm2pgsql-1.9.2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 11f09fe7d1a5..44c980ac9552 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,13 +4,13 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.8.1 +OSM2PGSQL_VERSION = 1.9.2 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO -OSM2PGSQL_DEPENDENCIES = boost bzip2 expat libosmium postgresql protozero zlib +OSM2PGSQL_DEPENDENCIES = boost bzip2 expat json-for-modern-cpp libosmium postgresql protozero zlib # fmt > 8.0 is not yet supported OSM2PGSQL_CONF_OPTS = \ From a1dff18f6645d321dd3d678b6c1f204ad4aa2071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Tue, 5 Sep 2023 10:56:40 +0200 Subject: [PATCH 1878/2890] package/libzlib: bump to version 1.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/madler/zlib/releases/tag/v1.3 Signed-off-by: Sébastien Szymanski Signed-off-by: Thomas Petazzoni --- package/libzlib/libzlib.hash | 2 +- package/libzlib/libzlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash index df5e8d723a12..23bfda84749f 100644 --- a/package/libzlib/libzlib.hash +++ b/package/libzlib/libzlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98 zlib-1.2.13.tar.xz +sha256 8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7 zlib-1.3.tar.xz # License files, locally calculated sha256 845efc77857d485d91fb3e0b884aaa929368c717ae8186b66fe1ed2495753243 LICENSE diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index e344cc7ad9c1..da452af8e9ec 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZLIB_VERSION = 1.2.13 +LIBZLIB_VERSION = 1.3 LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz LIBZLIB_SITE = http://www.zlib.net LIBZLIB_LICENSE = Zlib From b86542085df87da91057017b17f261a213bfd918 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 9 Sep 2023 22:10:01 -0600 Subject: [PATCH 1879/2890] package/swupdate: bump to version 2023.05 ISC license hash changed due to text update: https://github.com/sbabic/swupdate/commit/d217a9b10e7b25296db4899beabc2de2b379c921 Set new HAVE_LIBEBGENV and HAVE_LIBUBOOTENV env variables. Apply latest updates to swupdate-usb@.service from: https://github.com/sbabic/meta-swupdate/commit/d5f84e74aada1212ed877509bdc546dca468451b https://github.com/sbabic/meta-swupdate/commit/dac7b2d10ec84b2b6de9afadc12419398ea73615 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate-usb@.service | 10 ++++++---- package/swupdate/swupdate.hash | 4 ++-- package/swupdate/swupdate.mk | 8 +++++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/package/swupdate/swupdate-usb@.service b/package/swupdate/swupdate-usb@.service index df1a40842170..28d805f8ec99 100644 --- a/package/swupdate/swupdate-usb@.service +++ b/package/swupdate/swupdate-usb@.service @@ -1,9 +1,11 @@ [Unit] Description=usb media swupdate service Requires=swupdate.service -Requires=swupdate-progress.service +Wants=swupdate-progress.service [Service] -ExecStartPre=/bin/mount /dev/%I /mnt -ExecStart=/bin/sh -c "swupdate-client -v /mnt/*.swu" -ExecStopPost=/bin/umount /mnt +ExecStartPre=/bin/mkdir -p /tmp/%I +ExecStartPre=/bin/mount /dev/%I /tmp/%I +ExecStart=/bin/sh -c "swupdate-client -v /tmp/%I/*.swu" +ExecStopPost=/bin/umount /tmp/%I +ExecStopPost=/bin/rmdir /tmp/%I diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 1b26f9e5e224..72b71ce12d82 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,12 +1,12 @@ # Locally calculated -sha256 e6335e87812a98a87f1c55df03c9f4e4ef042789570002c5db120b09f64b0d86 swupdate-2022.12.tar.gz +sha256 888df5050035e4fbe14e3a964885646fa3163e727f78c423c3d24c28f7a50b66 swupdate-2023.05.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt sha256 cde7883b9050a1104f4ac19a1572aafd6e5d7323b68351aaf51fbf4beba54966 LICENSES/CC-BY-SA-4.0.txt sha256 5d51b52a40391a26cbb2accf5dc5d1c165de49a022d9d5efb50b22204d2682ec LICENSES/GPL-2.0-only.txt sha256 43fd695e9b198a9a4997cc2d02e10d26cae937e2c4930b9eff9c6d349c85cd32 LICENSES/GPL-2.0-or-later.txt -sha256 492e801f1b0632185431472f148885a4fe8e990b10da57b4986a8bcf140a5374 LICENSES/ISC.txt +sha256 f8f41f38133176a6db6c1bd8d7bd1a9c910e3563f1cb7bbe32b05e8b8d3a9c61 LICENSES/ISC.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSES/MIT.txt sha256 8f2368a292194be10b1223a8875815240a9208bb30785cb13d8849eb6a750fe9 LICENSES/OFL-1.1.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 84905d2e0a69..ea4a5a62e5ef 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2022.12 +SWUPDATE_VERSION = 2023.05 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1 SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ @@ -24,6 +24,9 @@ SWUPDATE_INSTALL_STAGING = YES # TARGET_CC is used for both. SWUPDATE_MAKE_ENV = CC="$(TARGET_CC)" LD="$(TARGET_CC)" SKIP_STRIP=y +# we don't package EFI Boot Guard/libebgenv +SWUPDATE_MAKE_ENV += HAVE_LIBEBGENV=n + # swupdate bundles its own version of mongoose (version 6.16) ifeq ($(BR2_PACKAGE_E2FSPROGS),y) @@ -84,6 +87,9 @@ endif ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y) SWUPDATE_DEPENDENCIES += libubootenv +SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=y +else +SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=n endif ifeq ($(BR2_PACKAGE_LIBURIPARSER),y) From 56e7ca5dbc466f301ef6f5810177cfc17f73b9ae Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 10 Sep 2023 16:27:39 +0200 Subject: [PATCH 1880/2890] package/zynaddsubfx: fix build with gcc 13 When compiling with gcc 13, build fails with errors, such as: In file included from /build/zynaddsubfx-3.0.6/src/Nio/NulEngine.h:21, from /build/zynaddsubfx-3.0.6/src/Nio/NulEngine.cpp:14: /build/zynaddsubfx-3.0.6/src/Nio/MidiIn.h:37:9: error: 'uint8_t' does not name a type 37 | uint8_t midiSysEx(unsigned char data); | ^~~~~~~ Those gcc 13 changes were announced at: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes This commit fixes the issue by adding upstream patches, not yet included in a release. Fixes: http://autobuild.buildroot.net/results/97b5a30c7be820ac91e745cf60f9b759e962aa5c Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...1-MidiIn-Add-stdint.h-header-include.patch | 26 +++++++++++++++++ ...002-Bank-Add-stdint.h-header-include.patch | 28 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 package/zynaddsubfx/0001-MidiIn-Add-stdint.h-header-include.patch create mode 100644 package/zynaddsubfx/0002-Bank-Add-stdint.h-header-include.patch diff --git a/package/zynaddsubfx/0001-MidiIn-Add-stdint.h-header-include.patch b/package/zynaddsubfx/0001-MidiIn-Add-stdint.h-header-include.patch new file mode 100644 index 000000000000..ea4eb6619069 --- /dev/null +++ b/package/zynaddsubfx/0001-MidiIn-Add-stdint.h-header-include.patch @@ -0,0 +1,26 @@ +From 4f1565f18cf71867f25f31c50c3a5e6995f49ae6 Mon Sep 17 00:00:00 2001 +From: fundamental +Date: Sat, 22 Apr 2023 10:21:09 -0400 +Subject: [PATCH] MidiIn: Add stdint.h header include + +Upstream: https://github.com/zynaddsubfx/zynaddsubfx/commit/70905c96fe7b9ffde19bc4bc05b0dc53a1ed1707 +Signed-off-by: Julien Olivain +--- + src/Nio/MidiIn.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Nio/MidiIn.h b/src/Nio/MidiIn.h +index ce0bcfec..c6b30c61 100644 +--- a/src/Nio/MidiIn.h ++++ b/src/Nio/MidiIn.h +@@ -17,6 +17,7 @@ + #define MIDI_IN_H + + #include "Engine.h" ++#include //uint8_t + + namespace zyn { + +-- +2.41.0 + diff --git a/package/zynaddsubfx/0002-Bank-Add-stdint.h-header-include.patch b/package/zynaddsubfx/0002-Bank-Add-stdint.h-header-include.patch new file mode 100644 index 000000000000..556854a9e2f5 --- /dev/null +++ b/package/zynaddsubfx/0002-Bank-Add-stdint.h-header-include.patch @@ -0,0 +1,28 @@ +From eab3bc1712e5af7e6aef942a24e833ce2c429436 Mon Sep 17 00:00:00 2001 +From: fundamental +Date: Wed, 19 Apr 2023 21:52:01 -0400 +Subject: [PATCH] Bank: Add stdint.h header include + +As uint8_t is used, this header should be included. + +Upstream: https://github.com/zynaddsubfx/zynaddsubfx/commit/f384d92486d6b515cb628d0f52008a9e03341d8c +Signed-off-by: Julien Olivain +--- + src/Misc/Bank.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Misc/Bank.h b/src/Misc/Bank.h +index 5120441a..3f324dd8 100644 +--- a/src/Misc/Bank.h ++++ b/src/Misc/Bank.h +@@ -18,6 +18,7 @@ + #include + #include "../globals.h" + #include "Config.h" ++#include + + //entries in a bank + #define BANK_SIZE 160 +-- +2.41.0 + From b492a5414e49ea18309eb17e8f1d3cc81d92b3fa Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 8 Sep 2023 22:52:42 +0200 Subject: [PATCH 1881/2890] support/testing/tests/package/test_less.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_less.py | 57 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 support/testing/tests/package/test_less.py diff --git a/DEVELOPERS b/DEVELOPERS index 648058fcbeb2..a7410d61fa00 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1741,6 +1741,7 @@ F: support/testing/tests/package/test_kexec.py F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_kmscube.py F: support/testing/tests/package/test_kmscube/ +F: support/testing/tests/package/test_less.py F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lrzip.py F: support/testing/tests/package/test_lzip.py diff --git a/support/testing/tests/package/test_less.py b/support/testing/tests/package/test_less.py new file mode 100644 index 000000000000..3d8c4fc94c04 --- /dev/null +++ b/support/testing/tests/package/test_less.py @@ -0,0 +1,57 @@ +import os + +import infra.basetest + + +class TestLess(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_LESS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can execute. This command also checks that + # the "less" program is from the actual "less" package, rather + # than the Busybox implementation (the Busybox "less" applet + # does not recognize the "--version" option and would fail). + self.assertRunOk("less --version") + + # We create a test file. + ref_txt = "Hello Buildroot!" + input_fname = "input.txt" + self.assertRunOk(f"echo \'{ref_txt}\' > {input_fname}") + + # "less" is mainly an interactive user program and uses + # terminal control characters. This test checks a basic "less" + # invocation in which there is no user interaction. The + # program is expected to give back the input data. + output, exit_code = self.emulator.run(f"less -F {input_fname}") + self.assertEqual(exit_code, 0) + # "less" might insert a carriage-return ^M control character, + # which will be converted to a new-line (by the + # str.splitlines() in Emulator.run()). We check that our + # reference text line is in the output (rather than only + # testing output[0]). + self.assertIn(ref_txt, output) + + # We redo about the same test, with "less" reading stdin this + # time. We also use the "less -o log" option to log the output + # into a file. We expect to see our reference text on stdout. + output_fname = "output.txt" + cmd = f"cat {input_fname} | less -F -o {output_fname}" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(ref_txt, output) + + # The output file content which logged the output is also + # expected to be the same as the input. + self.assertRunOk(f"cmp {input_fname} {output_fname}") From fc942d50334d7fa831f0d47d46aa013f6f26ef5d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 8 Sep 2023 22:55:38 +0200 Subject: [PATCH 1882/2890] support/testing/tests/package/test_screen.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_screen.py | 61 ++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 support/testing/tests/package/test_screen.py diff --git a/DEVELOPERS b/DEVELOPERS index a7410d61fa00..a0e2dcca27ba 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1768,6 +1768,7 @@ F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ +F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ diff --git a/support/testing/tests/package/test_screen.py b/support/testing/tests/package/test_screen.py new file mode 100644 index 000000000000..b6264d34dfe7 --- /dev/null +++ b/support/testing/tests/package/test_screen.py @@ -0,0 +1,61 @@ +import os + +import infra.basetest + + +class TestScreen(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_SCREEN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + session_name = "BuildrootSession" + message = "HelloBuildroot" + screen_dump = "screen.dump.txt" + + # Check the program can execute + self.assertRunOk("screen --version") + + # There is no "screen" running yet. Listing sessions is + # expected to fail. + _, exit_code = self.emulator.run("screen -ls") + self.assertNotEqual(exit_code, 0) + + # We now start a detached and named session. + self.assertRunOk(f"screen -dmS {session_name}") + + # Since we are supposed to have a running session, it should + # appear in the list. + output, exit_code = self.emulator.run("screen -ls") + self.assertEqual(exit_code, 0) + self.assertIn(session_name, "\n".join(output)) + + # We send an exec command to print a message in the "screen" + # display running in background. + cmd = f"screen -S {session_name} -X exec printf {message}" + self.assertRunOk(cmd) + + # We request a hardcopy of this "screen" display. + cmd = f"screen -S {session_name} -X hardcopy {screen_dump}" + self.assertRunOk(cmd) + + # The dump file is supposed to contain our message. + self.assertRunOk(f"grep -Fo '{message}' {screen_dump}") + + # We request "screen" to quit... + cmd = f"screen -S {session_name} -X quit" + self.assertRunOk(cmd) + + # Since the session is supposed to be terminated, listing + # sessions is expected to fail (again). + _, exit_code = self.emulator.run("screen -ls") + self.assertNotEqual(exit_code, 0) From 02497626adad0da120315e00ef8a323546ce53b8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 8 Sep 2023 23:02:53 +0200 Subject: [PATCH 1883/2890] support/testing/tests/package/test_libgpgme.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../testing/tests/package/test_libgpgme.py | 88 +++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 support/testing/tests/package/test_libgpgme.py diff --git a/DEVELOPERS b/DEVELOPERS index a0e2dcca27ba..d72dce866fbb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1742,6 +1742,7 @@ F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_kmscube.py F: support/testing/tests/package/test_kmscube/ F: support/testing/tests/package/test_less.py +F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lrzip.py F: support/testing/tests/package/test_lzip.py diff --git a/support/testing/tests/package/test_libgpgme.py b/support/testing/tests/package/test_libgpgme.py new file mode 100644 index 000000000000..28a33bab0362 --- /dev/null +++ b/support/testing/tests/package/test_libgpgme.py @@ -0,0 +1,88 @@ +import os + +import infra.basetest + + +class TestLibGpgme(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_LIBGPGME=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We check the binary program can execute. + self.assertRunOk("gpgme-tool --version") + + # Some common data for all the tests. + plain_data = "Hello Buildroot!" + gpg_userid = "br-test@buildroot" + plain_file = "reference-plain.txt" + enc_file = "encrypted.dat" + dec_file = "decrypted.txt" + + # We did not create a gpg key yet. We should not be able to + # list our key. + gpgme_listkey = f"echo LISTKEYS | gpgme-tool | grep '{gpg_userid}'" + _, exit_code = self.emulator.run(gpgme_listkey) + self.assertNotEqual(exit_code, 0) + + # We now create our gpg key. + cmd = "gpg --batch --passphrase ''" + cmd += f" --quick-generate-key {gpg_userid} default default" + self.assertRunOk(cmd) + + # We should now see our key in the list. + self.assertRunOk(gpgme_listkey) + + # We generate a plain text data file. + cmd = f"echo '{plain_data}' > {plain_file}" + self.assertRunOk(cmd) + + # We encrypt the plain text file using gpgme-tool commands. + gpgme_enc_cmds = [ + "RESET", + f"INPUT FILE={plain_file}", + f"OUTPUT FILE={enc_file}", + f"RECIPIENT {gpg_userid}", + "ENCRYPT", + "BYE" + ] + cmd = "gpgme-tool < Date: Tue, 5 Sep 2023 00:15:49 +0200 Subject: [PATCH 1884/2890] package/openblas: bump to version v0.3.24 For change log since v0.3.23, see: https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.24 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/openblas/openblas.hash | 6 +++--- package/openblas/openblas.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index 2e5fa8865f71..8e416f98f6c0 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,5 +1,5 @@ -# From https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.23 -md5 115634b39007de71eb7e75cf7591dfb2 openblas-0.3.23.tar.gz +# From https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.24 +md5 23599a30e4ce887590957d94896789c8 openblas-0.3.24.tar.gz # Locally calculated -sha256 5d9491d07168a5d00116cdc068a40022c3455bf9293c7cb86a65b1054d7e5114 openblas-0.3.23.tar.gz +sha256 ceadc5065da97bd92404cac7254da66cc6eb192679cf1002098688978d4d5132 openblas-0.3.24.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index d8fcb4a2c647..0d0e8e56dd00 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.23 +OPENBLAS_VERSION = 0.3.24 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE From 19706002dee62276a472cc492f19111070881f66 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 4 Sep 2023 18:57:45 +0200 Subject: [PATCH 1885/2890] package/strace: bump to version 6.5 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/strace/strace.hash | 4 ++-- package/strace/strace.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index e6e9c4ec9616..c43d3aabbc32 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.4/strace-6.4.tar.xz.asc -sha256 27987dbac57fdfd260c6db4dc8328df35c95c6867c8a3d4371d59cdcf4eb9238 strace-6.4.tar.xz +# https://strace.io/files/6.5/strace-6.5.tar.xz.asc +sha256 dfb051702389e1979a151892b5901afc9e93bbc1c70d84c906ade3224ca91980 strace-6.5.tar.xz sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index b109578a350d..d2ffaafc43cd 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.4 +STRACE_VERSION = 6.5 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From a837a609a83428b56fa03e18c439b3878d14fdb6 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Mon, 4 Sep 2023 13:36:32 +1000 Subject: [PATCH 1886/2890] package/libspdm: new package Signed-off-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...-x509-Remove-internal-OpenSSL-crypto.patch | 44 ++++++++++ ...lib_openssl-ecd-Allow-disabling-code.patch | 56 +++++++++++++ ...-ec-Remove-internal-OpenSSL-crypto-i.patch | 82 +++++++++++++++++++ ...llow-disabling-EDDSA-support-from-co.patch | 31 +++++++ package/libspdm/Config.in | 24 ++++++ package/libspdm/libspdm.hash | 3 + package/libspdm/libspdm.mk | 43 ++++++++++ 9 files changed, 285 insertions(+) create mode 100644 package/libspdm/0001-cryptlib_openssl-x509-Remove-internal-OpenSSL-crypto.patch create mode 100644 package/libspdm/0002-cryptlib_openssl-ecd-Allow-disabling-code.patch create mode 100644 package/libspdm/0003-cryptlib_openssl-ec-Remove-internal-OpenSSL-crypto-i.patch create mode 100644 package/libspdm/0004-CMakeLists.txt-Allow-disabling-EDDSA-support-from-co.patch create mode 100644 package/libspdm/Config.in create mode 100644 package/libspdm/libspdm.hash create mode 100644 package/libspdm/libspdm.mk diff --git a/DEVELOPERS b/DEVELOPERS index d72dce866fbb..7fae4841e448 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -126,6 +126,7 @@ N: Alistair Francis F: board/sifive/ F: boot/opensbi/ F: configs/hifive_unleashed_defconfig +F: package/libspdm/ F: package/xen/ N: Alvaro G. M diff --git a/package/Config.in b/package/Config.in index 2ed37b67b8a3..e8dbadadf323 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1506,6 +1506,7 @@ menu "Crypto" source "package/libsecret/Config.in" source "package/libsha1/Config.in" source "package/libsodium/Config.in" + source "package/libspdm/Config.in" source "package/libssh/Config.in" source "package/libssh2/Config.in" source "package/libtomcrypt/Config.in" diff --git a/package/libspdm/0001-cryptlib_openssl-x509-Remove-internal-OpenSSL-crypto.patch b/package/libspdm/0001-cryptlib_openssl-x509-Remove-internal-OpenSSL-crypto.patch new file mode 100644 index 000000000000..d5d233b7ab93 --- /dev/null +++ b/package/libspdm/0001-cryptlib_openssl-x509-Remove-internal-OpenSSL-crypto.patch @@ -0,0 +1,44 @@ +From 7db883cdb3369cfaf9f0890b0eda503f47a5ffa3 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Fri, 11 Aug 2023 16:26:53 -0400 +Subject: [PATCH] cryptlib_openssl: x509: Remove internal OpenSSL crypto + include + +The OpenSSL source code describes the crypto include as: +"Internal EC functions for other submodules: not for application use" + - https://github.com/openssl/openssl/blob/master/include/crypto/ec.h + +Using the internal APIS makes it difficult to use libspdm as a library +with other packages. So let's remove the uses of the internal API and +instead use the public API. + +Signed-off-by: Alistair Francis +Upstream: https://github.com/DMTF/libspdm/commit/7db883cdb3369cfaf9f0890b0eda503f47a5ffa3 +--- + os_stub/cryptlib_openssl/pk/x509.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/os_stub/cryptlib_openssl/pk/x509.c b/os_stub/cryptlib_openssl/pk/x509.c +index c067f3d0ca..1a2736132b 100644 +--- a/os_stub/cryptlib_openssl/pk/x509.c ++++ b/os_stub/cryptlib_openssl/pk/x509.c +@@ -17,7 +17,6 @@ + #include + #include + #include +-#include + + #if LIBSPDM_CERT_PARSE_SUPPORT + +@@ -2318,7 +2317,7 @@ bool libspdm_set_attribute_for_req(X509_REQ *req, uint8_t *req_info, size_t req_ + /*get subject name from req_info and set it to CSR*/ + x509_req_info = d2i_X509_REQ_INFO(NULL, (const unsigned char **)(&req_info), req_info_len); + if (x509_req_info) { +- X509_REQ_set_subject_name(req, x509_req_info->subject); ++ X509_REQ_set_subject_name(req, X509_REQ_get_subject_name((X509_REQ *)x509_req_info)); + X509_REQ_INFO_free(x509_req_info); + } else { + return false; +-- +2.40.1 + diff --git a/package/libspdm/0002-cryptlib_openssl-ecd-Allow-disabling-code.patch b/package/libspdm/0002-cryptlib_openssl-ecd-Allow-disabling-code.patch new file mode 100644 index 000000000000..0ab347b3e09e --- /dev/null +++ b/package/libspdm/0002-cryptlib_openssl-ecd-Allow-disabling-code.patch @@ -0,0 +1,56 @@ +From e87687d72688e980b929920b7d77dca26fff169e Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Mon, 21 Aug 2023 14:00:46 -0400 +Subject: [PATCH] cryptlib_openssl: ecd: Allow disabling code + +The OpenSSL source code describes the crypto include as: +"Internal EC functions for other submodules: not for application use" + - https://github.com/openssl/openssl/blob/master/include/crypto/ec.h + +Using the internal APIS makes it difficult to use libspdm as a library +with other packages. So let's remove the uses of the internal API and +instead use the public API. + +The current ECD code uses internal APIs, making it unsuitable for use in +production code or libraries. + +The supported way to do this is via OSSL params, either with +EVP_PKEY_fromdata() [1] or using EVP_PKEY_set_octet_string_param(). + +Unfortunately this isn't supported in OpenSSL and ed25519_set_params() +and ed448_set_params() will always return 1, indicating no support. + +As there doesn't appear to be a supported method in OpenSSL to set the +public and private keys, let's instead allow users to disable this +support so the library can be used with the regular OpenSSL libraries. + +https://www.openssl.org/docs/man3.0/man3/EVP_PKEY_fromdata.html + +Signed-off-by: Alistair Francis +Upstream: https://github.com/DMTF/libspdm/commit/e87687d72688e980b929920b7d77dca26fff169e +--- + os_stub/cryptlib_openssl/pk/ecd.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/os_stub/cryptlib_openssl/pk/ecd.c b/os_stub/cryptlib_openssl/pk/ecd.c +index d7cc156d86..23dbd0390b 100644 +--- a/os_stub/cryptlib_openssl/pk/ecd.c ++++ b/os_stub/cryptlib_openssl/pk/ecd.c +@@ -12,6 +12,9 @@ + **/ + + #include "internal_crypt_lib.h" ++ ++#if (LIBSPDM_EDDSA_ED25519_SUPPORT) || (LIBSPDM_EDDSA_ED448_SUPPORT) ++ + #include + #include + +@@ -471,3 +474,4 @@ bool libspdm_eddsa_verify(const void *ecd_context, size_t hash_nid, + EVP_MD_CTX_free(ctx); + return true; + } ++#endif /* (LIBSPDM_EDDSA_ED25519_SUPPORT) || (LIBSPDM_EDDSA_ED448_SUPPORT) */ +-- +2.40.1 + diff --git a/package/libspdm/0003-cryptlib_openssl-ec-Remove-internal-OpenSSL-crypto-i.patch b/package/libspdm/0003-cryptlib_openssl-ec-Remove-internal-OpenSSL-crypto-i.patch new file mode 100644 index 000000000000..aacda1478973 --- /dev/null +++ b/package/libspdm/0003-cryptlib_openssl-ec-Remove-internal-OpenSSL-crypto-i.patch @@ -0,0 +1,82 @@ +From 567b1c8ea731fe42650d43ede50a105b772dc7aa Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Fri, 11 Aug 2023 16:24:23 -0400 +Subject: [PATCH] cryptlib_openssl: ec: Remove internal OpenSSL crypto include + +The OpenSSL source code describes the crypto include as: +"Internal EC functions for other submodules: not for application use" + - https://github.com/openssl/openssl/blob/master/include/crypto/ec.h + +Using the internal APIS makes it difficult to use libspdm as a library +with other packages. So let's remove the uses of the internal API and +instead use the public API. + +Signed-off-by: Alistair Francis +Upstream: https://github.com/DMTF/libspdm/commit/567b1c8ea731fe42650d43ede50a105b772dc7aa +--- + os_stub/cryptlib_openssl/pk/ec.c | 26 ++++++++++++++++++++++---- + 1 file changed, 22 insertions(+), 4 deletions(-) + +diff --git a/os_stub/cryptlib_openssl/pk/ec.c b/os_stub/cryptlib_openssl/pk/ec.c +index 7dd9a8b0f8..09df0b9a25 100644 +--- a/os_stub/cryptlib_openssl/pk/ec.c ++++ b/os_stub/cryptlib_openssl/pk/ec.c +@@ -15,7 +15,6 @@ + #include + #include + #include +-#include + + /** + * Allocates and Initializes one Elliptic Curve context for subsequent use +@@ -854,7 +853,7 @@ static int libspdm_ecdsa_sign_setup_random(EC_KEY *eckey, BIGNUM **kinvp, BIGNUM + uint8_t* random, size_t random_len) + { + BN_CTX *ctx = NULL; +- BIGNUM *k = NULL, *r = NULL, *X = NULL; ++ BIGNUM *k = NULL, *r = NULL, *X = NULL, *e = NULL; + const BIGNUM *order; + EC_POINT *tmp_point = NULL; + const EC_GROUP *group; +@@ -901,6 +900,11 @@ static int libspdm_ecdsa_sign_setup_random(EC_KEY *eckey, BIGNUM **kinvp, BIGNUM + goto err; + } + ++ e = BN_CTX_get(ctx); ++ if (e == NULL) { ++ return 0; ++ } ++ + /*random number*/ + k = BN_bin2bn(random, random_len, NULL); + +@@ -915,10 +919,24 @@ static int libspdm_ecdsa_sign_setup_random(EC_KEY *eckey, BIGNUM **kinvp, BIGNUM + goto err; + } + +- /* compute the inverse of k */ +- if (!ossl_ec_group_do_inverse_ord(group, k, k, ctx)) { ++ /* ++ * compute the inverse of k ++ * Based on ossl_ec_group_do_inverse_ord() from OpenSSL ++ */ ++ BN_CTX_start(ctx); ++ if (!BN_set_word(e, 2)) { ++ BN_CTX_end(ctx); ++ goto err; ++ } ++ if (!BN_sub(e, order, e)) { ++ BN_CTX_end(ctx); ++ goto err; ++ } ++ if (!BN_mod_exp_mont(k, k, e, order, ctx, EC_GROUP_get_mont_data(group))) { ++ BN_CTX_end(ctx); + goto err; + } ++ BN_CTX_end(ctx); + + /* clear old values if necessary */ + BN_clear_free(*rp); +-- +2.40.1 + diff --git a/package/libspdm/0004-CMakeLists.txt-Allow-disabling-EDDSA-support-from-co.patch b/package/libspdm/0004-CMakeLists.txt-Allow-disabling-EDDSA-support-from-co.patch new file mode 100644 index 000000000000..fe616490f77d --- /dev/null +++ b/package/libspdm/0004-CMakeLists.txt-Allow-disabling-EDDSA-support-from-co.patch @@ -0,0 +1,31 @@ +From 97611ce8279341205463ace6a5f2ff93c52fc417 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 30 Aug 2023 13:37:07 +1000 +Subject: [PATCH] CMakeLists.txt: Allow disabling EDDSA support from command + line + +Signed-off-by: Alistair Francis +Upstream: https://github.com/DMTF/libspdm/pull/2330 +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a18c467a5..47b93f8bb7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,6 +155,11 @@ else() + MESSAGE(FATAL_ERROR "Unknown CRYPTO") + endif() + ++if(DISABLE_EDDSA STREQUAL "1") ++ add_definitions(-DLIBSPDM_EDDSA_ED25519_SUPPORT=0) ++ add_definitions(-DLIBSPDM_EDDSA_ED448_SUPPORT=0) ++endif() ++ + if(ENABLE_BINARY_BUILD STREQUAL "1") + if(NOT CRYPTO STREQUAL "openssl") + MESSAGE(FATAL_ERROR "enabling binary build not supported for non-openssl") +-- +2.40.1 + diff --git a/package/libspdm/Config.in b/package/libspdm/Config.in new file mode 100644 index 000000000000..56c55f9c4d0d --- /dev/null +++ b/package/libspdm/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_LIBSPDM_CPU_FAMILY + string + # OpenSSL doesn't support "arc" (BR2_arcle || BR2_arceb), "arm" + # (if BR2_arm || BR2_armeb) or "riscv32"/"riscv6" + # (BR2_riscv && BR2_RISCV_32/BR2_RISCV_64). So we don't + # support those here + default "aarch64" if BR2_aarch64 || BR2_aarch64_be + default "ia32" if BR2_i386 + default "x64" if BR2_x86_64 + +config BR2_PACKAGE_LIBSPDM_ARCH_SUPPORTS + bool + default y if BR2_PACKAGE_LIBSPDM_CPU_FAMILY != "" + +config BR2_PACKAGE_LIBSPDM + bool "libspdm" + depends on BR2_PACKAGE_LIBSPDM_ARCH_SUPPORTS + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + help + libspdm is a sample implementation that follows + the DMTF SPDM specifications + + https://github.com/DMTF/libspdm diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash new file mode 100644 index 000000000000..d06af293971f --- /dev/null +++ b/package/libspdm/libspdm.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 3a40daa59f32843062c3d2699acee09bd0ee217eb8ebf0378ae12b60b6db0636 libspdm-3.0.0.tar.gz +sha256 337130631a714eeae017556cad101d5324c2961214120b6214741d3d43667086 LICENSE.md diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk new file mode 100644 index 000000000000..48c46e41f7ca --- /dev/null +++ b/package/libspdm/libspdm.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# libspdm +# +################################################################################ + +LIBSPDM_VERSION = 3.0.0 +LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) +LIBSPDM_LICENSE = BSD-3-Clause +LIBSPDM_LICENSE_FILES = LICENSE.md + +LIBSPDM_INSTALL_STAGING = YES +LIBSPDM_INSTALL_TARGET = NO + +LIBSPDM_DEPENDENCIES = openssl + +LIBSPDM_TARGET_CPU_FAMILY = $(call qstrip,$(BR2_PACKAGE_LIBSPDM_CPU_FAMILY)) + +LIBSPDM_CONF_OPTS = \ + -DARCH=$(LIBSPDM_TARGET_CPU_FAMILY) \ + -DTOOLCHAIN=NONE \ + -DTARGET=Release \ + -DCRYPTO=openssl \ + -DENABLE_BINARY_BUILD=1 \ + -DCOMPILED_LIBCRYPTO_PATH=/usr/lib/ \ + -DCOMPILED_LIBSSL_PATH=/usr/lib/ \ + -DDISABLE_TESTS=1 \ + -DDISABLE_EDDSA=1 \ + -DLINK_FLAGS=$(STAGING_DIR) + +define LIBSPDM_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/lib + cp -dpfr $(@D)/lib/* $(STAGING_DIR)/usr/lib/ + + mkdir -p $(STAGING_DIR)/usr/include/libspdm/ + cp -dpfr $(@D)/include/* $(STAGING_DIR)/usr/include/libspdm/ + + mkdir -p $(STAGING_DIR)/usr/include/libspdm/os_stub/spdm_crypt_ext_lib + cp -dpfr $(@D)/os_stub/spdm_crypt_ext_lib/*.h \ + $(STAGING_DIR)/usr/include/libspdm/os_stub/spdm_crypt_ext_lib/ +endef + +$(eval $(cmake-package)) From 01a5adfc1594e6f11a874c70b03c84300b48948d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 3 Sep 2023 14:28:30 +0200 Subject: [PATCH 1887/2890] package/libgpgme: bump to version 1.21.0 For change log, see [1] and [2]. This commit also drops the package patch, as an alternate upstream commit is included in release, see [3]. Consequently, AUTORECONF = YES is dropped as we're no longer patching the configure.ac script. The option "--disable-cpp-test" is removed from _CONF_OPTS since it no longer needed. The file .checkpackageignore is also updated to reflect the patch removal. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=log;h=gpgme-1.21.0 [2] https://dev.gnupg.org/T6585 [3] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff;h=e2103be390764f62b21a4e5d4fa90a7b78326787 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-Fix-build-without-threads.patch | 59 ------------------- package/libgpgme/libgpgme.hash | 4 +- package/libgpgme/libgpgme.mk | 5 +- 4 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 package/libgpgme/0001-Fix-build-without-threads.patch diff --git a/.checkpackageignore b/.checkpackageignore index c407581d2cde..dd29e061137d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -688,7 +688,6 @@ package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch Upstrea package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch Upstream package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch Upstream package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch Upstream -package/libgpgme/0001-Fix-build-without-threads.patch Upstream package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch Upstream package/libgsm/0001-misc-fixes-from-archlinux.patch Upstream package/libgtk2/0001-reduce-dependencies.patch Upstream diff --git a/package/libgpgme/0001-Fix-build-without-threads.patch b/package/libgpgme/0001-Fix-build-without-threads.patch deleted file mode 100644 index caa4ed7d78fb..000000000000 --- a/package/libgpgme/0001-Fix-build-without-threads.patch +++ /dev/null @@ -1,59 +0,0 @@ -From fc1b821c80c78f4ae635639c7fce5bad754edda7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 27 Aug 2022 23:24:44 +0200 -Subject: [PATCH] Fix build without threads - -Allow the user to disable cpp tests to avoid the following build failure -without threads raised since version 1.17.1 and -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=f3177d3ee0a1d30e15f33ff226b5e4c96b7610db - -run-wkdlookup.cpp: In function 'int main(int, char**)': -run-wkdlookup.cpp:130:18: error: 'std::this_thread' has not been declared - 130 | std::this_thread::sleep_for(std::chrono::milliseconds{250 * cnt}); - | ^~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/2915f6105bae595274fabaa12de7cc53926d22d0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://dev.gnupg.org/T6165] ---- - configure.ac | 5 +++++ - lang/cpp/Makefile.am | 6 +++++- - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e7fe04a7..d1c87486 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -553,6 +553,11 @@ AC_ARG_ENABLE(g13-test, - run_g13_test=$enableval) - AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes") - -+run_cpp_test="yes" -+AC_ARG_ENABLE(cpp-test, -+ AS_HELP_STRING([--disable-cpp-test],[disable CPP regression test]), -+ run_cpp_test=$enableval) -+AM_CONDITIONAL(RUN_CPP_TESTS, test "$run_cpp_test" = "yes") - - # Checks for header files. - AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h stdint.h -diff --git a/lang/cpp/Makefile.am b/lang/cpp/Makefile.am -index 724da6ca..243c463d 100644 ---- a/lang/cpp/Makefile.am -+++ b/lang/cpp/Makefile.am -@@ -18,6 +18,10 @@ - # License along with this program; if not, see . - # SPDX-License-Identifier: LGPL-2.1-or-later - --SUBDIRS = src tests -+SUBDIRS = src -+ -+if RUN_CPP_TESTS -+SUBDIRS += tests -+endif - - EXTRA_DIST = README --- -2.35.1 - diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash index a71cec1e382c..556f1d3b42aa 100644 --- a/package/libgpgme/libgpgme.hash +++ b/package/libgpgme/libgpgme.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 369deeec95f1bb77fafc0b6c8fa65995ba82fd1e gpgme-1.20.0.tar.bz2 -sha256 25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750 gpgme-1.20.0.tar.bz2 +sha1 abe7db72760c0bb3e9c429b72dcc3c60bed023de gpgme-1.21.0.tar.bz2 +sha256 416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88 gpgme-1.21.0.tar.bz2 # Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index eb63b7c01314..02d84622120e 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPGME_VERSION = 1.20.0 +LIBGPGME_VERSION = 1.21.0 LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPL-2.1+ @@ -14,8 +14,6 @@ LIBGPGME_CPE_ID_PRODUCT = gpgme LIBGPGME_INSTALL_STAGING = YES LIBGPGME_DEPENDENCIES = libassuan libgpg-error LIBGPGME_CONFIG_SCRIPTS = gpgme-config -# We're patching configure.ac -LIBGPGME_AUTORECONF = YES LIBGPGME_LANGUAGE_BINDINGS = cl # C++ bindings require a C++11 capable gcc, and -Wsuggest-override support @@ -30,7 +28,6 @@ LIBGPGME_CONF_OPTS = \ --disable-gpgconf-test \ --disable-g13-test \ --disable-gpg-test \ - --disable-cpp-test \ --enable-languages=$(subst $(space),$(comma),$(LIBGPGME_LANGUAGE_BINDINGS)) # Force the path to "gpgrt-config" (from the libgpg-error package) to From f8e9314a03d24906aef738283381dea501a4a584 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 3 Sep 2023 14:28:31 +0200 Subject: [PATCH 1888/2890] package/libgpgme: bump to version 1.22.0 For change log, see [1] and [2]. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=log;h=gpgme-1.22.0 [2] https://dev.gnupg.org/T6668 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libgpgme/libgpgme.hash | 4 ++-- package/libgpgme/libgpgme.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash index 556f1d3b42aa..5c47db76d5c4 100644 --- a/package/libgpgme/libgpgme.hash +++ b/package/libgpgme/libgpgme.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 abe7db72760c0bb3e9c429b72dcc3c60bed023de gpgme-1.21.0.tar.bz2 -sha256 416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88 gpgme-1.21.0.tar.bz2 +sha1 12f4c98ffa75bdbfc4934d38757f57ba718b5aa0 gpgme-1.22.0.tar.bz2 +sha256 9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71 gpgme-1.22.0.tar.bz2 # Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 02d84622120e..036103b7fcdb 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPGME_VERSION = 1.21.0 +LIBGPGME_VERSION = 1.22.0 LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPL-2.1+ From 530ea784f1c7ef8176b46245710016ec7bce89dd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 2 Sep 2023 22:27:23 +0200 Subject: [PATCH 1889/2890] package/polkit: bump to version 123 polkit runtime tests are passing successfully with this version bump: https://gitlab.com/tpetazzoni/buildroot/-/pipelines/989945901 Signed-off-by: Thomas Petazzoni --- package/polkit/polkit.hash | 2 +- package/polkit/polkit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index ffdc2a7568aa..5eadc8975386 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0d69656d60800835c3d7d1f0a8362b32e1ae3ace2875a35bb624296fc52d5dc4 polkit-122.tar.gz +sha256 b69278f6ea0eac406350c45f5720e2fe5e4beaf9f53c16d9902e025965418864 polkit-123.tar.gz sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index dab5d542ebdf..f58dbe43de51 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -POLKIT_VERSION = 122 +POLKIT_VERSION = 123 POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING From 8d55b912d762809e24a09bb7f47ddcd4c238f7b6 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Mon, 11 Sep 2023 20:50:00 +1200 Subject: [PATCH 1890/2890] package/gstreamer1/gst1-shark: bump version to v0.8.1 Update to the latest release. Release notes: https://github.com/RidgeRun/gst-shark/releases/tag/v0.8.1 https://github.com/RidgeRun/gst-shark/releases/tag/v0.8.0 Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-shark/gst1-shark.hash | 2 +- package/gstreamer1/gst1-shark/gst1-shark.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-shark/gst1-shark.hash b/package/gstreamer1/gst1-shark/gst1-shark.hash index cfd72dd2a62e..37276cc93de7 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.hash +++ b/package/gstreamer1/gst1-shark/gst1-shark.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 413dbd8b6be1b09751e8d00abf9784de18cb74283c95ac078f6fb7d8750de26a gst1-shark-v0.7.5-br1.tar.gz +sha256 07587922dc49d12abe2444590a88c530409854b02904ad50357b312f9b6ea736 gst1-shark-v0.8.1-br1.tar.gz # Hashes for license files: sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING diff --git a/package/gstreamer1/gst1-shark/gst1-shark.mk b/package/gstreamer1/gst1-shark/gst1-shark.mk index 17df001cef93..a059d41cb835 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.mk +++ b/package/gstreamer1/gst1-shark/gst1-shark.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_SHARK_VERSION = v0.7.5 +GST1_SHARK_VERSION = v0.8.1 GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git GST1_SHARK_SITE_METHOD = git GST1_SHARK_GIT_SUBMODULES = YES From 9318e583ada4c72e7a67f1bfe19f33ae5ec49374 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 11 Sep 2023 07:04:02 -0600 Subject: [PATCH 1891/2890] package/freescale-imx/imx-kobs: bump to version ff13a99a22aa73cca0e09a33c2ebb6a94ad698da Update github organization name to nxp-imx which is being redirected to. Rename COPYING TO LICENSE. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-kobs/imx-kobs.hash | 4 ++-- package/freescale-imx/imx-kobs/imx-kobs.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/freescale-imx/imx-kobs/imx-kobs.hash b/package/freescale-imx/imx-kobs/imx-kobs.hash index 39f02ea04aa8..39ab2b654591 100644 --- a/package/freescale-imx/imx-kobs/imx-kobs.hash +++ b/package/freescale-imx/imx-kobs/imx-kobs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5855c8964f908ad30e5d4500180ee57c51af68186289ef1bdf8553ee60d3b1f5 imx-kobs-a0e9adce2fb7fcd57e794d7f9a5deba0f94f521b.tar.gz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 e83c9bca2706a33832174fc609b434d513a39b54ca90a714a6d0bb6f7a0386f7 imx-kobs-ff13a99a22aa73cca0e09a33c2ebb6a94ad698da.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/freescale-imx/imx-kobs/imx-kobs.mk b/package/freescale-imx/imx-kobs/imx-kobs.mk index 91b39f6fa4a4..d33d3a1b775e 100644 --- a/package/freescale-imx/imx-kobs/imx-kobs.mk +++ b/package/freescale-imx/imx-kobs/imx-kobs.mk @@ -4,9 +4,9 @@ # ################################################################################ -IMX_KOBS_VERSION = a0e9adce2fb7fcd57e794d7f9a5deba0f94f521b -IMX_KOBS_SITE = $(call github,NXPmicro,imx-kobs,$(IMX_KOBS_VERSION)) +IMX_KOBS_VERSION = ff13a99a22aa73cca0e09a33c2ebb6a94ad698da +IMX_KOBS_SITE = $(call github,nxp-imx,imx-kobs,$(IMX_KOBS_VERSION)) IMX_KOBS_LICENSE = GPL-2.0+ -IMX_KOBS_LICENSE_FILES = COPYING +IMX_KOBS_LICENSE_FILES = LICENSE $(eval $(autotools-package)) From dc4436245cdd6fc62f476ff072ffed6743cf9400 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 11 Sep 2023 15:17:14 +0200 Subject: [PATCH 1892/2890] package/speechd: bump version to 0.11.5 - remove 0001-add-disable-doc.patch (upstream applied, see [1]) For details see [2]. [1] https://github.com/brailcom/speechd/commit/1dbc42684dcd3519fbc93da7e4164aa8dba8808f [2] https://github.com/brailcom/speechd/releases/tag/0.11.5 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/speechd/0001-add-disable-doc.patch | 78 ---------------------- package/speechd/speechd.hash | 2 +- package/speechd/speechd.mk | 2 +- 4 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 package/speechd/0001-add-disable-doc.patch diff --git a/.checkpackageignore b/.checkpackageignore index dd29e061137d..f34df29bfc61 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1373,7 +1373,6 @@ package/sox/0005-configure.ac-fix-static-linking-with-sndfile.patch Upstream package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch Upstream package/sp-oops-extract/0002-stdint-cleanup.patch Upstream package/spandsp/0001-configure.ac-fix-AVX-SSE-and-MMX-options.patch Upstream -package/speechd/0001-add-disable-doc.patch Upstream package/speex/0001-thumb2-support.patch Upstream package/squid/S97squid Indent Shellcheck Variables package/sredird/0001-termio.patch Upstream diff --git a/package/speechd/0001-add-disable-doc.patch b/package/speechd/0001-add-disable-doc.patch deleted file mode 100644 index dd17b10e4fea..000000000000 --- a/package/speechd/0001-add-disable-doc.patch +++ /dev/null @@ -1,78 +0,0 @@ -From d88557d3c29c33f76af20cb7a6eb798f6f598c23 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Feb 2023 15:18:35 +0100 -Subject: [PATCH] add --disable-doc - -Allow the user to disable documentation through --disable-doc to avoid -the following build failure without makeinfo: - -make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/doc' - MAKEINFO ssip.info - MAKEINFO spd-say.info -/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found -/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found -WARNING: 'makeinfo' is missing on your system. - You should only need it if you modified a '.texi' file, or - any other file indirectly affecting the aspect of the manual. - You might want to install the Texinfo package: - - The spurious makeinfo call might also be the consequence of - using a buggy 'make' (AIX, DU, IRIX), in which case you might - want to install GNU make: - -WARNING: 'makeinfo' is missing on your system. - You should only need it if you modified a '.texi' file, or - any other file indirectly affecting the aspect of the manual. - You might want to install the Texinfo package: - - The spurious makeinfo call might also be the consequence of - using a buggy 'make' (AIX, DU, IRIX), in which case you might - want to install GNU make: - -make[3]: *** [Makefile:492: ssip.info] Error 127 - -Fixes: - - http://autobuild.buildroot.org/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/brailcom/speechd/pull/810] ---- - Makefile.am | 6 +++++- - configure.ac | 4 ++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 26617c78..480eb50e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -22,7 +22,11 @@ pkgconfig_DATA = speech-dispatcher.pc - - BUILT_SOURCES = $(top_srcdir)/.version - --SUBDIRS= include locale src config doc po -+SUBDIRS= include locale src config po -+ -+if ENABLE_DOC -+SUBDIRS += doc -+endif - - EXTRA_DIST= config.rpath COPYING.LGPL COPYING.GPL-2 COPYING.GPL-3 ANNOUNCE BUGS FAQ README.md README.packagers README.translators README.overview.md README.style.md build.sh speech-dispatcherd.service.in speech-dispatcher.socket speech-dispatcher.service.in po/Makevars.in po/README - -diff --git a/configure.ac b/configure.ac -index faaa8629..4f2af908 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -168,6 +168,10 @@ AC_SUBST([EXTRA_SOCKET_LIBS]) - AC_SUBST([ERROR_CFLAGS]) - AC_SUBST([RDYNAMIC]) - -+AC_ARG_ENABLE([doc], -+ [AC_HELP_STRING([--disable-doc], [turn off documentation])]) -+AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") -+ - # Check for python support. - # Python 3 or greater required - AC_ARG_ENABLE([python], --- -2.39.0 - diff --git a/package/speechd/speechd.hash b/package/speechd/speechd.hash index 4eb4cd09d2ca..0b02a357921b 100644 --- a/package/speechd/speechd.hash +++ b/package/speechd/speechd.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 628d4446894b47f0df099123924c1070180b5b5b09c5b637ebe80d8578fba92f speechd-0.11.4.tar.gz +sha256 cc4b388fce40681eaff3545e9cc0642216c13c420d5676a4d28c957ddcb916de speechd-0.11.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL-2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL-3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index ae777c6d3069..c68d46611609 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPEECHD_VERSION = 0.11.4 +SPEECHD_VERSION = 0.11.5 SPEECHD_SITE = $(call github,brailcom,speechd,$(SPEECHD_VERSION)) SPEECHD_LICENSE = GPL-2.0+, GPL-3.0+ (buildsystem), LGPL-2.1+ SPEECHD_LICENSE_FILES = COPYING.GPL-2 COPYING.GPL-3 COPYING.LGPL From 1cebe962ff23f2a13e5b874d7814d823f72a97fd Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 11 Sep 2023 21:27:01 +0200 Subject: [PATCH 1893/2890] package/harfbuzz: bump version to 8.2.0 Release notes: https://github.com/harfbuzz/harfbuzz/blob/main/NEWS Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 1f0d9befa120..8791899a4af6 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0305ad702e11906a5fc0c1ba11c270b7f64a8f5390d676aacfd71db129d6565f harfbuzz-8.1.1.tar.xz +sha256 8cb7117a62f42d5ad25d4a697e1bbfc65933b3eed2ee7f247203c79c9f1b514c harfbuzz-8.2.0.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 6d52c52a8588..43c559ed1bdf 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 8.1.1 +HARFBUZZ_VERSION = 8.2.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 076974bae6297c2cab18ba784011bafe6da70c61 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 11 Sep 2023 21:33:01 +0200 Subject: [PATCH 1894/2890] package/mmc-utils: bump version to 2023-08-07 Starting from commit: https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/commit/?id=958227890690290ee766aaad1b92f3413f67048c VERSION macro should be defined by mmc-utils Makefile itself but it doesn't work in Buildroot because it needs to be in a git repository clone. So let's mimic what they do in the Makefile by picking the first 6 SHA1 git commit digits and set them to -DVERSION. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/mmc-utils/mmc-utils.hash | 2 +- package/mmc-utils/mmc-utils.mk | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/mmc-utils/mmc-utils.hash b/package/mmc-utils/mmc-utils.hash index 0d0b6ac1b9fa..1bdb545cbc3f 100644 --- a/package/mmc-utils/mmc-utils.hash +++ b/package/mmc-utils/mmc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e5a8dacf26a178010202c8fa7cb28b01f50fe967da98cdbdf320b2f110920106 mmc-utils-d4c2910981ff99b983734426dfa99632fb81ac6b-br1.tar.gz +sha256 9ac9718343ffa36ab9ef192728e60cce6504febe29d43fb8003c2e2ef5a7c7d7 mmc-utils-613495ecaca97a19fa7f8f3ea23306472b36453c-br1.tar.gz sha256 4207d81122a02555f78c5a11b61c83a331ee03dc933e1ef9dd932ef9b434d12d README diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk index 9da9c30293c0..7f88c4002472 100644 --- a/package/mmc-utils/mmc-utils.mk +++ b/package/mmc-utils/mmc-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -MMC_UTILS_VERSION = d4c2910981ff99b983734426dfa99632fb81ac6b +MMC_UTILS_VERSION = 613495ecaca97a19fa7f8f3ea23306472b36453c MMC_UTILS_SITE = https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git MMC_UTILS_SITE_METHOD = git MMC_UTILS_LICENSE = GPL-2.0 @@ -19,11 +19,15 @@ endif # override AM_CFLAGS as the project Makefile uses it to pass # -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2, and the latter conflicts # with the _FORTIFY_SOURCE that we pass when hardening options are -# enabled. +# enabled. Starting from commit: +# https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/commit/?id=958227890690290ee766aaad1b92f3413f67048c +# they use AM_CFLAGS to set VERSION to first 6 digit of git SHA1, so +# let's do this here otherwise it won't be automatically set and build +# will fail define MMC_UTILS_BUILD_CMDS $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(MMC_UTILS_CFLAGS)" \ - AM_CFLAGS= + AM_CFLAGS='-DVERSION=\"$(shell echo $(MMC_UTILS_VERSION) | head -c 6)\"' endef define MMC_UTILS_INSTALL_TARGET_CMDS From 5ee7c76823f7a58a5d8fcff0b3a445ff9cc04ff2 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Mon, 11 Sep 2023 05:52:02 +0200 Subject: [PATCH 1895/2890] package/libxcrypt: drop upstream patches These patches were backported (47b7947 and 7dd5233) before the 2023.08 release. Meanwhile the package was bumped on next (be5e4a1) to a version containing these patches. Therefore they can be dropped. Fixes: - http://autobuild.buildroot.net/results/7f7ec74e80cd1ab782d87f5db3e4631c12611101/ Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- ...ommon.pm-compatible-with-latest-perl.patch | 50 --------------- ...ve-smartmatch-usage-from-gen-crypt-h.patch | 61 ------------------- 2 files changed, 111 deletions(-) delete mode 100644 package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch delete mode 100644 package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch diff --git a/package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch b/package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch deleted file mode 100644 index 7a17fa5c1297..000000000000 --- a/package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ce562f4d33dc090fcd8f6ea1af3ba32cdc2b3c9c Mon Sep 17 00:00:00 2001 -From: Leon Timmermans -Date: Tue, 6 Jun 2023 17:03:57 +0200 -Subject: [PATCH] Make BuildCommon.pm compatible with latest perl - -It was previously using an experimental feature that has since been dropped. -This removes the use of that feature. - -Upstream: https://github.com/besser82/libxcrypt/commit/ce562f4d33dc090fcd8f6ea1af3ba32cdc2b3c9c -Signed-off-by: Daniel Lang ---- - build-aux/scripts/BuildCommon.pm | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/build-aux/scripts/BuildCommon.pm b/build-aux/scripts/BuildCommon.pm -index 0e6f2a31..c38ba21b 100644 ---- a/build-aux/scripts/BuildCommon.pm -+++ b/build-aux/scripts/BuildCommon.pm -@@ -11,7 +11,6 @@ use v5.14; # implicit use strict, use feature ':5.14' - use warnings FATAL => 'all'; - use utf8; - use open qw(:utf8); --no if $] >= 5.018, warnings => 'experimental::smartmatch'; - no if $] >= 5.022, warnings => 'experimental::re_strict'; - use if $] >= 5.022, re => 'strict'; - -@@ -519,19 +518,19 @@ sub parse_symver_args { - my $COMPAT_ABI; - local $_; - for (@args) { -- when (/^SYMVER_MIN=(.+)$/) { -+ if (/^SYMVER_MIN=(.+)$/) { - $usage_error->() if defined $SYMVER_MIN; - $SYMVER_MIN = $1; - } -- when (/^SYMVER_FLOOR=(.+)$/) { -+ elsif (/^SYMVER_FLOOR=(.+)$/) { - $usage_error->() if defined $SYMVER_FLOOR; - $SYMVER_FLOOR = $1; - } -- when (/^COMPAT_ABI=(.+)$/) { -+ elsif (/^COMPAT_ABI=(.+)$/) { - $usage_error->() if defined $COMPAT_ABI; - $COMPAT_ABI = $1; - } -- default { -+ else { - $usage_error->() if defined $map_in; - $map_in = $_; - } diff --git a/package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch b/package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch deleted file mode 100644 index 444896b53f86..000000000000 --- a/package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 95d6e03ae37f4ec948474d111105bbdd2938aba2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= -Date: Sun, 25 Jun 2023 01:35:08 +0200 -Subject: [PATCH] Remove smartmatch usage from gen-crypt-h - -Needed for Perl 5.38 - -Upstream: https://github.com/besser82/libxcrypt/commit/95d6e03ae37f4ec948474d111105bbdd2938aba2 -Signed-off-by: Daniel Lang ---- - build-aux/scripts/gen-crypt-h | 31 ++++++++++++++----------------- - 1 file changed, 14 insertions(+), 17 deletions(-) - -diff --git a/build-aux/scripts/gen-crypt-h b/build-aux/scripts/gen-crypt-h -index 12aecf6d..b113b791 100644 ---- a/build-aux/scripts/gen-crypt-h -+++ b/build-aux/scripts/gen-crypt-h -@@ -12,7 +12,6 @@ use v5.14; # implicit use strict, use feature ':5.14' - use warnings FATAL => 'all'; - use utf8; - use open qw(:std :utf8); --no if $] >= 5.018, warnings => 'experimental::smartmatch'; - no if $] >= 5.022, warnings => 'experimental::re_strict'; - use if $] >= 5.022, re => 'strict'; - -@@ -37,22 +36,20 @@ sub process_config_h { - local $_; - while (<$fh>) { - chomp; -- # Yes, 'given $_' is really required here. -- given ($_) { -- when ('#define HAVE_SYS_CDEFS_H 1') { -- $have_sys_cdefs_h = 1; -- } -- when ('#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { -- $have_sys_cdefs_begin_end_decls = 1; -- } -- when ('#define HAVE_SYS_CDEFS_THROW 1') { -- $have_sys_cdefs_throw = 1; -- } -- when (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { -- $substs{XCRYPT_VERSION_STR} = $1; -- $substs{XCRYPT_VERSION_MAJOR} = $2; -- $substs{XCRYPT_VERSION_MINOR} = $3; -- } -+ -+ if ($_ eq '#define HAVE_SYS_CDEFS_H 1') { -+ $have_sys_cdefs_h = 1; -+ } -+ elsif ($_ eq '#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { -+ $have_sys_cdefs_begin_end_decls = 1; -+ } -+ elsif ($_ eq '#define HAVE_SYS_CDEFS_THROW 1') { -+ $have_sys_cdefs_throw = 1; -+ } -+ elsif (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { -+ $substs{XCRYPT_VERSION_STR} = $1; -+ $substs{XCRYPT_VERSION_MAJOR} = $2; -+ $substs{XCRYPT_VERSION_MINOR} = $3; - } - } From 7bc5ea80c7a2e60f8c47ac33b20909e693de5bbc Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Mon, 11 Sep 2023 05:59:44 +0200 Subject: [PATCH 1896/2890] utils/getdeveloperlib.py: handle file removal If a patch only removes files, it is ignored. Meaning, that the registered developer isn't automatically picked up when calling get-developer. Fix this by also checking if the line starts with ---, as a patch removing a file has a line starting with --- with the name of the removed file and one started with +++ /dev/null. A set is used to store the changed files, which doesn't allow duplicates. Therefore normal patches aren't affected by this change. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- utils/getdeveloperlib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index e7d0d23e49e8..469360b801cf 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -25,7 +25,7 @@ def analyze_patch(patch): m = FIND_INFRA_IN_PATCH.match(line) if m: infras.add(m.group(2)) - if not line.startswith("+++ "): + if not line.startswith("+++ ") and not line.startswith("--- "): continue line.strip() fname = line[line.find("/") + 1:].strip() From ab4f3fafaa839593b3efd9ea12c8ee5d9340cdeb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 3 Sep 2023 09:33:33 +0200 Subject: [PATCH 1897/2890] package/gcc: fix missing .note.GNU-stack section Shellinabox configure fails to detect ptsname_r, because of the following warning binutils 2.39+ emits: ld: warning: crtend.o: missing .note.GNU-stack section implies executable stack ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker Then the build errors out with: shellinabox/launcher.c:772:12: error: static declaration of 'ptsname_r' follows non-static declaration The same issue exist for cairo 1.16.0 and the detection of pthreads. Fixes: - http://autobuild.buildroot.net/results/3e4/3e478d22e820703ddfd11d1491e631ef8ed6b29b - http://autobuild.buildroot.net/results/f60/f602ea17d5938a5beb81d07e13de75ba41d5f6a1 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...add-.note.GNU-stack-section-on-linux.patch | 105 ++++++++++++++++++ ...add-.note.GNU-stack-section-on-linux.patch | 105 ++++++++++++++++++ 2 files changed, 210 insertions(+) create mode 100644 package/gcc/11.4.0/0007-xtensa-add-.note.GNU-stack-section-on-linux.patch create mode 100644 package/gcc/12.3.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch diff --git a/package/gcc/11.4.0/0007-xtensa-add-.note.GNU-stack-section-on-linux.patch b/package/gcc/11.4.0/0007-xtensa-add-.note.GNU-stack-section-on-linux.patch new file mode 100644 index 000000000000..967bbaf3fecc --- /dev/null +++ b/package/gcc/11.4.0/0007-xtensa-add-.note.GNU-stack-section-on-linux.patch @@ -0,0 +1,105 @@ +From 4958020ecc85a30c52544deaf3c017cea82a0fb0 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Thu, 2 Mar 2023 09:45:41 -0800 +Subject: [PATCH] xtensa: add .note.GNU-stack section on linux + +gcc/ + * config/xtensa/linux.h (TARGET_ASM_FILE_END): New macro. + +libgcc/ + * config/xtensa/crti.S: Add .note.GNU-stack section on linux. + * config/xtensa/crtn.S: Likewise. + * config/xtensa/lib1funcs.S: Likewise. + * config/xtensa/lib2funcs.S: Likewise. + +Signed-off-by: Max Filippov +Signed-off-by: Waldemar Brodkorb +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6360bf9a2d08f08c151464c77c0da53cd702ff25 +--- + gcc/config/xtensa/linux.h | 1 + + libgcc/config/xtensa/crti.S | 6 ++++++ + libgcc/config/xtensa/crtn.S | 6 ++++++ + libgcc/config/xtensa/lib1funcs.S | 6 ++++++ + libgcc/config/xtensa/lib2funcs.S | 6 ++++++ + 5 files changed, 25 insertions(+) + +diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h +index 468a48489e7..a69e38c58ee 100644 +--- a/gcc/config/xtensa/linux.h ++++ b/gcc/config/xtensa/linux.h +@@ -69,3 +69,4 @@ along with GCC; see the file COPYING3. If not see + + #undef DBX_REGISTER_NUMBER + ++#define TARGET_ASM_FILE_END file_end_indicate_exec_stack +diff --git a/libgcc/config/xtensa/crti.S b/libgcc/config/xtensa/crti.S +index 87a66e32e4a..40dd8c0dbc2 100644 +--- a/libgcc/config/xtensa/crti.S ++++ b/libgcc/config/xtensa/crti.S +@@ -26,6 +26,12 @@ + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + .section .init + .globl _init + .type _init,@function +diff --git a/libgcc/config/xtensa/crtn.S b/libgcc/config/xtensa/crtn.S +index 8d2c2b1f22b..9d29f8fce1a 100644 +--- a/libgcc/config/xtensa/crtn.S ++++ b/libgcc/config/xtensa/crtn.S +@@ -27,6 +27,12 @@ + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + .section .init + #if XCHAL_HAVE_WINDOWED && !__XTENSA_CALL0_ABI__ + retw +diff --git a/libgcc/config/xtensa/lib1funcs.S b/libgcc/config/xtensa/lib1funcs.S +index a482a6eefc8..5245d7ad8ad 100644 +--- a/libgcc/config/xtensa/lib1funcs.S ++++ b/libgcc/config/xtensa/lib1funcs.S +@@ -25,6 +25,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + /* Define macros for the ABS and ADDX* instructions to handle cases + where they are not included in the Xtensa processor configuration. */ + +diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S +index 36938c84924..a574a45fa68 100644 +--- a/libgcc/config/xtensa/lib2funcs.S ++++ b/libgcc/config/xtensa/lib2funcs.S +@@ -25,6 +25,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + /* __xtensa_libgcc_window_spill: This function flushes out all but the + current register window. This is used to set up the stack so that + arbitrary frames can be accessed. */ +-- +2.39.2 + diff --git a/package/gcc/12.3.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch b/package/gcc/12.3.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch new file mode 100644 index 000000000000..4c79c3448f13 --- /dev/null +++ b/package/gcc/12.3.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch @@ -0,0 +1,105 @@ +From 38cdfcc4b2cca8d251ff8d8d34201dfe9849333e Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Thu, 2 Mar 2023 09:45:41 -0800 +Subject: [PATCH] xtensa: add .note.GNU-stack section on linux + +gcc/ + * config/xtensa/linux.h (TARGET_ASM_FILE_END): New macro. + +libgcc/ + * config/xtensa/crti.S: Add .note.GNU-stack section on linux. + * config/xtensa/crtn.S: Likewise. + * config/xtensa/lib1funcs.S: Likewise. + * config/xtensa/lib2funcs.S: Likewise. + +Signed-off-by: Max Filippov +Signed-off-by: Waldemar Brodkorb +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6360bf9a2d08f08c151464c77c0da53cd702ff25 +--- + gcc/config/xtensa/linux.h | 1 + + libgcc/config/xtensa/crti.S | 6 ++++++ + libgcc/config/xtensa/crtn.S | 6 ++++++ + libgcc/config/xtensa/lib1funcs.S | 6 ++++++ + libgcc/config/xtensa/lib2funcs.S | 6 ++++++ + 5 files changed, 25 insertions(+) + +diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h +index edce618fb94..fe0e3a43797 100644 +--- a/gcc/config/xtensa/linux.h ++++ b/gcc/config/xtensa/linux.h +@@ -69,3 +69,4 @@ along with GCC; see the file COPYING3. If not see + + #undef DBX_REGISTER_NUMBER + ++#define TARGET_ASM_FILE_END file_end_indicate_exec_stack +diff --git a/libgcc/config/xtensa/crti.S b/libgcc/config/xtensa/crti.S +index 3de7bc101f4..0996e7cb29b 100644 +--- a/libgcc/config/xtensa/crti.S ++++ b/libgcc/config/xtensa/crti.S +@@ -26,6 +26,12 @@ + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + .section .init + .globl _init + .type _init,@function +diff --git a/libgcc/config/xtensa/crtn.S b/libgcc/config/xtensa/crtn.S +index 06b932edb14..a4cc9830096 100644 +--- a/libgcc/config/xtensa/crtn.S ++++ b/libgcc/config/xtensa/crtn.S +@@ -27,6 +27,12 @@ + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + .section .init + #if XCHAL_HAVE_WINDOWED && !__XTENSA_CALL0_ABI__ + retw +diff --git a/libgcc/config/xtensa/lib1funcs.S b/libgcc/config/xtensa/lib1funcs.S +index 5a2bd20534f..7177dd4f73a 100644 +--- a/libgcc/config/xtensa/lib1funcs.S ++++ b/libgcc/config/xtensa/lib1funcs.S +@@ -25,6 +25,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + /* Define macros for the ABS and ADDX* instructions to handle cases + where they are not included in the Xtensa processor configuration. */ + +diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S +index 681bac1be8c..a40c1a45604 100644 +--- a/libgcc/config/xtensa/lib2funcs.S ++++ b/libgcc/config/xtensa/lib2funcs.S +@@ -25,6 +25,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + /* __xtensa_libgcc_window_spill: This function flushes out all but the + current register window. This is used to set up the stack so that + arbitrary frames can be accessed. */ +-- +2.39.2 + From c9dcd9e459d6e0a955129ab42916d4c1140bdc3d Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 12 Sep 2023 20:57:06 +0200 Subject: [PATCH 1898/2890] package/luajit: bump to version 41fb94defa8f830ce69a8122b03f6ac3216d392a The LuaJIT project switches to a rolling release scheme. Now, the version contains the timestamp of its latest commit. The timestamp can be seen in build log: ==== Successfully installed LuaJIT 2.1.1693350652 to /usr ==== diff COPYRIGHT: -Copyright (C) 2005-2022 Mike Pall. All rights reserved. +Copyright (C) 2005-2023 Mike Pall. All rights reserved. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luajit/0001-no-bin-symlink.patch | 4 ++-- package/luajit/0002-install-inc.patch | 6 +++--- package/luajit/luajit.hash | 4 ++-- package/luajit/luajit.mk | 11 ++++++++++- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/package/luajit/0001-no-bin-symlink.patch b/package/luajit/0001-no-bin-symlink.patch index dc36fa58d60e..ea0e5bf8d00c 100644 --- a/package/luajit/0001-no-bin-symlink.patch +++ b/package/luajit/0001-no-bin-symlink.patch @@ -6,7 +6,7 @@ Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -45,8 +45,7 @@ +@@ -50,8 +50,7 @@ INSTALL_MAN= $(INSTALL_SHARE)/man/man1 INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig @@ -16,7 +16,7 @@ Index: b/Makefile INSTALL_ANAME= libluajit-$(ABIVER).a INSTALL_SOSHORT1= libluajit-$(ABIVER).so INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER) -@@ -61,7 +60,6 @@ +@@ -66,7 +65,6 @@ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1) INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2) INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) diff --git a/package/luajit/0002-install-inc.patch b/package/luajit/0002-install-inc.patch index 8de777dce21a..163a5d36fc7a 100644 --- a/package/luajit/0002-install-inc.patch +++ b/package/luajit/0002-install-inc.patch @@ -6,12 +6,12 @@ Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -33,7 +33,7 @@ +@@ -38,7 +38,7 @@ INSTALL_BIN= $(DPREFIX)/bin INSTALL_LIB= $(DPREFIX)/$(MULTILIB) INSTALL_SHARE= $(DPREFIX)/share --INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) +-INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION) +INSTALL_DEFINC= $(DPREFIX)/include INSTALL_INC= $(INSTALL_DEFINC) - INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) + INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION) diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash index 049f8c2fc2db..578bb7a3e2c9 100644 --- a/package/luajit/luajit.hash +++ b/package/luajit/luajit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 835035b244c3dc3d3d19bdd5ac623af90b84207e6330fb78f9fa51d6e200d760 luajit-8635cbabf3094c4d8bd00578c7d812bea87bb2d3.tar.gz +sha256 b518721280390e4cec1af30f6819d86756ce4234d82410a55a4e121855f64e08 luajit-41fb94defa8f830ce69a8122b03f6ac3216d392a.tar.gz # Locally calculated -sha256 52fc5b15ac968ed81aabb4c1e23ab3bce50f57a5764e9cdca86b463a11072921 COPYRIGHT +sha256 1130331ac861a4b4520e9c8ad0814efdc6f1e79ea55ea9c460c73733d13ccb5f COPYRIGHT diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 2a27aa5056b4..06c899339126 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAJIT_VERSION = 8635cbabf3094c4d8bd00578c7d812bea87bb2d3 +LUAJIT_VERSION = 41fb94defa8f830ce69a8122b03f6ac3216d392a LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT @@ -33,6 +33,15 @@ LUAJIT_HOST_CC = $(HOSTCC) -m32 LUAJIT_XCFLAGS += -DLUAJIT_DISABLE_GC64 endif +# emulation of git archive with .gitattributes & export-subst +# Timestamp of the $(LUAJIT_VERSION) commit, obtained in the LuaJit +# repo, with: git show -s --format=%ct $(LUAJIT_VERSION) +define LUAJIT_GEN_RELVER_FILE + echo 1693350652 >$(@D)/.relver +endef +LUAJIT_POST_EXTRACT_HOOKS = LUAJIT_GEN_RELVER_FILE +HOST_LUAJIT_POST_EXTRACT_HOOKS = LUAJIT_GEN_RELVER_FILE + # We unfortunately can't use TARGET_CONFIGURE_OPTS, because the luajit # build system uses non conventional variable names. define LUAJIT_BUILD_CMDS From 443f7feeb6b2d9c7c62097fcfc165c299465e2a1 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 12 Sep 2023 13:04:20 +0200 Subject: [PATCH 1899/2890] package/elf2flt: update to version 2023.09 Several of our patches have been accepted upstream and are included in elf2flt version 2023.09. Patch 0001-elf2flt-handle-binutils-2.34.patch is upstream as of commit c70b9f208979 ("elf2flt: handle binutils >= 2.34"). Patch 0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch is upstream as of commit 679c94adf27c ("elf2flt.ld: reinstate 32 byte alignment for .data section"). Patch 0003-elf2flt-add-riscv-64-bits-support.patch is upstream as of commit c5c8043c4d79 ("elf2flt: add riscv 64-bits support"). Patch 0008-riscv64-add-more-relocations-required-to-be-handled.patch was squashed into upstream commit c5c8043c4d79 ("elf2flt: add riscv 64-bits support") during upstreaming. Patch 0006-xtensa-fix-text-relocations.patch is upstream as of commit 26dfb54a59c8 ("elf2flt: xtensa: fix text relocations"). Patch 0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch is upstream as of commit a36df7407d9e ("elf2flt: remove use of BFD_VMA_FMT"). Patch 0004-elf2flt-create-a-common-helper-function.patch simply added a helper function to make the changes in the follow-up patch 0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch less intrusive. Patch 0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch is no longer needed as upstream has reverted the commit that necessitated this patch, see upstream commit 35c692ca4546 ("Revert "elf2flt: fix for segfault on some ARM ELFs""). The problem that the reverted upstream patch solved is now instead solved by the combination of upstream commits 7a59b265c2dc ("Revert "elf2flt: fix relocations for read-only data"") and a934fb42cf59 ("elf2flt: force ARM.exidx section into text"). Signed-off-by: Niklas Cassel Tested-By: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 6 - .../0001-elf2flt-handle-binutils-2.34.patch | 377 ------------------ ...tate-32-byte-alignment-for-.data-sec.patch | 81 ---- ...03-elf2flt-add-riscv-64-bits-support.patch | 103 ----- ...2flt-create-a-common-helper-function.patch | 76 ---- ...l-error-regression-on-m68k-xtensa-ri.patch | 74 ---- .../0006-xtensa-fix-text-relocations.patch | 51 --- ...07-elf2flt-remove-use-of-BFD_VMA_FMT.patch | 169 -------- ...e-relocations-required-to-be-handled.patch | 40 -- package/elf2flt/elf2flt.hash | 2 +- package/elf2flt/elf2flt.mk | 2 +- 11 files changed, 2 insertions(+), 979 deletions(-) delete mode 100644 package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch delete mode 100644 package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch delete mode 100644 package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch delete mode 100644 package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch delete mode 100644 package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch delete mode 100644 package/elf2flt/0006-xtensa-fix-text-relocations.patch delete mode 100644 package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch delete mode 100644 package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch diff --git a/.checkpackageignore b/.checkpackageignore index f34df29bfc61..bf8df8cef56f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -380,12 +380,6 @@ package/ejabberd/0002-fix-ejabberdctl.patch Upstream package/ejabberd/0003-correct-includes.patch Upstream package/ejabberd/S50ejabberd Indent Shellcheck Variables package/ejabberd/check-erlang-lib Shellcheck -package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch Upstream -package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch Upstream -package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch Upstream -package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch Upstream -package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch Upstream -package/elf2flt/0006-xtensa-fix-text-relocations.patch Upstream package/elftosb/0001-fixes-includes.patch Upstream package/elftosb/0002-force-cxx-compiler.patch Upstream package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch Upstream diff --git a/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch b/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch deleted file mode 100644 index f9e493a761ec..000000000000 --- a/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch +++ /dev/null @@ -1,377 +0,0 @@ -From 2821fcb55cbe0f2b77237d89b5b3467fb3ad058b Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 5 Feb 2020 10:31:32 +0100 -Subject: [PATCH] elf2flt: handle binutils >= 2.34 - -The latest Binutils release (2.34) is not compatible with elf2flt due -to a change in bfd_section_* macros [1]. The issue has been reported -to the Binutils mailing list but Alan Modra recommend to bundle -libbfd library sources into each projects using it [2]. That's -because the API is not stable over the time without any backward -compatibility guaranties. - -On the other hand, the elf2flt tools needs to support modified -version of binutils for specific arch/target [3]. - -Add two tests in the configure script to detect this API change -in order to support binutils < 2.34 and binutils >= 2.34. - -Upstream status: [4] - -[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=fd3619828e94a24a92cddec42cbc0ab33352eeb4 -[2] https://sourceware.org/ml/binutils/2020-02/msg00044.html -[3] https://github.com/uclinux-dev/elf2flt/issues/14 -[4] https://github.com/uclinux-dev/elf2flt/pull/15 - -Signed-off-by: Romain Naour ---- - configure.ac | 16 +++++++++++ - elf2flt.c | 81 +++++++++++++++++++++++++++++----------------------- - 2 files changed, 61 insertions(+), 36 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b7db2cb..fdc0876 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -229,6 +229,22 @@ AC_CHECK_FUNCS([ \ - strsignal \ - ]) - -+dnl Various bfd section macros and functions like bfd_section_size() have been -+dnl modified starting with binutils >= 2.34. -+dnl Check if the prototypes take a bfd argument. -+if test "$binutils_build_dir" != "NONE"; then -+ CFLAGS="-I$binutils_include_dir -I$bfd_include_dir $CFLAGS" -+fi -+ -+AC_TRY_COMPILE([#include ], -+ [const asection *sec; bfd_section_size(sec);], -+ bfd_section_api_takes_bfd=no, -+ bfd_section_api_takes_bfd=yes) -+if test "$bfd_section_api_takes_bfd" = "yes" ; then -+ AC_DEFINE(HAVE_BFD_SECTION_API_TAKES_BFD, 1, -+ [define to 1 for binutils < 2.34]) -+fi -+ - if test "$GCC" = yes ; then - CFLAGS="-Wall $CFLAGS" - if test "$werror" = 1 ; then -diff --git a/elf2flt.c b/elf2flt.c -index 7ac0617..ea6b5a1 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -149,6 +149,17 @@ const char *elf2flt_progname; - #define O_BINARY 0 - #endif - -+/* -+ * The bfd parameter isn't actually used by any of the bfd_section funcs and -+ * have been removed since binutils 2.34. -+ */ -+#ifdef HAVE_BFD_SECTION_API_TAKES_BFD -+#define elf2flt_bfd_section_size(s) bfd_section_size(NULL, s) -+#define elf2flt_bfd_section_vma(s) bfd_section_vma(NULL, s) -+#else -+#define elf2flt_bfd_section_size(s) bfd_section_size(s) -+#define elf2flt_bfd_section_vma(s) bfd_section_vma(s) -+#endif - - /* Extra output when running. */ - static int verbose = 0; -@@ -323,10 +334,8 @@ compare_relocs (const void *pa, const void *pb) - else if (!rb->sym_ptr_ptr || !*rb->sym_ptr_ptr) - return 1; - -- a_vma = bfd_section_vma(compare_relocs_bfd, -- (*(ra->sym_ptr_ptr))->section); -- b_vma = bfd_section_vma(compare_relocs_bfd, -- (*(rb->sym_ptr_ptr))->section); -+ a_vma = elf2flt_bfd_section_vma((*(ra->sym_ptr_ptr))->section); -+ b_vma = elf2flt_bfd_section_vma((*(rb->sym_ptr_ptr))->section); - va = (*(ra->sym_ptr_ptr))->value + a_vma + ra->addend; - vb = (*(rb->sym_ptr_ptr))->value + b_vma + rb->addend; - return va - vb; -@@ -403,7 +412,7 @@ output_relocs ( - } - - for (a = abs_bfd->sections; (a != (asection *) NULL); a = a->next) { -- section_vma = bfd_section_vma(abs_bfd, a); -+ section_vma = elf2flt_bfd_section_vma(a); - - if (verbose) - printf("SECTION: %s [%p]: flags=0x%x vma=0x%"PRIx32"\n", -@@ -443,7 +452,7 @@ output_relocs ( - continue; - if (verbose) - printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"BFD_VMA_FMT"x\n", -- r->name, r, r->flags, bfd_section_vma(abs_bfd, r)); -+ r->name, r, r->flags, elf2flt_bfd_section_vma(r)); - if ((r->flags & SEC_RELOC) == 0) - continue; - relsize = bfd_get_reloc_upper_bound(rel_bfd, r); -@@ -695,7 +704,7 @@ output_relocs ( - case R_BFIN_RIMM16: - case R_BFIN_LUIMM16: - case R_BFIN_HUIMM16: -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - - if (weak_und_symbol(sym_section->name, (*(q->sym_ptr_ptr)))) -@@ -728,7 +737,7 @@ output_relocs ( - break; - - case R_BFIN_BYTE4_DATA: -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - - if (weak_und_symbol (sym_section->name, (*(q->sym_ptr_ptr)))) -@@ -886,7 +895,7 @@ output_relocs ( - #if defined(TARGET_m68k) - case R_68K_32: - relocation_needed = 1; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_68K_PC16: -@@ -911,7 +920,7 @@ output_relocs ( - q->address, sym_addr, - (*p)->howto->rightshift, - *(uint32_t *)r_mem); -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_ARM_GOT32: -@@ -939,7 +948,7 @@ output_relocs ( - #ifdef TARGET_v850 - case R_V850_ABS32: - relocation_needed = 1; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_V850_ZDA_16_16_OFFSET: -@@ -961,7 +970,7 @@ output_relocs ( - sym_addr = (*(q->sym_ptr_ptr))->value; - q->address -= 1; - r_mem -= 1; /* tracks q->address */ -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - sym_addr |= (*(unsigned char *)r_mem<<24); - break; -@@ -974,7 +983,7 @@ output_relocs ( - /* Absolute symbol done not relocation */ - relocation_needed = !bfd_is_abs_section(sym_section); - sym_addr = (*(q->sym_ptr_ptr))->value; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_H8_DIR32: -@@ -987,7 +996,7 @@ output_relocs ( - } - relocation_needed = 1; - sym_addr = (*(q->sym_ptr_ptr))->value; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_H8_PCREL16: -@@ -1013,7 +1022,7 @@ output_relocs ( - #ifdef TARGET_microblaze - case R_MICROBLAZE_64: - /* work out the relocation */ -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - /* Write relocated pointer back */ - r_mem[2] = (sym_addr >> 24) & 0xff; -@@ -1027,7 +1036,7 @@ output_relocs ( - pflags = 0x80000000; - break; - case R_MICROBLAZE_32: -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - relocation_needed = 1; - break; -@@ -1059,7 +1068,7 @@ output_relocs ( - case R_NIOS2_BFD_RELOC_32: - relocation_needed = 1; - pflags = (FLAT_NIOS2_R_32 << 28); -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - /* modify target, in target order */ - *(unsigned long *)r_mem = htoniosl(sym_addr); -@@ -1069,7 +1078,7 @@ output_relocs ( - unsigned long exist_val; - relocation_needed = 1; - pflags = (FLAT_NIOS2_R_CALL26 << 28); -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - - /* modify target, in target order */ -@@ -1100,7 +1109,7 @@ output_relocs ( - ? FLAT_NIOS2_R_HIADJ_LO : FLAT_NIOS2_R_HI_LO; - pflags <<= 28; - -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(abs_bfd, sym_section); - sym_addr += sym_vma + q->addend; - - /* modify high 16 bits, in target order */ -@@ -1133,7 +1142,7 @@ output_relocs ( - goto NIOS2_RELOC_ERR; - } - /* _gp holds a absolute value, otherwise the ld cannot generate correct code */ -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - //printf("sym=%x, %d, _gp=%x, %d\n", sym_addr+sym_vma, sym_addr+sym_vma, gp, gp); - sym_addr += sym_vma + q->addend; - sym_addr -= gp; -@@ -1214,7 +1223,7 @@ NIOS2_RELOC_ERR: - case R_SPARC_32: - case R_SPARC_UA32: - relocation_needed = 1; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_SPARC_PC22: -@@ -1233,7 +1242,7 @@ NIOS2_RELOC_ERR: - case R_SPARC_HI22: - relocation_needed = 1; - pflags = 0x80000000; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - sym_addr |= ( - htonl(*(uint32_t *)r_mem) -@@ -1243,7 +1252,7 @@ NIOS2_RELOC_ERR: - case R_SPARC_LO10: - relocation_needed = 1; - pflags = 0x40000000; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - sym_addr &= 0x000003ff; - sym_addr |= ( -@@ -1257,7 +1266,7 @@ NIOS2_RELOC_ERR: - #ifdef TARGET_sh - case R_SH_DIR32: - relocation_needed = 1; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_SH_REL32: -@@ -1289,7 +1298,7 @@ NIOS2_RELOC_ERR: - case R_E1_CONST31: - relocation_needed = 1; - DBG_E1("Handling Reloc \n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", - sec_vma, sym_addr, q->address); - sym_addr = sec_vma + sym_addr; -@@ -1304,7 +1313,7 @@ NIOS2_RELOC_ERR: - relocation_needed = 0; - DBG_E1("Handling Reloc \n"); - DBG_E1("DONT RELOCATE AT LOADING\n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", - sec_vma, sym_addr, q->address); - sym_addr = sec_vma + sym_addr; -@@ -1331,7 +1340,7 @@ NIOS2_RELOC_ERR: - relocation_needed = 0; - DBG_E1("Handling Reloc \n"); - DBG_E1("DONT RELOCATE AT LOADING\n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", - sec_vma, sym_addr, q->address); - sym_addr = sec_vma + sym_addr; -@@ -1364,7 +1373,7 @@ NIOS2_RELOC_ERR: - DBG_E1("Handling Reloc \n"); - DIS29_RELOCATION: - relocation_needed = 1; -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%08x]\n", - sec_vma, sym_addr); - sym_addr = sec_vma + sym_addr; -@@ -1381,7 +1390,7 @@ DIS29_RELOCATION: - relocation_needed = 0; - DBG_E1("Handling Reloc \n"); - DBG_E1("DONT RELOCATE AT LOADING\n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", - sec_vma, sym_addr); - sym_addr = sec_vma + sym_addr; -@@ -1407,7 +1416,7 @@ DIS29_RELOCATION: - case R_E1_IMM32: - relocation_needed = 1; - DBG_E1("Handling Reloc \n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", - sec_vma, sym_addr); - sym_addr = sec_vma + sym_addr; -@@ -1423,7 +1432,7 @@ DIS29_RELOCATION: - case R_E1_WORD: - relocation_needed = 1; - DBG_E1("Handling Reloc \n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", - sec_vma, sym_addr); - sym_addr = sec_vma + sym_addr; -@@ -1450,7 +1459,7 @@ DIS29_RELOCATION: - } - - sprintf(&addstr[0], "+0x%lx", sym_addr - (*(q->sym_ptr_ptr))->value - -- bfd_section_vma(abs_bfd, sym_section)); -+ elf2flt_bfd_section_vma(sym_section)); - - - /* -@@ -1890,8 +1899,8 @@ int main(int argc, char *argv[]) - } else - continue; - -- sec_size = bfd_section_size(abs_bfd, s); -- sec_vma = bfd_section_vma(abs_bfd, s); -+ sec_size = elf2flt_bfd_section_size(s); -+ sec_vma = elf2flt_bfd_section_vma(s); - - if (sec_vma < *vma) { - if (*len > 0) -@@ -1920,7 +1929,7 @@ int main(int argc, char *argv[]) - (SEC_DATA | SEC_READONLY | SEC_RELOC))) - if (!bfd_get_section_contents(abs_bfd, s, - text + (s->vma - text_vma), 0, -- bfd_section_size(abs_bfd, s))) -+ elf2flt_bfd_section_size(s))) - { - fatal("read error section %s", s->name); - } -@@ -1950,7 +1959,7 @@ int main(int argc, char *argv[]) - (SEC_READONLY | SEC_RELOC))) - if (!bfd_get_section_contents(abs_bfd, s, - data + (s->vma - data_vma), 0, -- bfd_section_size(abs_bfd, s))) -+ elf2flt_bfd_section_size(s))) - { - fatal("read error section %s", s->name); - } --- -2.41.0 - diff --git a/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch deleted file mode 100644 index 8bd038368369..000000000000 --- a/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 37b281e4dd0fb5832181e51943a4eb3c74d4f618 Mon Sep 17 00:00:00 2001 -From: Niklas Cassel -Date: Mon, 4 Apr 2022 15:30:24 +0200 -Subject: [PATCH] elf2flt.ld: reinstate 32 byte alignment for .data section - -Commit 8a3e74446fe7 ("allow to build arm flat binaries") moved the -following commands: - . = ALIGN(0x20) ; - @SYMBOL_PREFIX@_etext = . ; -from the .text section to the top level in the SECTIONS node. - -The .text output section is being directed to a memory region using the -"> flatmem :text" output section attribute. Commands in the top level in -the SECTIONS node are not. - -This means that the ALIGN() command is no longer being appended to the -flatmem memory region, it will simply update the Location Counter. - -The heuristic for placing an output section is described here: -https://sourceware.org/binutils/docs-2.38/ld.html#Output-Section-Address - -"If an output memory region is set for the section then it is added to this -region and its address will be the next free address in that region." - -Since the .data section is being directed to the same memory region as the -.text section, this means that the Location Counter is not used when -assigning an address to the .data output section, it will simply use the -next free address. - -No longer directing these commands to the flatmem memory region means that -the .data output section is no longer aligned to a 32 byte boundary. - -Before commit 8a3e74446fe7 ("allow to build arm flat binaries"): -$ readelf -S busybox_unstripped.gdb | grep data - [ 3] .data PROGBITS 0000000000035ac0 00036ac0 -$ readelf -s busybox_unstripped.gdb | grep _etext - 19286: 0000000000035ac0 0 NOTYPE GLOBAL DEFAULT 1 _etext - -After commit 8a3e74446fe7 ("allow to build arm flat binaries"): -$ readelf -S busybox_unstripped.gdb | grep data - [ 3] .data PROGBITS 0000000000035ab0 00036ab0 -$ readelf -s busybox_unstripped.gdb | grep _etext - 19287: 0000000000035ac0 0 NOTYPE GLOBAL DEFAULT 3 _etext - -The .data output section has to be aligned to a 32 byte boundary, see the -FLAT_DATA_ALIGN 0x20 macro and its usage in fs/binfmt_flat.c: -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/fs/binfmt_flat.c?h=v5.17#n59 - -Readd an explicit ALIGN attribute on the .data section itself, since the -linker will obey this attribute regardless if being directed to a memory -region or not. Also remove the ALIGN() command before the .data section, -since this misleads the reader to think that the Location Counter is used -when assigning an address to the .data section, when it actually is not. - -Fixes: 8a3e74446fe7 ("allow to build arm flat binaries") -Signed-off-by: Niklas Cassel ---- - elf2flt.ld.in | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/elf2flt.ld.in b/elf2flt.ld.in -index 0df999d..e5aea14 100644 ---- a/elf2flt.ld.in -+++ b/elf2flt.ld.in -@@ -94,12 +94,9 @@ W_RODAT: *(.gnu.linkonce.r*) - *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > flatmem - @SYMBOL_PREFIX@__exidx_end = .; -- -- . = ALIGN(0x20) ; - @SYMBOL_PREFIX@_etext = . ; - -- .data : { -- . = ALIGN(0x4) ; -+ .data ALIGN(0x20): { - @SYMBOL_PREFIX@_sdata = . ; - @SYMBOL_PREFIX@__data_start = . ; - @SYMBOL_PREFIX@data_start = . ; --- -2.41.0 - diff --git a/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch b/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch deleted file mode 100644 index c2aa538d0240..000000000000 --- a/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 1498503bde2a6055a83f1e9f3eaa6f2a104bd597 Mon Sep 17 00:00:00 2001 -From: Damien Le Moal -Date: Wed, 9 Sep 2020 17:31:33 +0900 -Subject: [PATCH] elf2flt: add riscv 64-bits support - -Add support for riscv 64bits ISA by defining the relocation types -R_RISCV_32_PCREL, R_RISCV_ADD32, R_RISCV_SUB32, R_RISCV_32 and -R_RISCV_64. riscv64 support also needs the __global_pointer$ symbol to -be defined right after the relocation tables in the data section. To -define this symbol, the "RISCV_GP" line prefix is added. The "RISCV_GP" -string is removed if the target CPU type is riscv64 and the definition -line is dropped for other CPU types. - -With these changes, buildroot and busybox build and run on riscv NOMMU -systems with Linux kernel including patch 6045ab5fea4c -("binfmt_flat: do not stop relocating GOT entries prematurely on riscv") -fixing the binfmt_flat loader. Tested on QEMU and Canaan Kendryte K210 -boards. - -This patch is based on earlier work by Christoph Hellwig . - -Signed-off-by: Damien Le Moal ---- - elf2flt.c | 16 ++++++++++++++++ - elf2flt.ld.in | 1 + - ld-elf2flt.c | 8 ++++++++ - 3 files changed, 25 insertions(+) - -diff --git a/elf2flt.c b/elf2flt.c -index ea6b5a1..c2816b6 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -81,6 +81,8 @@ const char *elf2flt_progname; - #include - #elif defined(TARGET_xtensa) - #include -+#elif defined(TARGET_riscv64) -+#include - #endif - - #if defined(__MINGW32__) -@@ -123,6 +125,8 @@ const char *elf2flt_progname; - #define ARCH "nios2" - #elif defined(TARGET_xtensa) - #define ARCH "xtensa" -+#elif defined(TARGET_riscv64) -+#define ARCH "riscv64" - #else - #error "Don't know how to support your CPU architecture??" - #endif -@@ -821,6 +825,18 @@ output_relocs ( - goto good_32bit_resolved_reloc; - default: - goto bad_resolved_reloc; -+#elif defined(TARGET_riscv64) -+ case R_RISCV_32_PCREL: -+ case R_RISCV_ADD32: -+ case R_RISCV_ADD64: -+ case R_RISCV_SUB32: -+ case R_RISCV_SUB64: -+ continue; -+ case R_RISCV_32: -+ case R_RISCV_64: -+ goto good_32bit_resolved_reloc; -+ default: -+ goto bad_resolved_reloc; - #else - default: - /* The default is to assume that the -diff --git a/elf2flt.ld.in b/elf2flt.ld.in -index e5aea14..950849e 100644 ---- a/elf2flt.ld.in -+++ b/elf2flt.ld.in -@@ -106,6 +106,7 @@ W_RODAT: *(.gnu.linkonce.r*) - . = ALIGN(0x20) ; - LONG(-1) - . = ALIGN(0x20) ; -+RISCV_GP: __global_pointer$ = . + 0x800 ; - R_RODAT: *(.rodata) - R_RODAT: *(.rodata1) - R_RODAT: *(.rodata.*) -diff --git a/ld-elf2flt.c b/ld-elf2flt.c -index 7cb02d5..75ee1bb 100644 ---- a/ld-elf2flt.c -+++ b/ld-elf2flt.c -@@ -324,6 +324,14 @@ static int do_final_link(void) - append_option(&other_options, concat(got_offset, "=", buf, NULL)); - } - -+ /* riscv adds a global pointer symbol to the linker file with the -+ "RISCV_GP:" prefix. Remove the prefix for riscv64 architecture and -+ the entire line for other architectures. */ -+ if (streq(TARGET_CPU, "riscv64")) -+ append_sed(&sed, "^RISCV_GP:", ""); -+ else -+ append_sed(&sed, "^RISCV_GP:", NULL); -+ - /* Locate the default linker script, if we don't have one provided. */ - if (!linker_script) - linker_script = concat(ldscriptpath, "/elf2flt.ld", NULL); --- -2.41.0 - diff --git a/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch b/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch deleted file mode 100644 index be8d57affa78..000000000000 --- a/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 4f28e4329897b7f23d828b375fb365d0e30c9cb5 Mon Sep 17 00:00:00 2001 -From: Niklas Cassel -Date: Tue, 9 Aug 2022 12:13:50 +0200 -Subject: [PATCH] elf2flt: create a common helper function - -In order to make the code more maintainable, -move duplicated code to a common helper function. - -No functional change intended. - -Signed-off-by: Niklas Cassel ---- - elf2flt.c | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/elf2flt.c b/elf2flt.c -index c2816b6..8cd48d9 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -346,6 +346,13 @@ compare_relocs (const void *pa, const void *pb) - } - #endif - -+static bool -+ro_reloc_data_section_should_be_in_text(asection *s) -+{ -+ return (s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == -+ (SEC_DATA | SEC_READONLY | SEC_RELOC); -+} -+ - static uint32_t * - output_relocs ( - bfd *abs_bfd, -@@ -437,8 +444,7 @@ output_relocs ( - */ - if ((!pic_with_got || ALWAYS_RELOC_TEXT) && - ((a->flags & SEC_CODE) || -- ((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == -- (SEC_DATA | SEC_READONLY | SEC_RELOC)))) -+ ro_reloc_data_section_should_be_in_text(a))) - sectionp = text + (a->vma - text_vma); - else if (a->flags & SEC_DATA) - sectionp = data + (a->vma - data_vma); -@@ -1902,8 +1908,7 @@ int main(int argc, char *argv[]) - bfd_vma sec_vma; - - if ((s->flags & SEC_CODE) || -- ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == -- (SEC_DATA | SEC_READONLY | SEC_RELOC))) { -+ ro_reloc_data_section_should_be_in_text(s)) { - vma = &text_vma; - len = &text_len; - } else if (s->flags & SEC_DATA) { -@@ -1941,8 +1946,7 @@ int main(int argc, char *argv[]) - * data sections.*/ - for (s = abs_bfd->sections; s != NULL; s = s->next) - if ((s->flags & SEC_CODE) || -- ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == -- (SEC_DATA | SEC_READONLY | SEC_RELOC))) -+ ro_reloc_data_section_should_be_in_text(s)) - if (!bfd_get_section_contents(abs_bfd, s, - text + (s->vma - text_vma), 0, - elf2flt_bfd_section_size(s))) -@@ -1971,8 +1975,7 @@ int main(int argc, char *argv[]) - * data sections already included in the text output section.*/ - for (s = abs_bfd->sections; s != NULL; s = s->next) - if ((s->flags & SEC_DATA) && -- ((s->flags & (SEC_READONLY | SEC_RELOC)) != -- (SEC_READONLY | SEC_RELOC))) -+ !ro_reloc_data_section_should_be_in_text(s)) - if (!bfd_get_section_contents(abs_bfd, s, - data + (s->vma - data_vma), 0, - elf2flt_bfd_section_size(s))) --- -2.41.0 - diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch deleted file mode 100644 index 96befd53d852..000000000000 --- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 87d45736a6855f2147ef9c88d2bce2cabc84cb52 Mon Sep 17 00:00:00 2001 -From: Niklas Cassel -Date: Tue, 9 Aug 2022 21:06:05 +0200 -Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 - -Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") -changed the condition of which input sections that should be included -in the .text output section from: -((a->flags & (SEC_DATA | SEC_READONLY)) == (SEC_DATA | SEC_READONLY)) -to: -((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == -(SEC_DATA | SEC_READONLY | SEC_RELOC)) - -On ARM, the .eh_frame input section does not have the SEC_RELOC flag set, -so on ARM, this change caused .eh_frame to move from .text to .data. - -However, on e.g. m68k, xtensa and riscv64, the .eh_frame input section -does have the SEC_RELOC flag set, which means that the change in -commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") -caused .eh_frame to move in an opposite way, i.e. from .data to .text. - -This resulted in a fatal error on m68k, xtensa and riscv64: -ERROR: text=0x3bab8 overlaps data=0x33f60 ? - -This is because elf2flt cannot append to .text after .data has been -appended to. - -Note that the binutils maintainer says that the correct thing is -to put read-only relocation data sections in .text: -https://sourceware.org/legacy-ml/binutils/2019-10/msg00132.html - -So the proper fix is probably to rewrite elf2flt so that it can append -to .text after .data has been appended to (which will require elf2flt -to move/relocate everything that has already been appended to .data, -since the virtual addresses are contiguous). - -However, for now, add an exception for input sections which have all -three flags SEC_DATA, SEC_READONLY, and SEC_RELOC set, and which have a -name equal to a problematic input section (.eh_frame, .gcc_except_table). -That way, we get the same behavior as older elf2flt releases for m68k, -xtensa and riscv64, where we put read-only relocation data in .data, -which was working perfectly fine. - -This exception will not change any behavior on ARM, as the .eh_frame -input section does not have flag SEC_RELOC set. - -Signed-off-by: Niklas Cassel ---- - elf2flt.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/elf2flt.c b/elf2flt.c -index 8cd48d9..60bfa57 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -349,8 +349,13 @@ compare_relocs (const void *pa, const void *pb) - static bool - ro_reloc_data_section_should_be_in_text(asection *s) - { -- return (s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == -- (SEC_DATA | SEC_READONLY | SEC_RELOC); -+ if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == -+ (SEC_DATA | SEC_READONLY | SEC_RELOC)) { -+ if (!strcmp(".eh_frame", s->name) || !strcmp(".gcc_except_table", s->name)) -+ return false; -+ return true; -+ } -+ return false; - } - - static uint32_t * --- -2.41.0 - diff --git a/package/elf2flt/0006-xtensa-fix-text-relocations.patch b/package/elf2flt/0006-xtensa-fix-text-relocations.patch deleted file mode 100644 index 19c47cca906b..000000000000 --- a/package/elf2flt/0006-xtensa-fix-text-relocations.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7e1c17d7fe72a0889d56d5e6a1390d493d1de144 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 29 Nov 2022 17:47:54 -0800 -Subject: [PATCH] xtensa: fix text relocations - -The commit 5e08f1968316 ("Don't always update text in !pic_with_got case") -changed good_32bit_resolved_reloc to not do endianness swapping for -relocated entries in the text segment. This broke little-endian xtensa -FLAT images which after this change fail to start with the following -message: - - binfmt_flat: reloc outside program 0x24c80100 (0 - 0x6e430/0x56a20) - -Fix it by preserving 'update_text' when building for xtensa. - -Fixes: 5e08f1968316 ("Don't always update text in !pic_with_got case") -Reported-by: Niklas Cassel -Signed-off-by: Max Filippov ---- - elf2flt.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/elf2flt.c b/elf2flt.c -index 60bfa57..0fcb747 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -833,7 +833,20 @@ output_relocs ( - continue; - case R_XTENSA_32: - case R_XTENSA_PLT: -- goto good_32bit_resolved_reloc; -+ if (bfd_big_endian (abs_bfd)) -+ sym_addr = -+ (r_mem[0] << 24) -+ + (r_mem[1] << 16) -+ + (r_mem[2] << 8) -+ + r_mem[3]; -+ else -+ sym_addr = -+ r_mem[0] -+ + (r_mem[1] << 8) -+ + (r_mem[2] << 16) -+ + (r_mem[3] << 24); -+ relocation_needed = 1; -+ break; - default: - goto bad_resolved_reloc; - #elif defined(TARGET_riscv64) --- -2.41.0 - diff --git a/package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch b/package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch deleted file mode 100644 index 82e693f35f13..000000000000 --- a/package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 9ec7dd9dead2f3c4c73c3ab2166a1f81bfb41825 Mon Sep 17 00:00:00 2001 -From: Greg Ungerer -Date: Thu, 13 Apr 2023 22:58:20 +1000 -Subject: [PATCH] elf2flt: remove use of BFD_VMA_FMT - -In binutils-2.40 the BFD_VMA_FMT definition used for printf style -formatting specifiers has been removed. For reference this was done in -commit b82817674f46 ("Don't use BFD_VMA_FMT in binutils") in the -binutils git development tree. - -BFD_VMA_FMT is used in a number of places in the elf2flt code to output -bfd offsets, values and the like. So it is broken when using the bfd -code from binutils-2.40 and newer. - -According to the binutils change PRIx64 (and friends) is used to replace -it, with appropriate casts to keep it clean for 32 and 64 bit platforms. -Change the elf2flt.c use of it in the same way to fix. - -This does not change the output in any way in normal use. This fix can -be used on all versions of binutils (older and newer), there is no -need to only do this on 2.40 and newer. - -Signed-off-by: Greg Ungerer -Upstream: https://github.com/uclinux-dev/elf2flt/commit/a36df7407d9e3f93ca6449841ff0821b0d980438 -Signed-off-by: Thomas Petazzoni ---- - elf2flt.c | 58 ++++++++++++++++++++++++++++--------------------------- - 1 file changed, 30 insertions(+), 28 deletions(-) - -diff --git a/elf2flt.c b/elf2flt.c -index 0fcb747..6685bff 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -220,8 +220,8 @@ dump_symbols(asymbol **symbol_table, long number_of_symbols) - long i; - printf("SYMBOL TABLE:\n"); - for (i=0; iname, symbol_table[i]->value); -+ printf(" NAME=%s VALUE=0x%"PRIx64"\n", -+ symbol_table[i]->name, (uint64_t) symbol_table[i]->value); - } - printf("\n"); - return(0); -@@ -466,8 +466,8 @@ output_relocs ( - if (r == NULL) - continue; - if (verbose) -- printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"BFD_VMA_FMT"x\n", -- r->name, r, r->flags, elf2flt_bfd_section_vma(r)); -+ printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"PRIx64"\n", -+ r->name, r, r->flags, (uint64_t) elf2flt_bfd_section_vma(r)); - if ((r->flags & SEC_RELOC) == 0) - continue; - relsize = bfd_get_reloc_upper_bound(rel_bfd, r); -@@ -952,12 +952,13 @@ output_relocs ( - if (verbose) - fprintf(stderr, - "%s vma=0x%x, " -- "value=0x%"BFD_VMA_FMT"x, " -- "address=0x%"BFD_VMA_FMT"x " -+ "value=0x%"PRIx64", " -+ "address=0x%"PRIx64" " - "sym_addr=0x%x rs=0x%x, opcode=0x%x\n", - "ABS32", -- sym_vma, (*(q->sym_ptr_ptr))->value, -- q->address, sym_addr, -+ sym_vma, -+ (uint64_t) (*(q->sym_ptr_ptr))->value, -+ (uint64_t) q->address, sym_addr, - (*p)->howto->rightshift, - *(uint32_t *)r_mem); - sym_vma = elf2flt_bfd_section_vma(sym_section); -@@ -971,12 +972,13 @@ output_relocs ( - if (verbose) - fprintf(stderr, - "%s vma=0x%x, " -- "value=0x%"BFD_VMA_FMT"x, " -- "address=0x%"BFD_VMA_FMT"x " -+ "value=0x%"PRIx64", " -+ "address=0x%"PRIx64" " - "sym_addr=0x%x rs=0x%x, opcode=0x%x\n", - "PLT32", -- sym_vma, (*(q->sym_ptr_ptr))->value, -- q->address, sym_addr, -+ sym_vma, -+ (uint64_t) (*(q->sym_ptr_ptr))->value, -+ (uint64_t) q->address, sym_addr, - (*p)->howto->rightshift, - *(uint32_t *)r_mem); - case R_ARM_PC24: -@@ -994,8 +996,8 @@ output_relocs ( - case R_V850_ZDA_16_16_OFFSET: - case R_V850_ZDA_16_16_SPLIT_OFFSET: - /* Can't support zero-relocations. */ -- printf ("ERROR: %s+0x%"BFD_VMA_FMT"x: zero relocations not supported\n", -- sym_name, q->addend); -+ printf ("ERROR: %s+0x%"PRIx64": zero relocations not supported\n", -+ sym_name, (uint64_t) q->addend); - continue; - #endif /* TARGET_v850 */ - -@@ -1194,12 +1196,12 @@ output_relocs ( - temp |= (exist_val & 0x3f); - *(unsigned long *)r_mem = htoniosl(temp); - if (verbose) -- printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " -+ printf("omit: offset=0x%"PRIx64" symbol=%s%s " - "section=%s size=%d " -- "fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x) GPREL\n", -- q->address, sym_name, addstr, -+ "fixup=0x%x (reloc=0x%"PRIx64") GPREL\n", -+ (uint64_t) q->address, sym_name, addstr, - section_name, sym_reloc_size, -- sym_addr, section_vma + q->address); -+ sym_addr, (uint64_t) section_vma + q->address); - continue; - } - case R_NIOS2_PCREL16: -@@ -1214,12 +1216,12 @@ output_relocs ( - exist_val |= ((sym_addr & 0xFFFF) << 6); - *(unsigned long *)r_mem = htoniosl(exist_val); - if (verbose) -- printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " -+ printf("omit: offset=0x%"PRIx64" symbol=%s%s " - "section=%s size=%d " -- "fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x) PCREL\n", -- q->address, sym_name, addstr, -+ "fixup=0x%x (reloc=0x%"PRIx64") PCREL\n", -+ (uint64_t) q->address, sym_name, addstr, - section_name, sym_reloc_size, -- sym_addr, section_vma + q->address); -+ sym_addr, (uint64_t) section_vma + q->address); - continue; - } - -@@ -1231,9 +1233,9 @@ output_relocs ( - && (p[-1]->sym_ptr_ptr == p[0]->sym_ptr_ptr) - && (p[-1]->addend == p[0]->addend)) { - if (verbose) -- printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " -+ printf("omit: offset=0x%"PRIx64" symbol=%s%s " - "section=%s size=%d LO16\n", -- q->address, sym_name, addstr, -+ (uint64_t) q->address, sym_name, addstr, - section_name, sym_reloc_size); - continue; - } -@@ -1646,13 +1648,13 @@ DIS29_RELOCATION: - */ - if (relocation_needed) { - if (verbose) -- printf(" RELOC[%d]: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " -+ printf(" RELOC[%d]: offset=0x%"PRIx64" symbol=%s%s " - "section=%s size=%d " -- "fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x)\n", -+ "fixup=0x%x (reloc=0x%"PRIx64")\n", - flat_reloc_count, -- q->address, sym_name, addstr, -+ (uint64_t) q->address, sym_name, addstr, - section_name, sym_reloc_size, -- sym_addr, section_vma + q->address); -+ sym_addr, (uint64_t) section_vma + q->address); - - #ifndef TARGET_bfin - flat_relocs = realloc(flat_relocs, --- -2.41.0 - diff --git a/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch b/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch deleted file mode 100644 index 74d3085d08eb..000000000000 --- a/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5acfed0012f2fff9801b25403bd8a5e1c2ccfea2 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Mon, 7 Aug 2023 09:30:34 +0200 -Subject: [PATCH] riscv64: add more relocations required to be handled - -Signed-off-by: Waldemar Brodkorb -Upstream: https://github.com/uclinux-dev/elf2flt/pull/24 ---- - elf2flt.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/elf2flt.c b/elf2flt.c -index 6685bff..6b3bea4 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -850,11 +850,21 @@ output_relocs ( - default: - goto bad_resolved_reloc; - #elif defined(TARGET_riscv64) -+ case R_RISCV_NONE: - case R_RISCV_32_PCREL: -+ case R_RISCV_ADD8: -+ case R_RISCV_ADD16: - case R_RISCV_ADD32: - case R_RISCV_ADD64: -+ case R_RISCV_SUB6: -+ case R_RISCV_SUB8: -+ case R_RISCV_SUB16: - case R_RISCV_SUB32: - case R_RISCV_SUB64: -+ case R_RISCV_SET6: -+ case R_RISCV_SET8: -+ case R_RISCV_SET16: -+ case R_RISCV_SET32: - continue; - case R_RISCV_32: - case R_RISCV_64: --- -2.39.2 - diff --git a/package/elf2flt/elf2flt.hash b/package/elf2flt/elf2flt.hash index c576f65cdb0b..4dc040645e9d 100644 --- a/package/elf2flt/elf2flt.hash +++ b/package/elf2flt/elf2flt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6637432ed58dee2d42d09e3b9a902a0dd3b9975acba0c0b24ef9e4e9253159a9 elf2flt-2021.08.tar.gz +sha256 735482d8c5fd76191e86ff2d6985dd68c232a7b8bdac11fdb480385c6a75ca8f elf2flt-2023.09.tar.gz sha256 f20bc5007904094e3a4e9fbcc3526cdd40893f91d458c3139b308e5c4c0899c6 LICENSE.TXT diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index b970de48f2b8..0def282c0254 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELF2FLT_VERSION = 2021.08 +ELF2FLT_VERSION = 2023.09 ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,v$(ELF2FLT_VERSION)) ELF2FLT_LICENSE = GPL-2.0+ ELF2FLT_LICENSE_FILES = LICENSE.TXT From 68df20336664d4d0b1a9d8d0285d23eba631845a Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Tue, 12 Sep 2023 12:03:52 +0200 Subject: [PATCH 1900/2890] package/s390-tools: bump version to 2.29.0 Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- package/s390-tools/s390-tools.hash | 2 +- package/s390-tools/s390-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index b7563d8bac9c..a00e95437b96 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 4315e64cf2fe0240ff9bd9929501db731d5bf3e7acf964ecf323d48d90e08f6e s390-tools-2.27.0.tar.gz +sha256 849ff400dc6c1eb7eebe4aa3e7a4871721c25bcee6cfdd0535a056a038fd3ab0 s390-tools-2.29.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index 187fefea6450..c3155a13ff5a 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.27.0 +S390_TOOLS_VERSION = 2.29.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE From b169bebd7ed4f3f6246f5ef2f3c6228d4e4e9978 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Sep 2023 21:59:29 +0200 Subject: [PATCH 1901/2890] package/libspdm: add LIBSPDM_CPE_ID_VENDOR cpe:2.3:a:dmtf:libspdm is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Admtf%3Alibspdm Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libspdm/libspdm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk index 48c46e41f7ca..cbcbed29de82 100644 --- a/package/libspdm/libspdm.mk +++ b/package/libspdm/libspdm.mk @@ -8,6 +8,7 @@ LIBSPDM_VERSION = 3.0.0 LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) LIBSPDM_LICENSE = BSD-3-Clause LIBSPDM_LICENSE_FILES = LICENSE.md +LIBSPDM_CPE_ID_VENDOR = dmtf LIBSPDM_INSTALL_STAGING = YES LIBSPDM_INSTALL_TARGET = NO From b7e57785d0ec8827012b122db1651c58192ccf19 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Sep 2023 22:14:19 +0200 Subject: [PATCH 1902/2890] package/firewalld: add FIREWALLD_CPE_ID_VENDOR cpe:2.3:a:firewalld:firewalld is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Afirewalld%3Afirewalld Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/firewalld/firewalld.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/firewalld/firewalld.mk b/package/firewalld/firewalld.mk index 4a13579fca07..13edba6d2415 100644 --- a/package/firewalld/firewalld.mk +++ b/package/firewalld/firewalld.mk @@ -8,6 +8,7 @@ FIREWALLD_VERSION = 1.3.2 FIREWALLD_SITE = $(call github,firewalld,firewalld,v$(FIREWALLD_VERSION)) FIREWALLD_LICENSE = GPL-2.0 FIREWALLD_LICENSE_FILES = COPYING +FIREWALLD_CPE_ID_VENDOR = firewalld FIREWALLD_AUTORECONF = YES FIREWALLD_DEPENDENCIES = \ From 270b7c017def05a4b66a892f5a49e3e40dcbef8c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Sep 2023 22:28:25 +0200 Subject: [PATCH 1903/2890] package/libheif: add LIBHEIF_CPE_ID_VENDOR cpe:2.3:a:struktur:libheif is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Astruktur%3Alibheif Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libheif/libheif.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk index 9c6c2829cf02..65e64a02f70f 100644 --- a/package/libheif/libheif.mk +++ b/package/libheif/libheif.mk @@ -8,6 +8,7 @@ LIBHEIF_VERSION = 1.16.2 LIBHEIF_SITE = https://github.com/strukturag/libheif/releases/download/v$(LIBHEIF_VERSION) LIBHEIF_LICENSE = LGPL-3.0+ LIBHEIF_LICENSE_FILES = COPYING +LIBHEIF_CPE_ID_VENDOR = struktur LIBHEIF_INSTALL_STAGING = YES LIBHEIF_CONF_OPTS = \ -DCMAKE_CXX_FLAGS="-std=c++11" \ From fd94f49566fc420913a3cabda9a87b44a822ea53 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Sep 2023 22:39:52 +0200 Subject: [PATCH 1904/2890] package/libde265: add LIBDE265_CPE_ID_VENDOR cpe:2.3:a:struktur:libde265 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Astruktur%3Alibde265 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libde265/libde265.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libde265/libde265.mk b/package/libde265/libde265.mk index 60424c0de67a..208fa24e270a 100644 --- a/package/libde265/libde265.mk +++ b/package/libde265/libde265.mk @@ -8,6 +8,7 @@ LIBDE265_VERSION = 1.0.12 LIBDE265_SITE = https://github.com/strukturag/libde265/releases/download/v$(LIBDE265_VERSION) LIBDE265_LICENSE = LGPL-3.0+ LIBDE265_LICENSE_FILES = COPYING +LIBDE265_CPE_ID_VENDOR = struktur LIBDE265_INSTALL_STAGING = YES $(eval $(cmake-package)) From 0055c9c63457627159f2aff1b9b596748c20fb8f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 13 Sep 2023 00:15:48 +0200 Subject: [PATCH 1905/2890] package/qt5: fix upstream git trees Since commits 4e8b5f9bee9c [0], 6cfbd51d98d1 [1], and d838a416c4ed [2], the repository we clone from is the cgit browser, and it does not serve the git tree, only the browser: $ git clone https://code.qt.io/cgit/qt/qtcoap.git Cloning into 'qtcoap'... fatal: repository 'https://code.qt.io/cgit/qt/qtcoap.git/' not found Browsing there displays the cgit UI, which gives a proper URI to clone from; switch to using that. Things happened to "work" so far thanks to sources.buildroot.net. [0] 4e8b5f9bee9c package/qt5/qt5mqtt: bump version to 5.15.2 (and fix download) [1] 6cfbd51d98d1 package/qt5/qt5coap: bump version to 5.15.2 (and fix download) [2] d838a416c4ed package/qt5/qt5knx: bump version to 5.15.2 (and fix download) Signed-off-by: Yann E. MORIN Cc: Peter Seiderer Cc: Angelo Compagnucci Cc: Giulio Benetti CC: Julien Corjon Signed-off-by: Thomas Petazzoni --- package/qt5/qt5coap/qt5coap.mk | 2 +- package/qt5/qt5knx/qt5knx.mk | 2 +- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index a50f19d7f221..5feb1e5bc26a 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -5,7 +5,7 @@ ################################################################################ QT5COAP_VERSION = 5.15.2 -QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git +QT5COAP_SITE = https://code.qt.io/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES QT5COAP_LICENSE = GPL-3.0, GFDL-1.3 diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 412e31c65295..91b99aaa87b7 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -5,7 +5,7 @@ ################################################################################ QT5KNX_VERSION = 5.15.2 -QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git +QT5KNX_SITE = https://code.qt.io/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES QT5KNX_LICENSE = GPL-3.0 with exception diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 0b62cf1bed59..824d58d1d122 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -5,7 +5,7 @@ ################################################################################ QT5MQTT_VERSION = 5.15.2 -QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git +QT5MQTT_SITE = https://code.qt.io/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES QT5MQTT_LICENSE = GPL-3.0 with exception From 768f9f80f62c1da6e298c680f0f4bfa887f38c78 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 13 Sep 2023 00:15:49 +0200 Subject: [PATCH 1906/2890] support/download: generate even more reproducible tarballs When we generate the taballs off a local working copy of a VCS tree, the umask is the one that we enforce in out top-level Makefile. However, it is possible that a user manually tinkers in said working copy (e.g. to check an upstream bug fix, or regression). If the user umask is different from the one Buildroot enfirces, such tinkering can impact the mode bits of the files, even if their content is not modified. When we eventually need to create a tarball from said working copy, the VCS (e.g. git) will only be interested in checking whether the content of the files have changed before chcking them out, and will not look at, and restore/fix the mode bits. As a consequence, we may create non-reproducible archives. We fix that by enforcing the mode bits on the files before we create the tarball: we disable the write and execute bits, and only set the execute bit if the user execute bit is set. Signed-off-by: Yann E. MORIN Cc: Vincent Fazio Signed-off-by: Thomas Petazzoni --- support/download/helpers | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/download/helpers b/support/download/helpers index 90a7d6c1ec3a..265685eff528 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -53,6 +53,9 @@ mk_tar_gz() { tmp="$(mktemp --tmpdir="$(pwd)")" pushd "${in_dir}" >/dev/null + # Enforce group/others mode bits + chmod -R go-wx+X . + # Establish list find . -not -type d -and -not \( -false "${find_opts[@]}" \) >"${tmp}.list" # Sort list for reproducibility From daa341cb9bc82d8bcb175c46da1ba80fd9203a98 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 13 Sep 2023 00:15:50 +0200 Subject: [PATCH 1907/2890] support/download/git: properly catch failures Since commit b7efb43e86da (download/git: try to recover from utterly-broken repositories), we catch errors through an ERR trap, so we can try and recover from a broken repository. In that commit, we switched from using "set -e" to "set -E", so that trap is inherited in functions, command substitutions, and subshells. However, the trap is not defined until we have parsed the options, created the cache directory, and eventually chdir()ed into it. Athough improbable, it is possible for the git helper to fail in any of those steps, and that would not get caught. Fix that Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- support/download/git | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/support/download/git b/support/download/git index 1a1c315f73d7..729c553f8f6c 100755 --- a/support/download/git +++ b/support/download/git @@ -5,8 +5,8 @@ # (e.g. tar options, compression ratio or method)), we MUST update the format # version in the variable BR_FMT_VERSION_git, in package/pkg-download.mk. -# We want to catch any unexpected failure, and exit immediately -set -E +# We want to catch any unexpected failure +set -e # Download helper for git, to be called from the download wrapper script # @@ -77,6 +77,7 @@ pushd "${git_cache}" >/dev/null # Any error now should try to recover trap _on_error ERR +set -E # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) From bcee3ca6d66d30de4b0cd8186ce4c72020705df8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 13 Sep 2023 00:15:51 +0200 Subject: [PATCH 1908/2890] support/download/git: fix shellcheck errors The quoting around the expansion of ${relative_dir} was indeed incorrect since it was introduced back in 8fe9894f655f (suport/download: fix git wrapper with submodules on older git versions): it is in fact already quoted as part of the whole sed expression. ${GIT} can contain more than one item, but we don't care about splitting on spaces when we just print it for debug, so we can just quote it rather than add an exception. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - support/download/git | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index bf8df8cef56f..fde8eceed226 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1612,7 +1612,6 @@ support/download/check-hash Shellcheck support/download/cvs Shellcheck support/download/dl-wrapper Shellcheck support/download/file Shellcheck -support/download/git Shellcheck support/download/go-post-process Shellcheck support/download/hg Shellcheck support/download/scp Shellcheck diff --git a/support/download/git b/support/download/git index 729c553f8f6c..6654d98a008e 100755 --- a/support/download/git +++ b/support/download/git @@ -21,6 +21,7 @@ set -e # Environment: # GIT : the git command to call +# shellcheck disable=SC1090 # Only provides mk_tar_gz() . "${0%/*}/helpers" # Save our path and options in case we need to call ourselves again @@ -83,12 +84,13 @@ set -E # being expanded a second time (in case there are spaces in them) _git() { if [ -z "${quiet}" ]; then - printf '%s ' GIT_DIR="${git_cache}/.git" ${GIT} "${@}"; printf '\n' + printf '%s ' GIT_DIR="${git_cache}/.git" "${GIT}" "${@}"; printf '\n' fi _plain_git "$@" } # Note: please keep command below aligned with what is printed above _plain_git() { + # shellcheck disable=SC2086 # We want word-splitting for GIT eval GIT_DIR="${git_cache}/.git" ${GIT} "${@}" } @@ -174,6 +176,7 @@ fi # the working copy as well as the repository, which means submodules # will not be cached for older versions. # +# shellcheck disable=SC2016 # Will be expanded by git-foreach cmd='printf "Deregistering submodule \"%s\"\n" "${path}" && cd .. && rm -rf "${path##*/}"' _git submodule --quiet foreach "'${cmd}'" @@ -200,11 +203,12 @@ if [ ${recurse} -eq 1 ]; then # that the archives are reproducible across a wider range of git # versions. However, we can't do that if git is too old and uses # full repositories for submodules. + # shellcheck disable=SC2016 # Will be expanded by git-foreach cmd='printf "%s\n" "${path}/"' for module_dir in $( _plain_git submodule --quiet foreach "'${cmd}'" ); do [ -f "${module_dir}/.git" ] || continue relative_dir="$( sed -r -e 's,/+,/,g; s,[^/]+/,../,g' <<<"${module_dir}" )" - sed -r -i -e "s:^gitdir\: $(pwd)/:gitdir\: "${relative_dir}":" "${module_dir}/.git" + sed -r -i -e "s:^gitdir\: $(pwd)/:gitdir\: ${relative_dir}:" "${module_dir}/.git" done fi @@ -214,6 +218,7 @@ if [ ${large_file} -eq 1 ]; then _git lfs fetch _git lfs checkout # If there are also submodules, recurse into them, + # shellcheck disable=SC2086 # We want word-splitting for GIT if [ ${recurse} -eq 1 ]; then _git submodule foreach --recursive ${GIT} lfs install --local _git submodule foreach --recursive ${GIT} lfs fetch From 622f82c2f144beb7d04744b60cf63aca496d880b Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Wed, 13 Sep 2023 16:09:24 +1200 Subject: [PATCH 1909/2890] package/syslog-ng: bump version to 4.3.1 Update to latest version. Release notes: https://github.com/syslog-ng/syslog-ng/releases/tag/syslog-ng-4.3.1 Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/syslog-ng/syslog-ng.conf | 2 +- package/syslog-ng/syslog-ng.hash | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index a3cfa8dacfac..06e48cdd5033 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 4.2 +@version: 4.3 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index a91733158079..6841ed5eb11a 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 092bd17fd47002c988aebdf81d0ed3f3cfd0e82b388d2453bcaa5e67934f4dda syslog-ng-4.2.0.tar.gz +sha256 999dbab62982c3cffba02c0be22c596ee1ce81d6954689dc9b3a6afeb513cce3 syslog-ng-4.3.1.tar.gz sha256 c75dcbfc17ccf742f12042a370f825a40951085d2352dfc9d07e715dae3ca9bd COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 39433185b4f0..ff5aaee429b1 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 4.2.0 +SYSLOG_NG_VERSION = 4.3.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt From 5ce78e1909a507e66cb8208f8660752be861fca0 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 11 Sep 2023 21:56:40 +0200 Subject: [PATCH 1910/2890] package/rtl8812au-aircrack-ng: bump to version 2023-07-23 This version fix build failure on Linux version < 5.15. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index ed75b0981600..bd6c87d56e78 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3545efb56ecba757e1e27a5479653835e3f5be4f5b49eb9e1e4ff87cbeb6e783 rtl8812au-aircrack-ng-35308f4dd73e77fa572c48867cce737449dd8548.tar.gz +sha256 78926af85bd1630ff599d0ec174d7c4c130141cb210a187946ea48ac1015809b rtl8812au-aircrack-ng-04f600ee54a414b871aea509fcd4709838c8c522.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index a666757449d8..99d63432a4af 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = 35308f4dd73e77fa572c48867cce737449dd8548 +RTL8812AU_AIRCRACK_NG_VERSION = 04f600ee54a414b871aea509fcd4709838c8c522 RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From c8672a8b600f2781b54cf4750f1c0eeca264ec14 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Sep 2023 23:04:48 +0200 Subject: [PATCH 1911/2890] package/libspdm: fix legal info Hash of license file is wrong since the addition of the package in commit a837a609a83428b56fa03e18c439b3878d14fdb6 Fixes: - http://autobuild.buildroot.org/results/2f9007ee40126cd57753bc97ae2d81c922d9f9f2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libspdm/libspdm.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash index d06af293971f..5095d3c3b802 100644 --- a/package/libspdm/libspdm.hash +++ b/package/libspdm/libspdm.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 3a40daa59f32843062c3d2699acee09bd0ee217eb8ebf0378ae12b60b6db0636 libspdm-3.0.0.tar.gz -sha256 337130631a714eeae017556cad101d5324c2961214120b6214741d3d43667086 LICENSE.md +sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md From 23e774d2de35c42ee13f618dd2a895f9a97a4d1c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Sep 2023 23:11:33 +0200 Subject: [PATCH 1912/2890] package/zbar: add ZBAR_CPE_ID_VENDOR cpe:2.3:a:zbar_project:zbar is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/438B9E70-F8E2-4318-83B5-46A0DF320CE3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zbar/zbar.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index fb83fa01d5fa..2c933929cf11 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -9,6 +9,7 @@ ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2 ZBAR_SITE = https://www.linuxtv.org/downloads/zbar ZBAR_LICENSE = LGPL-2.1+ ZBAR_LICENSE_FILES = LICENSE.md +ZBAR_CPE_ID_VENDOR = zbar_project ZBAR_INSTALL_STAGING = YES ZBAR_DEPENDENCIES = libv4l jpeg $(TARGET_NLS_DEPENDENCIES) # uses C99 features From 3557a7b599b5b443730f8d0634a39c1694646ce3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Sep 2023 23:18:39 +0200 Subject: [PATCH 1913/2890] package/lldpd: fix CVE-2023-41910 An issue was discovered in lldpd before 1.0.17. By crafting a CDP PDU packet with specific CDP_TLV_ADDRESSES TLVs, a malicious actor can remotely force the lldpd daemon to perform an out-of-bounds read on heap memory. This occurs in cdp_decode in daemon/protocols/cdp.c. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-overflow-when-parsing-CDP-addresses.patch | 24 +++++++++++++++++++ package/lldpd/lldpd.mk | 3 +++ 2 files changed, 27 insertions(+) create mode 100644 package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch diff --git a/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch b/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch new file mode 100644 index 000000000000..05d882a07a16 --- /dev/null +++ b/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch @@ -0,0 +1,24 @@ +From a9aeabdf879c25c584852a0bb5523837632f099b Mon Sep 17 00:00:00 2001 +From: Vincent Bernat +Date: Wed, 12 Apr 2023 07:38:31 +0200 +Subject: [PATCH] daemon: fix read overflow when parsing CDP addresses + +Upstream: https://github.com/lldpd/lldpd/commit/a9aeabdf879c25c584852a0bb5523837632f099b +Signed-off-by: Fabrice Fontaine +--- + NEWS | 4 ++++ + src/daemon/protocols/cdp.c | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/src/daemon/protocols/cdp.c b/src/daemon/protocols/cdp.c +index 8a1be863..42861c0e 100644 +--- a/src/daemon/protocols/cdp.c ++++ b/src/daemon/protocols/cdp.c +@@ -466,6 +466,7 @@ cdp_decode(struct lldpd *cfg, char *frame, int s, struct lldpd_hardware *hardwar + goto malformed; + } + PEEK_DISCARD(address_len); ++ addresses_len -= address_len; + (void)PEEK_SAVE(pos_next_address); + /* Next, we go back and try to extract + IPv4 address */ diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk index dd6f8dcf5d5d..d4abfade8184 100644 --- a/package/lldpd/lldpd.mk +++ b/package/lldpd/lldpd.mk @@ -16,6 +16,9 @@ LLDPD_LICENSE = ISC LLDPD_LICENSE_FILES = LICENSE LLDPD_CPE_ID_VENDOR = lldpd_project +# 0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch +LLDPD_IGNORE_CVES += CVE-2023-41910 + # Detection of c99 support in configure fails without WCHAR. To enable # automatic detection of c99 support by configure, we need to enable # WCHAR in toolchain. But actually we do not need WCHAR at lldpd From eb4f5a2cbc8f6caf8929495318f5f3dbb11f134a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 15 Sep 2023 21:33:44 +0200 Subject: [PATCH 1914/2890] package/openblas: fix some x86 32bit builds OpenBLAS Makefile normally needs to explicitly define the CPU architecture size (32 or 64bit) in the BINARY macro. See [1]. When an architecture supports both 64 and 32bit, the 32bit support is sometimes implemented in OpenBLAS by overriding a fallback to an anterior architecture. For example, if the build target architecture is x86 Haswell 32bit, OpenBLAS build will override the arch to Nehalem. See [2]. If the BINARY macro is undefined, the 32bit fallback will not happen, sometimes leading to a link failure, with output: i686-buildroot-linux-gnu/bin/ar: strmm_kernel_LN.o: No such file or directory This commit fixes those issues by explicitly defining the BINARY macro. This issue has also been discussed upstream in [3] and [4]. Note: this issue was not introduced recently ([3] dates back from 2015), and was also see in previous package version, for example in [5]. Fixes: http://autobuild.buildroot.net/results/e1e/e1e2034a78799abe1bd28b036fa6f7d13322e42f [1] https://github.com/xianyi/OpenBLAS/blob/v0.3.24/Makefile.rule#L50 [2] https://github.com/xianyi/OpenBLAS/blob/v0.3.24/Makefile.system#L113 [3] https://github.com/xianyi/OpenBLAS/issues/657 [4] https://github.com/xianyi/OpenBLAS/issues/1106 [5] http://autobuild.buildroot.net/results/5cd/5cdccd106b1de275ac75c39783e536107a31651f Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/openblas/openblas.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 0d0e8e56dd00..aacfc74b5389 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -49,6 +49,12 @@ ifeq ($(BR2_STATIC_LIBS),y) OPENBLAS_MAKE_OPTS += NO_SHARED=1 endif +ifeq ($(BR2_ARCH_IS_64),y) +OPENBLAS_MAKE_OPTS += BINARY=64 +else +OPENBLAS_MAKE_OPTS += BINARY=32 +endif + # binutils version <= 2.23.2 has a bug # (https://sourceware.org/bugzilla/show_bug.cgi?id=14887) where # whitespaces in ARM register specifications such as [ r1, #12 ] or [ From de45aea47bfaffaa3ccef02b247f94ab78ab1add Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 15 Sep 2023 21:23:07 +0200 Subject: [PATCH 1915/2890] package/libjxl: fix riscv build libjxl was failing to build for riscv targets, since commit ff7c37e57 "package/libjxl: security bump to version 0.8.1". Build was failing with output: /build/libjxl-0.8.1/lib/jxl/enc_xyb.cc: In function 'jxl::Image3F jxl::N_SCALAR::TransformToLinearRGB(const jxl::Image3F&, const jxl::ColorEncoding&, float, const JxlCmsInterface&, jxl::ThreadPool*)': /build/libjxl-0.8.1/lib/jxl/enc_xyb.cc:223:21: error: variable 'std::atomic ok' has initializer but incomplete type 223 | std::atomic ok{true}; | ^~ This build failure was due to a missing header inclusion. For some reason, the build failure was observed only with RISC-V toolchains. This commit fixes the issue by adding an upstream commit, not yet in a package release. See [1]. Fixes: http://autobuild.buildroot.org/results/121/12107bc7aea7afae1d2fb935d31b44eee6ea1501 [1] https://github.com/libjxl/libjxl/commit/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- ...ic-content-to-fix-gcc-compilation-fo.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch diff --git a/package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch b/package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch new file mode 100644 index 000000000000..b856b00728a6 --- /dev/null +++ b/package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch @@ -0,0 +1,47 @@ +From 42e944a471672dae8522fbcf161941895ba16632 Mon Sep 17 00:00:00 2001 +From: Eastdong <31920925+IEAST@users.noreply.github.com> +Date: Thu, 23 Feb 2023 06:08:36 +0800 +Subject: [PATCH] Add missing content to fix gcc compilation for RISCV + architecture. (#2211) + +* Add missing content to fix gcc compilation for RISCV architecture. + +* add name to AUTHORS + +* lint fix + +Co-authored-by: Moritz Firsching +Upstream: https://github.com/libjxl/libjxl/commit/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc +Signed-off-by: Julien Olivain +--- + AUTHORS | 1 + + lib/jxl/enc_xyb.cc | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/AUTHORS b/AUTHORS +index 44dcc409..3340422d 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -30,6 +30,7 @@ Daniel Novomeský + David Burnett + Dirk Lemstra + Don Olmstead ++Dong Xu + Even Rouault + Fred Brennan + Heiko Becker +diff --git a/lib/jxl/enc_xyb.cc b/lib/jxl/enc_xyb.cc +index c7310765..2fd5d025 100644 +--- a/lib/jxl/enc_xyb.cc ++++ b/lib/jxl/enc_xyb.cc +@@ -6,6 +6,7 @@ + #include "lib/jxl/enc_xyb.h" + + #include ++#include + #include + + #undef HWY_TARGET_INCLUDE +-- +2.41.0 + From 7637e25d637801cb1a3a0bd72823fea72931c537 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Sep 2023 20:23:05 +0200 Subject: [PATCH 1916/2890] package/irssi: bump to version 1.4.4 Fix CVE-2023-29132: Irssi 1.3.x and 1.4.x before 1.4.4 has a use-after-free because of use of a stale special collector reference. This occurs when printing of a non-formatted line is concurrent with printing of a formatted line. https://irssi.org/NEWS/#news-v1-4-4 https://irssi.org/NEWS/#news-v1-4-3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/irssi/irssi.hash | 2 +- package/irssi/irssi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index ecd339d83d4d..df72ee4d7678 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 79a4765d2dfe153c440a1775b074d5d0682b96814c7cf92325b5e15ce50e26a8 irssi-1.4.2.tar.xz +sha256 fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead irssi-1.4.4.tar.xz # Locally calculated sha256 a1a27cb2ecee8d5378fbb3562f577104a445d6d66fee89286e16758305e63e2b COPYING diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index c2d02289adca..6790bf0c966a 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRSSI_VERSION = 1.4.2 +IRSSI_VERSION = 1.4.4 IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz IRSSI_SITE = https://codeberg.org/irssi/irssi/releases/download/$(IRSSI_VERSION) IRSSI_LICENSE = GPL-2.0+ From 922e0d8451609c24b45d64c7165cce77213b51e6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Sep 2023 19:16:31 +0200 Subject: [PATCH 1917/2890] package/sngrep: security bump to version 1.7.0 Fix CVE-2023-31981 and CVE-2023-31982 https://github.com/irontec/sngrep/blob/v1.7.0/ChangeLog https://github.com/irontec/sngrep/compare/v1.6.0...v1.7.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/sngrep/sngrep.hash | 6 +++--- package/sngrep/sngrep.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sngrep/sngrep.hash b/package/sngrep/sngrep.hash index 60a32022e6c1..c9b9c8be8df0 100644 --- a/package/sngrep/sngrep.hash +++ b/package/sngrep/sngrep.hash @@ -1,6 +1,6 @@ -# From https://github.com/irontec/sngrep/releases/download/v1.6.0/sngrep-1.6.0.tar.gz.md5sum -md5 1519ca6cd1167c0722debfb96e2ac173 sngrep-1.6.0.tar.gz +# From https://github.com/irontec/sngrep/releases/download/v1.7.0/sngrep-1.7.0.tar.gz.md5sum +md5 ee3cc7bd75adeb713411aa678e45ae4c sngrep-1.7.0.tar.gz # Locally computed -sha256 fd80964d6560f2ff57b4f5bef2353d1a6f7c48d2f1a5f0a167c854bd2e801999 sngrep-1.6.0.tar.gz +sha256 2e5ba3a4d6486ea00bd73d2cceff383ba162dcd6d0170ae74cfa3b1c206e2cb1 sngrep-1.7.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index 0e344550d3c6..b86d7e83f0ac 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNGREP_VERSION = 1.6.0 +SNGREP_VERSION = 1.7.0 SNGREP_SITE = \ https://github.com/irontec/sngrep/releases/download/v$(SNGREP_VERSION) SNGREP_LICENSE = GPL-3.0+ From 7a85e0797f67a21140eab5f667156c816ff4a6ef Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Sep 2023 19:04:12 +0200 Subject: [PATCH 1918/2890] package/hwlock: security bump to version 2.9.3 Fix CVE-2022-47022: An issue was discovered in open-mpi hwloc 2.1.0 allows attackers to cause a denial of service or other unspecified impacts via glibc-cpuset in topology-linux.c. https://github.com/open-mpi/hwloc/blob/hwloc-2.9.3/NEWS https://github.com/open-mpi/hwloc/compare/hwloc-2.9.2...hwloc-2.9.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/hwloc/hwloc.hash | 4 ++-- package/hwloc/hwloc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index d40315a3af66..8010b857f078 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,5 +1,5 @@ # From https://www.open-mpi.org/software/hwloc/v2.9/ -sha1 be2a4f299c0da7670d39724986268bfa3fac6aee hwloc-2.9.2.tar.bz2 -sha256 0a87fdf677f8b00b567d229b6320bf6b25c693edaa43e0b85268d999d6b060cf hwloc-2.9.2.tar.bz2 +sha1 76b49087619b46d71e18bd1131d35a5ccf5de791 hwloc-2.9.3.tar.bz2 +sha256 5c4062ce556f6d3451fc177ffb8673a2120f81df6835dea6a21a90fbdfff0dec hwloc-2.9.3.tar.bz2 # Locally computed sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 6f3b8069e6fa..8fe9e648a7b0 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -5,7 +5,7 @@ ################################################################################ HWLOC_VERSION_MAJOR = 2.9 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).2 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).3 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) HWLOC_LICENSE = BSD-3-Clause From 9434a379dc852dc7b35430089e5a4b9a2cc80a0f Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Fri, 15 Sep 2023 14:49:33 +0200 Subject: [PATCH 1919/2890] package/boost: bump to version 1.83.0 - add upstream patch for Unordered available on the Release Page. Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- .../0001-unordered-fix-copy-assign.patch | 22 +++++++++++++++++++ package/boost/boost.hash | 4 ++-- package/boost/boost.mk | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 package/boost/0001-unordered-fix-copy-assign.patch diff --git a/package/boost/0001-unordered-fix-copy-assign.patch b/package/boost/0001-unordered-fix-copy-assign.patch new file mode 100644 index 000000000000..670552535aff --- /dev/null +++ b/package/boost/0001-unordered-fix-copy-assign.patch @@ -0,0 +1,22 @@ +Upstream Patch for Unordered + +Prevent erroneous copying of groups data, update max load to properly propagate + +Signed-off-by: Michael Nosthoff +Upstream: https://github.com/boostorg/unordered/commit/067884a4e213352e7c81c441f1453c54735c39f3 +diff --git a/include/boost/unordered/detail/foa/core.hpp b/include/boost/unordered/detail/foa/core.hpp +index 239d05d3..7ae9f2c8 100644 +--- a/boost/unordered/detail/foa/core.hpp ++++ b/boost/unordered/detail/foa/core.hpp +@@ -1870,9 +1870,10 @@ private: + + void fast_copy_elements_from(const table_core& x) + { +- if(arrays.elements){ ++ if(arrays.elements&&x.arrays.elements){ + copy_elements_array_from(x); + copy_groups_array_from(x); ++ size_ctrl.ml=std::size_t(x.size_ctrl.ml); + size_ctrl.size=std::size_t(x.size_ctrl.size); + } + } diff --git a/package/boost/boost.hash b/package/boost/boost.hash index 36de2b9b0692..14403758acdf 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_82_0.html -sha256 a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 boost_1_82_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_83_0.html +sha256 6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e boost_1_83_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index d432ab48cc39..9b1baec5bf72 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.82.0 +BOOST_VERSION = 1.83.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES From db2e1539182a6d5332939eb1a2dc090d9c5db325 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 15 Sep 2023 07:28:40 +0200 Subject: [PATCH 1920/2890] package/mg: bump to v3.7 - Sync w/ OpenBSD upstream - Fix key bindings, Home/End - Fix buffer overflow on no match in i-search - Fix mark reset - Usability: - persistent help in status bar - F1 toggle quick-help buffer - F2 save - F3/F4 macro start/end + run, like GNU Emacs Full ChangeLog https://github.com/troglobit/mg/releases/tag/v3.7 Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/mg/mg.hash | 4 ++-- package/mg/mg.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mg/mg.hash b/package/mg/mg.hash index e8eedb892161..6a3e3465b8e9 100644 --- a/package/mg/mg.hash +++ b/package/mg/mg.hash @@ -1,4 +1,4 @@ -# From https://github.com/troglobit/mg/releases/tag/v3.6 -sha256 0e30f99b7606ddd92535aec0ba0118557afa4adca0961267314a4bf7791865fb mg-3.6.tar.gz +# From https://github.com/troglobit/mg/releases/tag/v3.7 +sha256 05101360d2194392da0950e8b6f18d067d8af0fd2f572461ba4d4e7b4ccbb4c1 mg-3.7.tar.gz # Locally computed: sha256 7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c UNLICENSE diff --git a/package/mg/mg.mk b/package/mg/mg.mk index 88f8f6025791..59f1d1e316a2 100644 --- a/package/mg/mg.mk +++ b/package/mg/mg.mk @@ -4,7 +4,7 @@ # ################################################################################ -MG_VERSION = 3.6 +MG_VERSION = 3.7 MG_SITE = https://github.com/troglobit/mg/releases/download/v$(MG_VERSION) MG_LICENSE = Public Domain MG_LICENSE_FILES = UNLICENSE From 7ef2e9896fb95f6fb12881bee498f568eb6af56f Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 15 Sep 2023 07:58:17 +0200 Subject: [PATCH 1921/2890] package/sysklogd: bump to v2.5.2 - Improved accuracy of MARK timer, optional, default: 20 minutes. - Fix sub-second faking of kernel timestamps - Fix reading kernel logs from /proc/kmsg, regression in v2.4.0. Only relevant to really old kernels (pre 4.4?) or systems with static device nodes and no auto-devtmpfs mounting in kernel Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/sysklogd/sysklogd.hash | 2 +- package/sysklogd/sysklogd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 30ce6d9c0bd3..7e0099017431 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 e1d635944e5a6062c8ea18b9506668ebdaefacea1965147f60cf3fb3a25770e8 sysklogd-2.5.0.tar.gz +sha256 9da4444285772ce2bfc9c687be8f978b7a9fe7d3937347cd4938eda0c4545e05 sysklogd-2.5.2.tar.gz # Locally calculated sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index ebc9f89cf77d..7a46d759d30e 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.5.0 +SYSKLOGD_VERSION = 2.5.2 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE From 046872a1f8e1d14dbe07b1cca7abfdb76b560328 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 15 Sep 2023 08:42:27 +0200 Subject: [PATCH 1922/2890] package/libteam: bump to v1.32 - Drop backported patches - Add necessary runner to kernel Signed-off-by: Joachim Wiberg [yann.morin.1998@free.fr: update .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 3 -- .../0001-revert-disregard-current-state.patch | 51 ------------------- .../0002-fix-build-on-openwrt-musl-libc.patch | 41 --------------- ...3-increase-wait-time-for-daemon-kill.patch | 37 -------------- package/libteam/libteam.hash | 2 +- package/libteam/libteam.mk | 3 +- 6 files changed, 3 insertions(+), 134 deletions(-) delete mode 100644 package/libteam/0001-revert-disregard-current-state.patch delete mode 100644 package/libteam/0002-fix-build-on-openwrt-musl-libc.patch delete mode 100644 package/libteam/0003-increase-wait-time-for-daemon-kill.patch diff --git a/.checkpackageignore b/.checkpackageignore index fde8eceed226..4769adf6cd6c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -780,9 +780,6 @@ package/libsvgtiny/0002-Remove-Werror.patch Upstream package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch Upstream package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch Upstream package/libtalloc/0001-buildtools-wafsamba-add-disable-stack-protector-opti.patch Upstream -package/libteam/0001-revert-disregard-current-state.patch Upstream -package/libteam/0002-fix-build-on-openwrt-musl-libc.patch Upstream -package/libteam/0003-increase-wait-time-for-daemon-kill.patch Upstream package/libtelnet/0001-fix-compilation-without-zlib.patch Upstream package/libtheora/0001-link-libtheoradec.patch Upstream package/libtheora/0002-fix-autoreconf.patch Upstream diff --git a/package/libteam/0001-revert-disregard-current-state.patch b/package/libteam/0001-revert-disregard-current-state.patch deleted file mode 100644 index 339afbf41672..000000000000 --- a/package/libteam/0001-revert-disregard-current-state.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 61efd6de2fbb8ee077863ee5a355ac3dfd9365b9 Mon Sep 17 00:00:00 2001 -From: Xin Long -Date: Tue, 1 Sep 2020 13:59:27 +0800 -Subject: [PATCH] Revert "teamd: Disregard current state when considering port - enablement" - -This reverts commit deadb5b715227429a1879b187f5906b39151eca9. - -As Patrick noticed, with that commit, teamd_port_check_enable() -would set the team port to the new state unconditionally, which -triggers another change message from kernel to userspace, then -teamd_port_check_enable() is called again to set the team port -to the new state. - -This would go around and around to update the team port state, -and even cause teamd to consume 100% cpu. - -As the issue caused by that commit is serious, it has to be -reverted. As for the issued fixed by that commit, I would -propose a new fix later. - -Signed-off-by: Jiri Pirko ---- - teamd/teamd_per_port.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/teamd/teamd_per_port.c b/teamd/teamd_per_port.c -index 166da57..d429753 100644 ---- a/teamd/teamd_per_port.c -+++ b/teamd/teamd_per_port.c -@@ -442,14 +442,18 @@ int teamd_port_check_enable(struct teamd_context *ctx, - bool should_enable, bool should_disable) - { - bool new_enabled_state; -+ bool curr_enabled_state; - int err; - - if (!teamd_port_present(ctx, tdport)) - return 0; -+ err = teamd_port_enabled(ctx, tdport, &curr_enabled_state); -+ if (err) -+ return err; - -- if (should_enable) -+ if (!curr_enabled_state && should_enable) - new_enabled_state = true; -- else if (should_disable) -+ else if (curr_enabled_state && should_disable) - new_enabled_state = false; - else - return 0; diff --git a/package/libteam/0002-fix-build-on-openwrt-musl-libc.patch b/package/libteam/0002-fix-build-on-openwrt-musl-libc.patch deleted file mode 100644 index f2b38a137dd6..000000000000 --- a/package/libteam/0002-fix-build-on-openwrt-musl-libc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 267f24839536234ca621d4fd0466d3b57cb6dccd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pavel=20=C5=A0imerda?= -Date: Tue, 12 Jan 2021 04:41:56 +0100 -Subject: [PATCH] fix build on OpenWRT/musl-libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Pavel Šimerda -Signed-off-by: Jiri Pirko ---- - teamd/teamd_runner_lacp.c | 2 -- - utils/teamnl.c | 1 + - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c -index 9437f05..f524be2 100644 ---- a/teamd/teamd_runner_lacp.c -+++ b/teamd/teamd_runner_lacp.c -@@ -23,9 +23,7 @@ - #include - #include - #include --#include - #include --#include - #include - #include - #include -diff --git a/utils/teamnl.c b/utils/teamnl.c -index c53345d..ec2b435 100644 ---- a/utils/teamnl.c -+++ b/utils/teamnl.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/package/libteam/0003-increase-wait-time-for-daemon-kill.patch b/package/libteam/0003-increase-wait-time-for-daemon-kill.patch deleted file mode 100644 index 7827a654ef23..000000000000 --- a/package/libteam/0003-increase-wait-time-for-daemon-kill.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6875e6c8efb0fe86766b3d4f1d0db390af6998b7 Mon Sep 17 00:00:00 2001 -From: Hangbin Liu -Date: Tue, 15 Dec 2020 19:33:17 +0800 -Subject: [PATCH] teamd: increase the waitting time for daemon killing - -In the current code, we wait for at most 5s when kill the daemon pid. -But in some environment, it may need more time. Then the teamd -k will -failed and return error "Failed to kill daemon: Timer expired". - -Let's increase the value to have enough time. Here is the reuslt with -this patch: - -$ time libteam/teamd/teamd -k -t team0 - -real 0m10.442s -user 0m0.017s -sys 0m0.016s - -Signed-off-by: Hangbin Liu -Signed-off-by: Jiri Pirko ---- - teamd/teamd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/teamd/teamd.c b/teamd/teamd.c -index 9360cbf..b310140 100644 ---- a/teamd/teamd.c -+++ b/teamd/teamd.c -@@ -1858,7 +1858,7 @@ int main(int argc, char **argv) - break; - case DAEMON_CMD_KILL: - if (daemon_pid_file_is_running() > 0) { -- err = daemon_pid_file_kill_wait(SIGTERM, 5); -+ err = daemon_pid_file_kill_wait(SIGTERM, 30); - if (err) - teamd_log_warn("Failed to kill daemon: %s", - strerror(errno)); diff --git a/package/libteam/libteam.hash b/package/libteam/libteam.hash index 39d29425d311..da41c3979e37 100644 --- a/package/libteam/libteam.hash +++ b/package/libteam/libteam.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c69f7cf5a98203d66db10e67b396fe325b77a5a9491d1e07e8a07cba3ba841bb libteam-1.31.tar.gz +sha256 7ad90555db8aecdcaf002f543d330408501600edf7065e0ca398fce9b1e64820 libteam-1.32.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libteam/libteam.mk b/package/libteam/libteam.mk index 8bd83aa20daf..59eb4c50705c 100644 --- a/package/libteam/libteam.mk +++ b/package/libteam/libteam.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTEAM_VERSION = 1.31 +LIBTEAM_VERSION = 1.32 LIBTEAM_SITE = $(call github,jpirko,libteam,v$(LIBTEAM_VERSION)) LIBTEAM_LICENSE = LGPL-2.1+ LIBTEAM_LICENSE_FILES = COPYING @@ -18,6 +18,7 @@ define LIBTEAM_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NETDEVICES) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_TEAM) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_TEAM_MODE_ROUNDROBIN) endef $(eval $(autotools-package)) From e4572cc705b92f593e87095619b30f016ae507d9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Sep 2023 23:56:06 +0200 Subject: [PATCH 1923/2890] package/libjxl: security bump to version 0.8.2 Fix CVE-2023-35790: An issue was discovered in dec_patch_dictionary.cc in libjxl before 0.8.2. An integer underflow in patch decoding can lead to a denial of service, such as an infinite loop. https://github.com/libjxl/libjxl/releases/tag/v0.8.2 Signed-off-by: Fabrice Fontaine Reviewed-by: Julien Olivain Tested-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index 6b4c9d8d0a3d..c8f98d10ea96 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 libjxl-0.8.1.tar.gz +sha256 c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420 libjxl-0.8.2.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index f603327bf6d4..47c110eb5373 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.8.1 +LIBJXL_VERSION = 0.8.2 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS From c89d7a2dafcc8f622100d50f11e186e377cde7a8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Sep 2023 00:06:48 +0200 Subject: [PATCH 1924/2890] package/libqb: security bump to version 2.0.8 - Fix CVE-2023-39976: log_blackbox.c in libqb before 2.0.8 allows a buffer overflow via long log messages because the header size is not considered. - Drop patch (already in version) and so autoreconf https://github.com/ClusterLabs/libqb/compare/v2.0.6...v2.0.8 https://github.com/ClusterLabs/libqb/releases/tag/v2.0.7 https://github.com/ClusterLabs/libqb/releases/tag/v2.0.8 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - .../libqb/0001-Add-disable-tests-option.patch | 62 ------------------- package/libqb/libqb.hash | 4 +- package/libqb/libqb.mk | 4 +- 4 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 package/libqb/0001-Add-disable-tests-option.patch diff --git a/.checkpackageignore b/.checkpackageignore index 4769adf6cd6c..dfeaaf46ebfd 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -746,7 +746,6 @@ package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch Upstream package/libplatform/0001-cmake-require-c-11-as-the-minimum-standard.patch Upstream package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch Upstream package/libpthsem/0001-fix-build-on-linux-3.x-host.patch Upstream -package/libqb/0001-Add-disable-tests-option.patch Upstream package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch Upstream package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch Upstream package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch Upstream diff --git a/package/libqb/0001-Add-disable-tests-option.patch b/package/libqb/0001-Add-disable-tests-option.patch deleted file mode 100644 index 1afb05520d15..000000000000 --- a/package/libqb/0001-Add-disable-tests-option.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 051d9cfe8f365e30affc6476ed79b9e04a6b15ad Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 4 Nov 2022 00:27:50 +0100 -Subject: [PATCH] Add --disable-tests option - -Add --disable-tests to allow the user to disable tests. As a -side-effect, this will avoid the following build failure when check is -found: - -libstat_wrapper.c:11:10: fatal error: gnu/lib-names.h: No such file or directory - 11 | #include - | ^~~~~~~~~~~~~~~~~ - -This build failure is raised since version 2.0.5 and -https://github.com/ClusterLabs/libqb/commit/78df90b180740712d0c90b6d982b78241cc99d72 - -Fixes: - - http://autobuild.buildroot.org/results/450cfc36d4fd6dc71c138bec45f05b5a2d92a08d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/ClusterLabs/libqb/pull/475] ---- - Makefile.am | 6 +++++- - configure.ac | 5 +++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index a08b1d2..6a710a0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -39,7 +39,11 @@ ACLOCAL_AMFLAGS = -I m4 - - dist_doc_DATA = COPYING INSTALL README.markdown - --SUBDIRS = include lib doxygen2man docs tools tests examples -+SUBDIRS = include lib doxygen2man docs tools examples -+ -+if ENABLE_TESTS -+SUBDIRS += tests -+endif - - dist-clean-local: - rm -f .snapshot-version autoconf automake autoheader -diff --git a/configure.ac b/configure.ac -index ac44b7e..4946008 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -562,6 +562,11 @@ AC_ARG_WITH([force-sockets-config-file], - [ FORCESOCKETSFILE="$withval" ], - [ FORCESOCKETSFILE="$sysconfdir/libqb/force-filesystem-sockets" ]) - -+AC_ARG_ENABLE([tests], -+ [AS_HELP_STRING([--disable-tests],[disable tests])],, -+ [ enable_tests="yes" ]) -+AM_CONDITIONAL([ENABLE_TESTS], [test x$enable_tests = xyes]) -+ - AC_ARG_ENABLE([install-tests], - [AS_HELP_STRING([--enable-install-tests],[install tests])],, - [ enable_install_tests="no" ]) --- -2.35.1 - diff --git a/package/libqb/libqb.hash b/package/libqb/libqb.hash index de247c266053..f7006ff10e68 100644 --- a/package/libqb/libqb.hash +++ b/package/libqb/libqb.hash @@ -1,5 +1,5 @@ -# From https://github.com/ClusterLabs/libqb/releases/download/v2.0.6/libqb-2.0.6.sha256 -sha256 f1e744208e8f69934804c14e05d9707668f99d4867de9cccf2f7a6bf4d48331c libqb-2.0.6.tar.xz +# From https://github.com/ClusterLabs/libqb/releases/download/v2.0.8/libqb-2.0.8.sha256 +sha256 b42531fc20b8ac02f4c6d0a4dc49f7c4a1eef09bdb13af5f6927b7fc49522ee6 libqb-2.0.8.tar.xz # Locally calculated sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/package/libqb/libqb.mk b/package/libqb/libqb.mk index 65d68181ee8d..11b5788b455c 100644 --- a/package/libqb/libqb.mk +++ b/package/libqb/libqb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQB_VERSION = 2.0.6 +LIBQB_VERSION = 2.0.8 LIBQB_SOURCE = libqb-$(LIBQB_VERSION).tar.xz LIBQB_SITE = \ https://github.com/ClusterLabs/libqb/releases/download/v$(LIBQB_VERSION) @@ -12,8 +12,6 @@ LIBQB_LICENSE = LGPL-2.1+ LIBQB_LICENSE_FILES = COPYING LIBQB_CPE_ID_VENDOR = clusterlabs LIBQB_INSTALL_STAGING = YES -# We're patching configure.ac -LIBQB_AUTORECONF = YES LIBQB_CONF_OPTS = --disable-tests LIBQB_DEPENDENCIES = libxml2 From c88c1d3319dd24fa833455a2e7d96bc4585bab7f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Sep 2023 23:44:15 +0200 Subject: [PATCH 1925/2890] package/webp: security bump to version 1.3.2 - security fixes for lossless encoder (#603, chromium: #1420107, #1455619, CVE-2023-1999) - security fix for lossless decoder (chromium: #1479274, CVE-2023-4863) https://github.com/webmproject/libwebp/blob/v1.3.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/webp/webp.hash | 2 +- package/webp/webp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/webp/webp.hash b/package/webp/webp.hash index 969e4cd3d7b1..adc543059b62 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df libwebp-1.2.4.tar.gz +sha256 2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4 libwebp-1.3.2.tar.gz sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/package/webp/webp.mk b/package/webp/webp.mk index 38a1564a6373..33cb4bd50729 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 1.2.4 +WEBP_VERSION = 1.3.2 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause From 4ccfb2561f2a1e3ec874301e786f30d85307051d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Sep 2023 00:16:22 +0200 Subject: [PATCH 1926/2890] package/freerdp: security bump to version 2.11.0 - Fix CVE-2023-39350 to CVE-2023-39354, CVE-2023-39356, CVE-2023-40181, CVE-2023-40186, CVE-2023-40188, CVE-2023-40567, CVE-2023-40569 and CVE-2023-40589 - Drop fourth patch (already in version) https://github.com/FreeRDP/FreeRDP/releases/tag/2.11.0 https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-rrrv-3w42-pffh https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-q9x9-cqjc-rgwq https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-whwr-qcf2-2mvj https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-hg53-9j9h-3c8f https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-c3r2-pxxp-f8r6 https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-q5v5-qhj5-mh6m https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-mxp4-rx7x-h2g8 https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-hcj4-3c3r-5j3v https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-9w28-wwj5-p4xq https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-2w9f-8wg4-8jfp https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-hm8c-rcjg-c8qp https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-gc34-mw6m-g42x Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...e-sha3-and-shake-hashes-for-libressl.patch | 38 ------------------- package/freerdp/freerdp.hash | 4 +- package/freerdp/freerdp.mk | 2 +- 4 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch diff --git a/.checkpackageignore b/.checkpackageignore index dfeaaf46ebfd..73a00d610cd8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -446,7 +446,6 @@ package/freeradius-client/0001-fix-for-nettle.patch Upstream package/freerdp/0001-Fix-variable-declaration-in-loop.patch Upstream package/freerdp/0002-Fixed-variable-declaration-in-loop.patch Upstream package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch Upstream -package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch Upstream package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch Upstream package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch Upstream package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables diff --git a/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch deleted file mode 100644 index 14f615e2e734..000000000000 --- a/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bd093454fe126163634c00b7484ab7fee6ffe670 Mon Sep 17 00:00:00 2001 -From: akallabeth -Date: Mon, 20 Feb 2023 16:23:39 +0100 -Subject: [PATCH] Fix #8702: Disable sha3 and shake hashes for libressl - -[Retrieved (and backported) from: -https://github.com/FreeRDP/FreeRDP/pull/8708/commits/bd093454fe126163634c00b7484ab7fee6ffe670] -Signed-off-by: Fabrice Fontaine ---- - libfreerdp/crypto/x509_utils.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c -index 6e87a88b8d8..62cf2939be7 100644 ---- a/libfreerdp/crypto/crypto.c -+++ b/libfreerdp/crypto/crypto.c -@@ -748,7 +748,7 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) - return WINPR_MD_SHA512; - case NID_ripemd160: - return WINPR_MD_RIPEMD160; --#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) || defined(LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) && !defined(LIBRESSL_VERSION_NUMBER) - case NID_sha3_224: - return WINPR_MD_SHA3_224; - case NID_sha3_256: -@@ -757,11 +757,11 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) - return WINPR_MD_SHA3_384; - case NID_sha3_512: - return WINPR_MD_SHA3_512; --#endif - case NID_shake128: - return WINPR_MD_SHAKE128; - case NID_shake256: - return WINPR_MD_SHAKE256; -+#endif - case NID_undef: - default: - return WINPR_MD_NONE; diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 55314cfdd3b7..02268f55eaac 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.10.0.tar.gz.sha256 -sha256 a673d3fc21911dd9f196834f2f3a23c3ebc7e5e4deab2f7686fcec879279e2c1 freerdp-2.10.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.0.tar.gz.sha256 +sha256 8d08e638df21e67c3761462b4efb9e596576f58bd6886f902e6021cdd17d396e freerdp-2.11.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 01c511819d38..6f71ef796fba 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.10.0 +FREERDP_VERSION = 2.11.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From bdab457768b336a442897137c4f62d4e387b3d10 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Sep 2023 23:58:59 +0200 Subject: [PATCH 1927/2890] package/mdadm: add MDADM_CPE_ID_VENDOR cpe:2.3:a:mdadm_project:mdadm is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/A4FAEC6A-3572-48E9-ABB8-C96D8C8B91AF Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/mdadm/mdadm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index c61937306af2..ef518cd23876 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -9,6 +9,7 @@ MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING +MDADM_CPE_ID_VENDOR = mdadm_project MDADM_CXFLAGS = $(TARGET_CFLAGS) From 0612504c4301b3aed4757d9358dd5b5cf09ef1cf Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sat, 16 Sep 2023 11:22:05 +0200 Subject: [PATCH 1928/2890] board/orangepi-zero-plus: update link in readme Old link is no longer working, so use new link instead. Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- board/orangepi/orangepi-zero-plus/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-zero-plus/readme.txt b/board/orangepi/orangepi-zero-plus/readme.txt index 5556eae8907b..1e60e0f825ba 100644 --- a/board/orangepi/orangepi-zero-plus/readme.txt +++ b/board/orangepi/orangepi-zero-plus/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Zero Plus. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi Zero Plus link: -http://www.orangepi.org/OrangePiZeroPlus/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-Plus.html This configuration uses U-Boot mainline and kernel mainline. From 9ca60c004d69e1f38000e3a74151b0a90aca7f21 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Sat, 16 Sep 2023 09:18:30 +0000 Subject: [PATCH 1929/2890] package/multipath-tools: bump version to 0.9.6 Signed-off-by: Alexander Egorenkov [yann.morin.1998@free.fr: split long _DEPENDENCIES line] Signed-off-by: Yann E. MORIN --- package/multipath-tools/Config.in | 3 +++ package/multipath-tools/multipath-tools.hash | 2 +- package/multipath-tools/multipath-tools.mk | 13 +++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/package/multipath-tools/Config.in b/package/multipath-tools/Config.in index 222f78b86ce6..4c648a6abb34 100644 --- a/package/multipath-tools/Config.in +++ b/package/multipath-tools/Config.in @@ -18,6 +18,9 @@ config BR2_PACKAGE_MULTIPATH_TOOLS select BR2_PACKAGE_LVM2 select BR2_PACKAGE_LVM2_STANDARD_INSTALL select BR2_PACKAGE_READLINE + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBS + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT help This package provides the following binaries to drive the Device Mapper multipathing driver: diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index ecaad05e25ad..158f0faa960e 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 6ed3cf6e786da20a451d9747cbd4c5817815388b8fc8022d1074b3018479031d multipath-tools-0.9.4.tar.gz +sha256 401c6f6e8dc5d3feaaee76280716aee718579ac024ce4f2fae77c798dc7a0f9f multipath-tools-0.9.6.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 23b3cc944267..7071e1fd1b33 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.9.4 +MULTIPATH_TOOLS_VERSION = 0.9.6 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ @@ -20,7 +20,16 @@ MULTIPATH_TOOLS_LICENSE_FILES = \ README.md MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc -MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf +MULTIPATH_TOOLS_DEPENDENCIES = \ + host-pkgconf \ + json-c \ + liburcu \ + libaio \ + lvm2 \ + readline \ + udev \ + util-linux-libs + MULTIPATH_TOOLS_MAKE_OPTS = \ kernel_incdir=$(STAGING_DIR)/usr/include \ LIB="lib" \ From decd3c7801b294a025437c602fc37e4d5301ae5f Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Sat, 16 Sep 2023 09:18:31 +0000 Subject: [PATCH 1930/2890] package/makedumpfile: bump version to 1.7.3 Signed-off-by: Alexander Egorenkov Signed-off-by: Yann E. MORIN --- package/makedumpfile/makedumpfile.hash | 2 +- package/makedumpfile/makedumpfile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/makedumpfile/makedumpfile.hash b/package/makedumpfile/makedumpfile.hash index f38d93c04aa4..665023d87be5 100644 --- a/package/makedumpfile/makedumpfile.hash +++ b/package/makedumpfile/makedumpfile.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 748583ea4c0b32346008aa53b313e9708f60a8481959c25c76e5c94740032d9b makedumpfile-1.7.2.tar.gz +sha256 f059dbebf5156a9ab97cd3c1f41ad5df3436c7ab4dd6dbffa234fc4e93cfa2ce makedumpfile-1.7.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/makedumpfile/makedumpfile.mk b/package/makedumpfile/makedumpfile.mk index 8dc60b043e21..6102c92bd8bb 100644 --- a/package/makedumpfile/makedumpfile.mk +++ b/package/makedumpfile/makedumpfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAKEDUMPFILE_VERSION = 1.7.2 +MAKEDUMPFILE_VERSION = 1.7.3 MAKEDUMPFILE_SITE = https://github.com/makedumpfile/makedumpfile/releases/download/$(MAKEDUMPFILE_VERSION) MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib MAKEDUMPFILE_LICENSE = GPL-2.0 From 0eb397d30e5951e1c49faefb247b0ea98d99eb3e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Sep 2023 12:14:13 +0200 Subject: [PATCH 1931/2890] package/openssh: bump to version 9.4p1 https://www.openssh.com/txt/release-9.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/openssh/openssh.hash | 4 ++-- package/openssh/openssh.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index df472e087dfe..4060b95e9bf8 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-9.3p2 -sha256 200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8 openssh-9.3p2.tar.gz +# From https://www.openssh.com/txt/release-9.4p1 +sha256 3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85 openssh-9.4p1.tar.gz # Locally calculated sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index a2c3f1612952..358ef42b6ecb 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 9.3 -OPENSSH_VERSION_MINOR = p2 +OPENSSH_VERSION_MAJOR = 9.4 +OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) From 42f25180233df459cd2bfbc5b9ebf8b95c6b60cb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Sep 2023 12:40:40 +0200 Subject: [PATCH 1932/2890] package/stress-ng: link with -latomic when needed Fix the following build failure raised since at least bump to version 0.15.04 in commit 00553ea186357fd3e2b3c89fa560e9711cc67472: Fixes: - http://autobuild.buildroot.org/results/127ed4c110d99c6453a01ce221f628d40e566dc1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/stress-ng/stress-ng.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 0f204bcf797f..a7b57459f170 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -20,6 +20,10 @@ ifeq ($(BR2_PACKAGE_KEYUTILS),y) STRESS_NG_DEPENDENCIES += keyutils endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +STRESS_NG_MAKE_FLAGS += LDFLAGS_EXTRA=-latomic +endif + define STRESS_NG_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(STRESS_NG_MAKE_FLAGS) endef From 971f8adc96b44de9490599168d69b44e726c6480 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sat, 16 Sep 2023 09:02:59 +0200 Subject: [PATCH 1933/2890] package/python-pluggy: bump to version 1.3.0 Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-pluggy/python-pluggy.hash | 4 ++-- package/python-pluggy/python-pluggy.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pluggy/python-pluggy.hash b/package/python-pluggy/python-pluggy.hash index 39f172a82b62..74790a51a047 100644 --- a/package/python-pluggy/python-pluggy.hash +++ b/package/python-pluggy/python-pluggy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pluggy/json -md5 daa6fddfb6cd364f3c82e52098911e4b pluggy-1.0.0.tar.gz -sha256 4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 pluggy-1.0.0.tar.gz +md5 f31aad77be2f5af8ed3864159b7fd743 pluggy-1.3.0.tar.gz +sha256 cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 pluggy-1.3.0.tar.gz # Locally computed sha256 checksums sha256 d6b65e6c213a5d0b577911d34d6e5949b9f59d76c238c5071a2f3fc16cfb2606 LICENSE diff --git a/package/python-pluggy/python-pluggy.mk b/package/python-pluggy/python-pluggy.mk index 6dc6f970eabc..2b7ac04f02e0 100644 --- a/package/python-pluggy/python-pluggy.mk +++ b/package/python-pluggy/python-pluggy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PLUGGY_VERSION = 1.0.0 +PYTHON_PLUGGY_VERSION = 1.3.0 PYTHON_PLUGGY_SOURCE = pluggy-$(PYTHON_PLUGGY_VERSION).tar.gz -PYTHON_PLUGGY_SITE = https://files.pythonhosted.org/packages/a1/16/db2d7de3474b6e37cbb9c008965ee63835bba517e22cdb8c35b5116b5ce1 +PYTHON_PLUGGY_SITE = https://files.pythonhosted.org/packages/36/51/04defc761583568cae5fd533abda3d40164cbdcf22dee5b7126ffef68a40 PYTHON_PLUGGY_SETUP_TYPE = setuptools PYTHON_PLUGGY_LICENSE = MIT PYTHON_PLUGGY_LICENSE_FILES = LICENSE From 0dc1213565e76d9c68986489ada3c06b928089d5 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sat, 16 Sep 2023 09:01:47 +0200 Subject: [PATCH 1934/2890] package/python-pytest: fix dependency on zlib tests.package.test_python_pytest.TestPythonPy3Pytest runtime tests fails now with following error: ====================================================================== FAIL: test_run (tests.package.test_python_pytest.TestPythonPy3Pytest.test_run) ---------------------------------------------------------------------- Traceback (most recent call last): File "/buildroot/support/testing/tests/package/test_python.py", line 137, in test_run self.run_sample_scripts() File "/buildroot/support/testing/tests/package/test_python_pytest.py", line 18, in run_sample_scripts self.assertRunOk(cmd, timeout=self.timeout) File "/buildroot/support/testing/infra/basetest.py", line 89, in assertRunOk self.assertEqual( AssertionError: 1 != 0 : Failed to run: python -m pytest sample_python_pytest.py output was: Traceback (most recent call last): File "", line 189, in _run_module_as_main File "", line 148, in _get_module_details File "", line 112, in _get_module_details File "/usr/lib/python3.11/site-packages/pytest/__init__.py", line 5, in File "/usr/lib/python3.11/site-packages/_pytest/_code/__init__.py", line 2, in File "/usr/lib/python3.11/site-packages/_pytest/_code/code.py", line 36, in File "/usr/lib/python3.11/site-packages/pluggy/__init__.py", line 16, in File "/usr/lib/python3.11/site-packages/pluggy/_manager.py", line 10, in File "/usr/lib/python3.11/importlib/metadata/__init__.py", line 8, in File "/usr/lib/python3.11/zipfile.py", line 6, in ImportError: libz.so.1: cannot open shared object file: No such file or directory Fix that by adding BR2_PACKAGE_PYTHON3_ZLIB dependency. Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-pytest/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in index 9bbc9ea2d2c5..c8f9a6eb5b8f 100644 --- a/package/python-pytest/Config.in +++ b/package/python-pytest/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_PYTHON_PYTEST select BR2_PACKAGE_PYTHON_PLUGGY # runtime select BR2_PACKAGE_PYTHON_PY # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help pytest is a framework that makes building simple and scalable tests easy. Tests are expressive and readable—no boilerplate From b5f782ebdd6512b5f76f6e956ae4d3f2710200e0 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sat, 16 Sep 2023 09:01:48 +0200 Subject: [PATCH 1935/2890] package/python-pytest: bump to version 7.4.2 Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-pytest/python-pytest.hash | 4 ++-- package/python-pytest/python-pytest.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytest/python-pytest.hash b/package/python-pytest/python-pytest.hash index c648a85c04ef..7f79b94d8d57 100644 --- a/package/python-pytest/python-pytest.hash +++ b/package/python-pytest/python-pytest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest/json -md5 67e2aa27bb98e5af13b45a1b2e67b144 pytest-7.3.2.tar.gz -sha256 ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b pytest-7.3.2.tar.gz +md5 8620558e8971b11207b2d6b083906cf9 pytest-7.4.2.tar.gz +sha256 a766259cfab564a2ad52cb1aae1b881a75c3eb7e34ca3779697c23ed47c47069 pytest-7.4.2.tar.gz # Locally computer sha256 sha256 ca836a5f9ecca3b2f350230faa20a48fb8b145653b5568d784862df864706b9b LICENSE diff --git a/package/python-pytest/python-pytest.mk b/package/python-pytest/python-pytest.mk index 27277163d238..326d951a32d8 100644 --- a/package/python-pytest/python-pytest.mk +++ b/package/python-pytest/python-pytest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_VERSION = 7.3.2 +PYTHON_PYTEST_VERSION = 7.4.2 PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/58/2a/07c65fdc40846ecb8a9dcda2c38fcb5a06a3e39d08d4a4960916431951cb +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/e5/d0/18209bb95db8ee693a9a04fe056ab0663c6d6b1baf67dd50819dd9cd4bd7 PYTHON_PYTEST_SETUP_TYPE = setuptools PYTHON_PYTEST_LICENSE = MIT PYTHON_PYTEST_LICENSE_FILES = LICENSE From 13d1ce72debcfe0fbe66f3379638799d4d14e7bf Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sat, 16 Sep 2023 09:01:49 +0200 Subject: [PATCH 1936/2890] package/python-pytest-asyncio: bump to version 0.21.1 Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-pytest-asyncio/python-pytest-asyncio.hash | 4 ++-- package/python-pytest-asyncio/python-pytest-asyncio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash index 6198a4660852..f6cc1d2413b9 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.hash +++ b/package/python-pytest-asyncio/python-pytest-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json -md5 805da62a533c75a9bccadee485f98c27 pytest-asyncio-0.21.0.tar.gz -sha256 2b38a496aef56f56b0e87557ec313e11e1ab9276fc3863f6a7be0f1d0e415e1b pytest-asyncio-0.21.0.tar.gz +md5 1d10f607444a375c1425a2a90960006e pytest-asyncio-0.21.1.tar.gz +sha256 40a7eae6dded22c7b604986855ea48400ab15b069ae38116e8c01238e9eeb64d pytest-asyncio-0.21.1.tar.gz # Locally computed sha256 checksums sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk index 6bf7e3357732..5c5efd819c29 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.mk +++ b/package/python-pytest-asyncio/python-pytest-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_ASYNCIO_VERSION = 0.21.0 +PYTHON_PYTEST_ASYNCIO_VERSION = 0.21.1 PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/85/c7/9db0c6215f12f26b590c24acc96d048e03989315f198454540dff95109cd +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/5a/85/d39ef5f69d5597a206f213ce387bcdfa47922423875829f7a98a87d33281 PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE From d3bed8861356a8c1ac3167746b736b9f17840512 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sat, 16 Sep 2023 09:01:11 +0200 Subject: [PATCH 1937/2890] configs/orangepi_zero_plus: bump ATF/U-Boot/Linux Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- configs/orangepi_zero_plus_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig index 26a25bd9f89b..c564d8a34254 100644 --- a/configs/orangepi_zero_plus_defconfig +++ b/configs/orangepi_zero_plus_defconfig @@ -9,7 +9,7 @@ BR2_SYSTEM_DHCP="eth0" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -17,7 +17,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07.02" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -31,7 +31,7 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.53" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus" From 37fd844c951f01c95a731844213ba1ef02b8e402 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sat, 16 Sep 2023 06:37:57 +0200 Subject: [PATCH 1938/2890] package/dt-utils: bump to version 2023.08.0 COPYING is now a symlink pointing to LICENSES/GPL-2.0-only.txt. More license files were added and all source code files were updated with proper license being used. See [1-4]. List all licenses used in runtime by produced binary (and omit GPL-3.0-or-later for check-news.sh script). [1] https://git.pengutronix.de/cgit/tools/dt-utils/commit/?id=893c6c9f628fed614537fd548b7a851d2d9ee868 [2] https://git.pengutronix.de/cgit/tools/dt-utils/commit/?id=c1880166d1e34efcf606297c8189b228aa78f78a [3] https://git.pengutronix.de/cgit/tools/dt-utils/commit/?id=fa56be74c3bd991a40384e9be4a485f3febea19e [4] https://git.pengutronix.de/cgit/tools/dt-utils/commit/?id=6c7ccb22ea30ee28d42679a7ba66c0199f135db1 Signed-off-by: Marcin Niestroj [yann.morin.1998@free.fr: - _LICENSE is space-comma separated - multi-line assignment for license files ] Signed-off-by: Yann E. MORIN --- package/dt-utils/dt-utils.hash | 7 +++++-- package/dt-utils/dt-utils.mk | 11 ++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash index 9fca594db52b..c57145b835b0 100644 --- a/package/dt-utils/dt-utils.hash +++ b/package/dt-utils/dt-utils.hash @@ -1,3 +1,6 @@ # Locally computed -sha256 63cf47c70911bb3605bafac38a5a7e19eb753ac1c90de2abceaf2fdefd71be6d dt-utils-2021.03.0.tar.xz -sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING +sha256 a6988b889418737324ed3db3785d3a9692e802c1dff4a2323c962008b7b646b1 dt-utils-2023.08.0.tar.xz +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENSES/CC0-1.0.txt +sha256 2c9d733cadb50e33cc83f05f1fe7cc4b6c5ff7260fd9eea1b839151c7fa64742 LICENSES/GPL-2.0-only.txt +sha256 d6e37cb7eff6ef15ae3c4082cf40eae80a94cd59b636991d1149d4a5c9dc3537 LICENSES/GPL-2.0-or-later.txt +sha256 aa8c4e84680f7653d9a6f9f92b692239e5aa839a48dcdbce6108a3bbde451e30 LICENSES/Zlib.txt diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk index d264e2cdc9c2..198b36d5fe35 100644 --- a/package/dt-utils/dt-utils.mk +++ b/package/dt-utils/dt-utils.mk @@ -4,11 +4,16 @@ # ################################################################################ -DT_UTILS_VERSION = 2021.03.0 +DT_UTILS_VERSION = 2023.08.0 DT_UTILS_SOURCE = dt-utils-$(DT_UTILS_VERSION).tar.xz DT_UTILS_SITE = https://git.pengutronix.de/cgit/tools/dt-utils/snapshot -DT_UTILS_LICENSE = GPL-2.0 -DT_UTILS_LICENSE_FILES = COPYING +DT_UTILS_LICENSE = CC0-1.0, GPL-2.0, GPL-2.0+, Zlib +DT_UTILS_LICENSE_FILES = \ + LICENSES/CC0-1.0.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-2.0-or-later.txt \ + LICENSES/Zlib.txt + DT_UTILS_DEPENDENCIES = udev DT_UTILS_AUTORECONF = YES From 0334e49a57484c790fabe8c811d8885008aa0597 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sat, 16 Sep 2023 06:56:20 +0200 Subject: [PATCH 1939/2890] package/python-bleak: bump to version 0.21.1 Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-bleak/python-bleak.hash | 4 ++-- package/python-bleak/python-bleak.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bleak/python-bleak.hash b/package/python-bleak/python-bleak.hash index aae230dac246..8462e19d39bc 100644 --- a/package/python-bleak/python-bleak.hash +++ b/package/python-bleak/python-bleak.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bleak/json -md5 97e2987748f1def21e1910a258027c17 bleak-0.20.2.tar.gz -sha256 6c92a47abe34e6dea8ffc5cea9457cbff6e1be966854839dbc25cddb36b79ee4 bleak-0.20.2.tar.gz +md5 5e27e052efc45b64da1a1f017610c561 bleak-0.21.1.tar.gz +sha256 ec4a1a2772fb315b992cbaa1153070c7e26968a52b0e2727035f443a1af5c18f bleak-0.21.1.tar.gz # Locally computed sha256 checksums sha256 c4029a2b63b3824ab68be841f414addbdde20cb79cdbe272fa80c0b2abe65374 LICENSE diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index 9532774ae809..ed3c3f2f933a 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLEAK_VERSION = 0.20.2 +PYTHON_BLEAK_VERSION = 0.21.1 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz -PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/87/95/a6f614fae12a6fe1cf517f8600004dd6abd4af0e0e1177c03164d0637e81 +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/6a/c0/3aca655fa43b8ff5340d99fac4e67061f53f42f092fc847bdd0559d67846 PYTHON_BLEAK_SETUP_TYPE = setuptools PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE From 91984c9ca7dfdf7dcb2e8b93181ade25eb7583a7 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sat, 16 Sep 2023 07:00:21 +0200 Subject: [PATCH 1940/2890] package/python-dbus-fast: bump to version 2.7.0 Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-dbus-fast/python-dbus-fast.hash | 4 ++-- package/python-dbus-fast/python-dbus-fast.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dbus-fast/python-dbus-fast.hash b/package/python-dbus-fast/python-dbus-fast.hash index dce258c0f9fa..83382bfb29c1 100644 --- a/package/python-dbus-fast/python-dbus-fast.hash +++ b/package/python-dbus-fast/python-dbus-fast.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dbus-fast/json -md5 1fc61ba29ed79162c651be4bae4a9dee dbus_fast-1.86.0.tar.gz -sha256 ca376a360f1bc2c3d59e9edfb5e4de5be389cca37e8c92f4539176ddf755341e dbus_fast-1.86.0.tar.gz +md5 810a5b08cc14e269207efa9cb651e86b dbus_fast-2.7.0.tar.gz +sha256 9110c689fea4869647ebad3cd80317554c9f77e3825eed2e36f4cb9aec749761 dbus_fast-2.7.0.tar.gz # Locally computed sha256 checksums sha256 c37e9c75110e01d1f0c5360dc7d7776a30ac5f70d2440db214423e4b7a77a6af LICENSE diff --git a/package/python-dbus-fast/python-dbus-fast.mk b/package/python-dbus-fast/python-dbus-fast.mk index 1456d5600def..737406c9ab89 100644 --- a/package/python-dbus-fast/python-dbus-fast.mk +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DBUS_FAST_VERSION = 1.86.0 +PYTHON_DBUS_FAST_VERSION = 2.7.0 PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz -PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/08/9d/ad27f451198724d6e5b4f0435a13f2b2f839716bbcdede2ccf6d99743ec5 +PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/e5/ba/beeaf36821f0164a208e8cbe9adbdc75ce0a6eafdebd4011912a806a4275 PYTHON_DBUS_FAST_SETUP_TYPE = setuptools PYTHON_DBUS_FAST_LICENSE = MIT PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE From f9cd15446744c45cf35792d4560e1c1da448502b Mon Sep 17 00:00:00 2001 From: Yanghao Cheng Date: Fri, 15 Sep 2023 15:27:10 -0700 Subject: [PATCH 1941/2890] package/xserver_xorg-server: fix init script conflicts xdm package also installs a init script that utimately starts X server Signed-off-by: Yanghao Cheng [yann.morin.1998@free.fr: - don't use $(or ...) - slightly reword comment ] Signed-off-by: Yann E. MORIN --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 593bbd427681..e520cefee728 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -181,8 +181,9 @@ define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/xorg.service endef -# init script conflicts with S90nodm -ifneq ($(BR2_PACKAGE_NODM),y) +# Install the init script only when neither nodm nor xdm are enabled, as +# they would be responsible for starting the server. +ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),) define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \ $(TARGET_DIR)/etc/init.d/S40xorg From 6898ca03a25c4577c1848d6217c7d7a99354c031 Mon Sep 17 00:00:00 2001 From: Yanghao Cheng Date: Fri, 15 Sep 2023 15:27:11 -0700 Subject: [PATCH 1942/2890] package/xserver_xorg-server: add condition in xserver_xorg-server.mk Does not install systemd unit if nodm or xdm is enabled. Signed-off-by: Yanghao Cheng [yann.morin.1998@free.fr: - don't use $(or ...) - slightly reword comment ] Signed-off-by: Yann E. MORIN --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index e520cefee728..ede03d024c80 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -176,10 +176,14 @@ XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1 XSERVER_XORG_SERVER_DEPENDENCIES += libsha1 endif +# Install the systemd unit only when nodm nor xdm aren't enabled, as +# they would be responsible for starting the server. +ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),) define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/x11r7/xserver_xorg-server/xorg.service \ $(TARGET_DIR)/usr/lib/systemd/system/xorg.service endef +endif # Install the init script only when neither nodm nor xdm are enabled, as # they would be responsible for starting the server. From 8144dd1b4cca2d5c89e329b0497f49f512c9caed Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Sep 2023 14:51:32 +0200 Subject: [PATCH 1943/2890] package/conmon: fix libseccomp shared build Drop patch and disable libseccomp when building statically to avoid the following build failure raised since commit 29834d8a12d984e8efe05398c5aaa6a61f7880e0: src/seccomp_notify.c: In function 'seccomp_notify_plugins_load': src/seccomp_notify.c:136:42: warning: implicit declaration of function 'dlopen'; did you mean 'popen'? [-Wimplicit-function-declaration] 136 | ctx->plugins[s].handle = dlopen(it, RTLD_NOW); | ^~~~~~ | popen src/seccomp_notify.c:136:53: error: 'RTLD_NOW' undeclared (first use in this function) 136 | ctx->plugins[s].handle = dlopen(it, RTLD_NOW); | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/13d3b46990720bba8621c922b5dce54ab650e96d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...01-remove-unused-dlfcn.h-header-file.patch | 26 ------------------- package/conmon/conmon.mk | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 package/conmon/0001-remove-unused-dlfcn.h-header-file.patch diff --git a/package/conmon/0001-remove-unused-dlfcn.h-header-file.patch b/package/conmon/0001-remove-unused-dlfcn.h-header-file.patch deleted file mode 100644 index 14f817942e40..000000000000 --- a/package/conmon/0001-remove-unused-dlfcn.h-header-file.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e28634a0e847a14c58482f962bc9b1d69937387f Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Sat, 12 Aug 2023 12:53:37 +0200 -Subject: [PATCH] remove unused dlfcn.h header file - -Signed-off-by: Waldemar Brodkorb -Upstream: https://github.com/containers/conmon/issues/443 ---- - src/seccomp_notify.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/seccomp_notify.c b/src/seccomp_notify.c -index 8d34d9d..2a8371d 100644 ---- a/src/seccomp_notify.c -+++ b/src/seccomp_notify.c -@@ -7,7 +7,6 @@ - - #include - #include --#include - #include - #include - #include --- -2.39.2 - diff --git a/package/conmon/conmon.mk b/package/conmon/conmon.mk index 29deb2af4738..50807f8c6a94 100644 --- a/package/conmon/conmon.mk +++ b/package/conmon/conmon.mk @@ -11,7 +11,7 @@ CONMON_LICENSE_FILES = LICENSE CONMON_DEPENDENCIES = host-pkgconf libglib2 -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +ifeq ($(BR2_PACKAGE_LIBSECCOMP):$(BR2_STATIC_LIBS),y:) CONMON_DISABLE_SECCOMP = 0 CONMON_DEPENDENCIES += libseccomp else From 528197f5e319d62c2abe2319178fc8cf527bde3c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 16 Sep 2023 14:21:06 +0200 Subject: [PATCH 1944/2890] package/libarchive: bump version to 3.7.2 Signed-off-by: Waldemar Brodkorb Signed-off-by: Yann E. MORIN --- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index 02f7d8424613..818113585ebc 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 b17403ce670ff18d8e06fea05a9ea9accf70678c88f1b9392a2e29b51127895f libarchive-3.7.1.tar.xz +sha256 04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb libarchive-3.7.2.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 5bcf559a6e5d..2db36156b816 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.7.1 +LIBARCHIVE_VERSION = 3.7.2 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From 9584c8073a3b0d7453683d32bfafa0eb2c856a64 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sat, 16 Sep 2023 16:04:33 +0200 Subject: [PATCH 1945/2890] board/orangepi*: update links in readme files Old links are no longer working, so use new links instead. Signed-off-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- board/orangepi/orangepi-lite2/readme.txt | 2 +- board/orangepi/orangepi-one-plus/readme.txt | 2 +- board/orangepi/orangepi-zero-plus2/readme.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/orangepi/orangepi-lite2/readme.txt b/board/orangepi/orangepi-lite2/readme.txt index bed561b5620d..7f88250418e0 100644 --- a/board/orangepi/orangepi-lite2/readme.txt +++ b/board/orangepi/orangepi-lite2/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Lite2. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi Lite2 link: -http://www.orangepi.org/Orange%20Pi%20Lite%202/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Lite-2.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Lite2 diff --git a/board/orangepi/orangepi-one-plus/readme.txt b/board/orangepi/orangepi-one-plus/readme.txt index 87f6de851007..547f87428807 100644 --- a/board/orangepi/orangepi-one-plus/readme.txt +++ b/board/orangepi/orangepi-one-plus/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi One Plus. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi One Plus link: -http://www.orangepi.org/OrangePiOneplus/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-One-Plus.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+One+Plus diff --git a/board/orangepi/orangepi-zero-plus2/readme.txt b/board/orangepi/orangepi-zero-plus2/readme.txt index 322ba0e12ae4..2df6dd9b112a 100644 --- a/board/orangepi/orangepi-zero-plus2/readme.txt +++ b/board/orangepi/orangepi-zero-plus2/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Zero Plus2. With the current configuratio it will bring-up the board, and allow access through the serial console. Orangepi Zero Plus2 link: -http://www.orangepi.org/OrangePiZeroPlus2/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-Plus-2.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Zero+Plus2 From e2deaf046726c3ad37a7289a871f6d0c7f6d07e3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Sep 2023 23:53:01 +0200 Subject: [PATCH 1946/2890] package/mutt: security bump to version 2.2.12 Mutt 2.2.12 was released on September 9, 2023. This is a bug-fix release, fixing two crash bugs. One is possible by viewing a crafted message header, so upgrading is strongly recommended. Fix CVE-2023-4874: Null pointer dereference when viewing a specially crafted email in Mutt >1.5.2 <2.2.12 Fix CVE-2023-4875: Null pointer dereference when composing from a specially crafted draft message in Mutt >1.5.2 <2.2.12 http://www.mutt.org/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index 78bce765850d..8c4aae3c1c9e 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12325cf66d5ff8ac4bd87fac8db52c869de52dd278fc301cfd57d5a1f9f465cc mutt-2.2.11.tar.gz +sha256 043af312f64b8e56f7fd0bf77f84a205d4c498030bd9586457665c47bb18ce38 mutt-2.2.12.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index c5e4e4a14e9b..09f547a0913e 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.2.11 +MUTT_VERSION = 2.2.12 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From 9165262aa0486d9cf9bb1b8a2065e2616439c513 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Sep 2023 00:02:53 +0200 Subject: [PATCH 1947/2890] package/vim: security bump to version 9.0.1903 - Fix CVE-2023-2426, CVE-2023-2609, CVE-2023-2610, CVE-2023-4733, CVE-2023-4734, CVE-2023-4735, CVE-2023-4736, CVE-2023-4738, CVE-2023-4750, CVE-2023-4752 and CVE-2023-4781 - Update hash of license file and readme (maintainers updated with https://github.com/vim/vim/commit/e978b4534a5e10471108259118c0ef791106fd92 https://github.com/vim/vim/commit/1688938dd5ac78ab67e54299b9d5b93499dba762) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 6 +++--- package/vim/vim.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 26bc913b8a27..024c014bc9eb 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 c2bddf283a19c8714d7b21716e0a6a3214f9edb60b080f233cce4143fe228ff3 vim-9.0.1414.tar.gz -sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE -sha256 d187aff219161f37138479257f82d687ea10b2cdd17d58b53a3ec9b79d6dc870 README.txt +sha256 ba769f8513f2f75d71518f817f945809a5cb1310fd58cd86daca96e658cccf7d vim-9.0.1903.tar.gz +sha256 0b3f1f330cb1b179bb17c7c687d4cec601e0aa3462bc7f890ad4c3888d37d720 LICENSE +sha256 b475d5d3f8c855dc1a84813bbe45c44054d7f7aee20c800950bf89d5958873de README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index bb6d4a8d277f..b8b50cb91a47 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.1414 +VIM_VERSION = 9.0.1903 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From 4e365d1768b9f1b47634ea4ff46481df32299054 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 16 Sep 2023 19:48:38 +0200 Subject: [PATCH 1948/2890] package/tcl: bump to version 8.6.13 For release note, see: https://sourceforge.net/projects/tcl/files/Tcl/8.6.13/tcltk-release-notes-8.6.13.txt Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/tcl/tcl.hash | 2 +- package/tcl/tcl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tcl/tcl.hash b/package/tcl/tcl.hash index 2b82a1938b6d..109ea3d79c9b 100644 --- a/package/tcl/tcl.hash +++ b/package/tcl/tcl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 26c995dd0f167e48b11961d891ee555f680c175f7173ff8cb829f4ebcde4c1a6 tcl8.6.12-src.tar.gz +sha256 43a1fae7412f61ff11de2cfd05d28cfc3a73762f354a417c62370a54e2caf066 tcl8.6.13-src.tar.gz sha256 c0a69a2bfd757361ec7e6143973b103c90409316b49e9c88db26ad6388e79f16 license.terms diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 97754b63d02b..843d58a4ae27 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -5,7 +5,7 @@ ################################################################################ TCL_VERSION_MAJOR = 8.6 -TCL_VERSION = $(TCL_VERSION_MAJOR).12 +TCL_VERSION = $(TCL_VERSION_MAJOR).13 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION) TCL_LICENSE = TCL From 7a52ee04a5b10477eff6167ea2746529df9f0b69 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 16 Sep 2023 22:47:46 +0200 Subject: [PATCH 1949/2890] package/tk: bump to version 8.6.13 For release note, see: https://sourceforge.net/projects/tcl/files/Tcl/8.6.13/tcltk-release-notes-8.6.13.txt Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/tk/tk.hash | 2 +- package/tk/tk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tk/tk.hash b/package/tk/tk.hash index acf5e451571c..968b351b41df 100644 --- a/package/tk/tk.hash +++ b/package/tk/tk.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12395c1f3fcb6bed2938689f797ea3cdf41ed5cb6c4766eec8ac949560310630 tk8.6.12-src.tar.gz +sha256 2e65fa069a23365440a3c56c556b8673b5e32a283800d8d9b257e3f584ce0675 tk8.6.13-src.tar.gz sha256 2cde822b93ca16ae535c954b7dfe658b4ad10df2a193628d1b358f1765e8b198 license.terms diff --git a/package/tk/tk.mk b/package/tk/tk.mk index 830b241f74da..dfa7a7c694cd 100644 --- a/package/tk/tk.mk +++ b/package/tk/tk.mk @@ -5,7 +5,7 @@ ################################################################################ TK_VERSION_MAJOR = 8.6 -TK_VERSION = $(TK_VERSION_MAJOR).12 +TK_VERSION = $(TK_VERSION_MAJOR).13 TK_SOURCE = tk$(TK_VERSION)-src.tar.gz TK_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TK_VERSION) TK_LICENSE = TCL From 094c76a2bcd301e4aa1e27c9694314079440ce5b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Sep 2023 23:17:14 +0200 Subject: [PATCH 1950/2890] package/fstrcmp: fix musl static build Fix the following musl static build failure raised because host libtool is not patched to manage "-static" as "-all-static". /home/buildroot/autobuild/instance-2/output-1/host/bin/libtool --mode=link --tag=CC /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-buildroot-linux-musleabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -Wall -Wextra -Wshadow -o bin/test_user \ test_user/main.lo lib/libfstrcmp.la -static chmod a+rx bin/test_prelude libtool: link: /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-buildroot-linux-musleabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -Wall -Wextra -Wshadow -o bin/test_user test_user/main.o lib/.libs/libfstrcmp.a libtool: link: /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-buildroot-linux-musleabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -Wall -Wextra -Wshadow -o bin/fstrcmp fstrcmp/main.o lib/.libs/libfstrcmp.a /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/10.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/10.3.0/libgcc.a(_dvmd_lnx.o): in function `__aeabi_ldiv0': /home/buildroot/autobuild/instance-2/output-1/build/host-gcc-final-10.3.0/build/arm-buildroot-linux-musleabihf/libgcc/../../../libgcc/config/arm/lib1funcs.S:1499: undefined reference to `raise' Fixes: - http://autobuild.buildroot.org/results/ffbee12f13e3d6c180d8891a428c6c490163083d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/fstrcmp/fstrcmp.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/fstrcmp/fstrcmp.mk b/package/fstrcmp/fstrcmp.mk index 9c42159afb08..294104b28401 100644 --- a/package/fstrcmp/fstrcmp.mk +++ b/package/fstrcmp/fstrcmp.mk @@ -15,6 +15,12 @@ FSTRCMP_CONF_ENV = LIBTOOL="$(HOST_DIR)/bin/libtool" FSTRCMP_MAKE_OPTS = all-bin libdir/pkgconfig/fstrcmp.pc +# fstrcmp does not carry and use the usual ltmain.sh wrappers, so it does not +# inherit from our libtool patches to make -static behave like -all-static. +ifeq ($(BR2_STATIC_LIBS),y) +FSTRCMP_MAKE_OPTS += LDFLAGS="$(TARGET_LDFLAGS) -all-static" +endif + # We need to install the package files ourselves due to upstream trying # to install a .lai file which is missing because of rpath removal define FSTRCMP_INSTALL_STAGING_CMDS From 7691377873f26d2e8e7c3bcd2f1dcb0ea0712ce7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Sep 2023 23:27:17 +0200 Subject: [PATCH 1951/2890] package/crun: needs MMU Fix the following build failure with uclibc but without MMU raised since commit 223596c75d73a7eb29152235d3c5d9bf53bd58f5: /home/autobuild/autobuild/instance-6/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: ./.libs/libcrun.a(libcrun_la-container.o): in function `.L0 ': container.c:(.text+0x4e7c): undefined reference to `fork' Fixes: - http://autobuild.buildroot.org/results/f19482753e9262ec806cf550619170467a144daf Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/crun/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/crun/Config.in b/package/crun/Config.in index 1b69034459cc..f6a1ec7c6688 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_CRUN bool "crun" + depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_YAJL # libocispec @@ -9,5 +10,6 @@ config BR2_PACKAGE_CRUN https://github.com/containers/crun comment "crun needs a glibc or musl toolchain, gcc >= 4.9" + depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_USES_UCLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From 01ec478cb642dc6d221ab4c2f7f2938d629dcec1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 17 Sep 2023 11:02:20 +0200 Subject: [PATCH 1952/2890] package/asterisk: security bump to version 16.30.1 Fixes the following security vulnerabilities: CVE-2022-23537: Heap buffer overflow when decoding STUN message in pjproject Possible buffer overread when parsing a specially crafted STUN message with unknown attribute. The vulnerability affects Asterisk users using ICE and/or WebRTC. https://github.com/asterisk/asterisk/security/advisories/GHSA-4xjp-22g4-9fxm Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 98ee3bdc71c9..41e1da29628d 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9b93006a87be9c29492299118200e4f66c8369851c66a50fdef5b15dfc4eb2c2 asterisk-16.29.1.tar.gz +sha256 ef1ddc07dc02bb0c5f5ba58a5e42e42bcb63e55ac94199be8e3b5d3910f43736 asterisk-16.30.1.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 22ac0334fd0b..4f1a80ba8bee 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.29.1 +ASTERISK_VERSION = 16.30.1 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) From 56b066740608e9ca62ce5739fe1a683f7050b605 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 17 Sep 2023 12:04:13 +0200 Subject: [PATCH 1953/2890] package/libcurl: security bump to version 8.3.0 Fixes the following security issue: CVE-2023-38039: HTTP headers eat all memory When curl retrieves an HTTP response, it stores the incoming headers so that they can be accessed later via the libcurl headers API. However, curl did not have a limit on the size or quantity of headers it would accept in a response, allowing a malicious server to stream an endless series of headers to a client and eventually cause curl to run out of heap memory. https://curl.se/docs/CVE-2023-38039.html Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 42bf5967e161..371d20a63264 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.2.1.tar.xz.asc +# https://curl.se/download/curl-8.3.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894 curl-8.2.1.tar.xz +sha256 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 curl-8.3.0.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 7a3d6460e922..dd4cf43c6aa7 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.2.1 +LIBCURL_VERSION = 8.3.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From bc4110b0739f07436cb8c0ff837b7284835fb9b8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Sep 2023 13:51:39 +0200 Subject: [PATCH 1954/2890] package/libraw: fix CVE-2023-1729 A flaw was found in LibRaw. A heap-buffer-overflow in raw2image_ex() caused by a maliciously crafted file may lead to an application crash. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...shrink-flag-for-3-4-component-images.patch | 24 +++++++++++++++++++ package/libraw/libraw.mk | 3 +++ 2 files changed, 27 insertions(+) create mode 100644 package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch diff --git a/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch b/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch new file mode 100644 index 000000000000..ef93e0901bb7 --- /dev/null +++ b/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch @@ -0,0 +1,24 @@ +From 477e0719ffc07190c89b4f3d12d51b1292e75828 Mon Sep 17 00:00:00 2001 +From: Alex Tutubalin +Date: Sat, 14 Jan 2023 18:32:59 +0300 +Subject: [PATCH] do not set shrink flag for 3/4 component images + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/LibRaw/LibRaw/commit/477e0719ffc07190c89b4f3d12d51b1292e75828 +--- + src/preprocessing/raw2image.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/preprocessing/raw2image.cpp b/src/preprocessing/raw2image.cpp +index e65e2ad7..702cf290 100644 +--- a/src/preprocessing/raw2image.cpp ++++ b/src/preprocessing/raw2image.cpp +@@ -43,6 +43,8 @@ void LibRaw::raw2image_start() + + // adjust for half mode! + IO.shrink = ++ !imgdata.rawdata.color4_image && !imgdata.rawdata.color3_image && ++ !imgdata.rawdata.float4_image && !imgdata.rawdata.float3_image && + P1.filters && + (O.half_size || ((O.threshold || O.aber[0] != 1 || O.aber[2] != 1))); + diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index b6616f0c1005..cbd509cfea8c 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -18,6 +18,9 @@ LIBRAW_DEPENDENCIES = host-pkgconf LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" +# 0001-do-not-set-shrink-flag-for-3-4-component-images.patch +LIBRAW_IGNORE_CVES += 0001-do-not-set-shrink-flag-for-3-4-component-images.patch + ifeq ($(BR2_PACKAGE_JASPER),y) LIBRAW_CONF_OPTS += --enable-jasper LIBRAW_DEPENDENCIES += jasper From 8fc24fbd173a3d7565d3b3db4adebcb2244568a5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Sep 2023 13:58:23 +0200 Subject: [PATCH 1955/2890] package/haproxy: security bump to version 2.6.15 Fix CVE-2023-40225: HAProxy through 2.0.32, 2.1.x and 2.2.x through 2.2.30, 2.3.x and 2.4.x through 2.4.23, 2.5.x and 2.6.x before 2.6.15, 2.7.x before 2.7.10, and 2.8.x before 2.8.2 forwards empty Content-Length headers, violating RFC 9110 section 8.6. In uncommon cases, an HTTP/1 server behind HAProxy may interpret the payload as an extra request. https://www.mail-archive.com/haproxy@formilux.org/msg43864.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index 20048da7ece1..74390c2ff5e5 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.14.tar.gz.sha256 -sha256 bd3dd9fa60391ca09e1225e1ac3163e45be83c3f54f2fd76a30af289cc6e4fd4 haproxy-2.6.14.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.15.tar.gz.sha256 +sha256 41f8e1695e92fafdffe39690a68993f1a0f5f7f06931a99e9a153f749ea39cfd haproxy-2.6.15.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 2b8920efa6bf..63a92090f3d1 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.6 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).14 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).15 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From 78959665b94b412d7a82ee43e3ede14278a5d924 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Sep 2023 14:06:13 +0200 Subject: [PATCH 1956/2890] package/strongswan: security bump to version 5.9.11 Fix CVE-2023-26463: strongSwan 5.9.8 and 5.9.9 potentially allows remote code execution because it uses a variable named "public" for two different purposes within the same function. There is initially incorrect access control, later followed by an expired pointer dereference. One attack vector is sending an untrusted client certificate during EAP-TLS. A server is affected only if it loads plugins that implement TLS-based EAP methods (EAP-TLS, EAP-TTLS, EAP-PEAP, or EAP-TNC). This is fixed in 5.9.10. https://github.com/strongswan/strongswan/blob/5.9.11/NEWS https://www.strongswan.org/blog/2023/03/02/strongswan-vulnerability-(cve-2023-26463).html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/strongswan/strongswan.hash | 6 +++--- package/strongswan/strongswan.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index 4822f9152fd1..de8f18747a02 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.8.tar.bz2.md5 -md5 f46b0d3e7aed88824650d0721c887443 strongswan-5.9.8.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.11.tar.bz2.md5 +md5 673e194cd256af77b46928179f2c81ad strongswan-5.9.11.tar.bz2 # Calculated based on the hash above -sha256 d3303a43c0bd7b75a12b64855e8edcb53696f06190364f26d1533bde1f2e453c strongswan-5.9.8.tar.bz2 +sha256 ddf53f1f26ad26979d5f55e8da95bd389552f5de3682e35593f9a70b2584ed2d strongswan-5.9.11.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index cae1433e3922..605863169605 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.8 +STRONGSWAN_VERSION = 5.9.11 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ From 7af8dee3a8a0559c2685237ec24f817f37669efc Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 17 Sep 2023 15:01:22 +0200 Subject: [PATCH 1957/2890] package/tcl: add mandatory dependency to zlib Tcl changed its zlib handling in upstream commit [1]. Before this commit, the HAVE_ZLIB macro was defined only if a zlib headers/library was found. After that commit, the HAVE_ZLIB macro is unconditionally defined. The only change is that: if a working zlib library is found in the toolchain sysroot, it is used. Otherwise, the package will use a shipped version in [2]. See also [3] and [4]. This tcl commit is included in Buildroot since commit 7fda943b43 "tcl: bump to version 8.6.1". In Buildroot, we prefer to not use bundled libraries wherever possible, so add an unconditional dependency to zlib. Further notes: This behavior leads to runtime failures, when the package is compiled with toolchains including zlib in their sysroot. This is because at configuration time, the package will detect zlib in the sysroot and link against it, but the library files won't be installed on target. This happen to be the case with Bootlin toolchains such as [5], as they also contaions gdbserver, and since 3341ceb1e585 (package/gdb: zlib is mandatory, not optional), we also build zlib even if only gdbserver is built (gdbserver does not use zlib, so that's a bug in our gdb packaging). This toolchain also happen to be the one used in basic configurations of the runtime test infrastructure (this issue was found while attempting to write a runtime test for tcl). In such cases, running "tclsh" command fails with error message: tclsh: error while loading shared libraries: libz.so.1: cannot open shared object file: No such file or directory libtcl library also miss its dependency. ldd /usr/lib/libtcl8.6.so libz.so.1 => not found libm.so.6 => /lib/libm.so.6 (0xb6dad000) libc.so.6 => /lib/libc.so.6 (0xb6c65000) /lib/ld-linux.so.3 (0xb6f6c000) [1] https://github.com/tcltk/tcl/commit/6f3dea45cee94f12ffa0b2acbbdb3eedbc01807b [2] https://github.com/tcltk/tcl/tree/core-8-6-13/compat/zlib [3] https://github.com/tcltk/tcl/blob/core-8-6-13/unix/configure.in#L172 [4] https://github.com/tcltk/tcl/blob/core-8-6-13/unix/Makefile.in#L240 [5] https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2023.08-1.tar.bz2 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/tcl/Config.in | 1 + package/tcl/tcl.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/tcl/Config.in b/package/tcl/Config.in index f1fa0541a1b3..adb9f224883a 100644 --- a/package/tcl/Config.in +++ b/package/tcl/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_TCL # See this mailing list thread: # http://lists.busybox.net/pipermail/buildroot/2015-March/121198.html depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_ZLIB help TCL (Tool Command Language) is a simple textual language. diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 843d58a4ae27..1943bc7b27ee 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -75,7 +75,8 @@ TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) \ $(if $(BR2_PACKAGE_MYSQL),mysql) \ - $(if $(BR2_PACKAGE_POSTGRESQL),postgresql) + $(if $(BR2_PACKAGE_POSTGRESQL),postgresql) \ + zlib $(eval $(autotools-package)) $(eval $(host-autotools-package)) From ab91ddd8a8ebdc10fa26a6d9541cf5e50e297973 Mon Sep 17 00:00:00 2001 From: Reza Arbab Date: Fri, 15 Sep 2023 10:58:31 -0500 Subject: [PATCH 1958/2890] package/petitboot: fix HOST_PROG_SHUTDOWN value HOST_PROG_SHUTDOWN currently references a file that doesn't exist. Fix by setting it to /usr/libexec/petitboot/bb-kexec-reboot, which this package already installs but doesn't use. Signed-off-by: Reza Arbab Reviewed-by: Laurent Vivier Signed-off-by: Arnout Vandecappelle --- package/petitboot/petitboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 8b4c14207ec4..8d220f88f45a 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -21,7 +21,7 @@ PETITBOOT_CONF_OPTS = \ --without-twin-x11 \ $(if $(BR2_PACKAGE_BUSYBOX),--enable-busybox,--disable-busybox) \ HOST_PROG_KEXEC=/usr/sbin/kexec \ - HOST_PROG_SHUTDOWN=/usr/sbin/kexec-restart + HOST_PROG_SHUTDOWN=/usr/libexec/petitboot/bb-kexec-reboot # HPA and Busybox tftp are supported. HPA tftp is part of Buildroot's tftpd # package. From de0f8c66adae6f60914bf2144e9b88eeee21718e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Sep 2023 18:31:57 +0200 Subject: [PATCH 1959/2890] package/wireshark: security bump to version 4.0.8 Fix CVE-2023-3648 and CVE-2023-3649 https://www.wireshark.org/security/wnpa-sec-2023-21 https://www.wireshark.org/security/wnpa-sec-2023-22 https://www.wireshark.org/security/wnpa-sec-2023-23 https://www.wireshark.org/security/wnpa-sec-2023-24 https://www.wireshark.org/security/wnpa-sec-2023-25 https://www.wireshark.org/security/wnpa-sec-2023-26 https://www.wireshark.org/docs/relnotes/wireshark-4.0.7.html https://www.wireshark.org/docs/relnotes/wireshark-4.0.8.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 6598f51f53d1..f044f99483be 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.6.txt -sha1 a60b6f8063df2a711932ba869ae86e6476087cf0 wireshark-4.0.6.tar.xz -sha256 0079097a1b17ebc7250a73563f984c13327dac5016b7d53165810fbcca4bd884 wireshark-4.0.6.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.8.txt +sha1 8ca1cc4471d0cb835cd5216833c393fa23bc154f wireshark-4.0.8.tar.xz +sha256 16663585c0ffefd5593a6628d4a20cc8241b9703b11283cfe71ead2b750888c8 wireshark-4.0.8.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 80a986cfa32e..500bdbb77a9c 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.6 +WIRESHARK_VERSION = 4.0.8 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 8ce33fed49aea319da556eab388211a705afe7d0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Sep 2023 17:23:03 +0200 Subject: [PATCH 1960/2890] package/gdb: gdbserver does not need zlib Since 3341ceb1e585 (package/gdb: zlib is mandatory, not optional), zlib has become a mandatory dependencies of the gdb package. However, zlib is only needed for the debugger, gdb itself, while the server, gdbserver, does not use it. This means that, when building an SDK to be later reused as an external toolchain, the zlib headers and libraries are present in the sysroot of the toolchain, tainting the toolchain and making it unsuitable to be reused. As Julien noticed, for example, tcl will try and link with zlib if available, and at build time it is. But at runtime, it is not, and thus tclsh fails to run; see 7af8dee3a8a0 (package/tcl: add mandatory dependency to zlib) When we only need to build gdbserver, we still need to configure and build the whole gdb distribution, which means we call the top-level configure script; that script has no option to disable the detection of zlib: it wants to either use a system one, or it will build the bundled one. So, when we only build gdbserver, we tell configure to not use a system zlib. This triggers the build of the bundled one, but it is not linked with gdbserver so in the end it is not used on the target. Reported-by: Julien Olivain Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/gdb/Config.in | 2 +- package/gdb/gdb.mk | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 20fd262c938a..e4ab39a2bdb5 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -24,7 +24,6 @@ config BR2_PACKAGE_GDB # The or1k musl port is incomplete, elf_gregset_t definition is missing: # https://git.musl-libc.org/cgit/musl/tree/arch/or1k/bits/user.h?h=v1.2.3 depends on !BR2_or1k || !BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_ZLIB # When the external toolchain gdbserver is copied to the # target, we don't allow building a separate gdbserver. The # one from the external toolchain should be used. @@ -61,6 +60,7 @@ config BR2_PACKAGE_GDB_DEBUGGER depends on !BR2_sh select BR2_PACKAGE_GMP if !BR2_arc select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_ZLIB comment "full gdb on target needs a toolchain w/ wchar" depends on !BR2_sh diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 0d41548ed0c8..070598b385b7 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -32,7 +32,6 @@ GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK # also need ncurses. # As for libiberty, gdb may use a system-installed one if present, so # we must ensure ours is installed first. -GDB_DEPENDENCIES = zlib HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses host-zlib # Disable building documentation @@ -131,22 +130,29 @@ GDB_CONF_OPTS = \ --disable-sim \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) \ --without-included-gettext \ - --with-system-zlib \ --disable-werror \ --enable-static \ --without-mpfr \ --disable-source-highlight ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y) +GDB_DEPENDENCIES += zlib GDB_CONF_OPTS += \ --enable-gdb \ - --with-curses + --with-curses \ + --with-system-zlib GDB_DEPENDENCIES += ncurses \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) else +# When only building gdbserver, we don't need zlib. But we have no way to +# tell the top-level configure that we don't need zlib: it either wants to +# build the bundled one, or use the system one. +# Since we're going to only install the gdbserver to the target, we don't +# care that the bundled zlib is built, as it is not used. GDB_CONF_OPTS += \ --disable-gdb \ - --without-curses + --without-curses \ + --without-system-zlib endif # Starting from GDB 11.x, gmp is needed as a dependency to build full From 47cbcb70d078ffbc0fbd2d0179d35d9e3ee304ff Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 15 Sep 2023 14:52:11 -0700 Subject: [PATCH 1961/2890] package/containerd: bump to version 1.7.6 Bugfixes and updates. Containerd v1.7.x comes with new features including container sandboxing. https://github.com/containerd/containerd/releases/tag/v1.7.6 Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 8404675e3062..d5e0ef4517e8 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 b109aceacc814d7a637ed94ba5ade829cd2642841d03e06971ef124fa3b86899 containerd-1.6.22.tar.gz +sha256 084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677 containerd-1.7.6.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index c4a6d854c319..0591400709d7 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.22 +CONTAINERD_VERSION = 1.7.6 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From 2031fc88096f8651397cdc2e96a249a6f92ae292 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 17 Sep 2023 19:12:44 +0200 Subject: [PATCH 1962/2890] support/testing/tests/package/test_tcl.py: new runtime test Signed-off-by: Julien Olivain [Arnout: use f-string instead of string.format] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 + support/testing/tests/package/test_tcl.py | 50 +++++++++++++++++++ .../rootfs-overlay/root/factorial.tcl | 11 ++++ 3 files changed, 63 insertions(+) create mode 100644 support/testing/tests/package/test_tcl.py create mode 100755 support/testing/tests/package/test_tcl/rootfs-overlay/root/factorial.tcl diff --git a/DEVELOPERS b/DEVELOPERS index 7fae4841e448..e8b78a8d4648 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1772,6 +1772,8 @@ F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_stress_ng.py +F: support/testing/tests/package/test_tcl.py +F: support/testing/tests/package/test_tcl/ F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_xz.py diff --git a/support/testing/tests/package/test_tcl.py b/support/testing/tests/package/test_tcl.py new file mode 100644 index 000000000000..ae94e80a92c5 --- /dev/null +++ b/support/testing/tests/package/test_tcl.py @@ -0,0 +1,50 @@ +import math +import os + +import infra.basetest + + +class TestTcl(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_TCL=y + # BR2_PACKAGE_TCL_SHLIB_ONLY is not set + BR2_ROOTFS_OVERLAY="{infra.filepath("tests/package/test_tcl/rootfs-overlay")}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Print tcl the interpreter version and patchlevel. + tcl_cmds = "puts \"tcl_version: $tcl_version\";" + tcl_cmds += "puts \"patchlevel: [info patchlevel]\";" + tcl_cmds += "exit 0" + cmd = f"echo '{tcl_cmds}' | tclsh" + self.assertRunOk(cmd) + + # We check tclsh correctly print a string. + txt = "Hello Buildroot" + cmd = f"echo 'puts \"{txt}\"; exit 0' | tclsh" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], txt) + + # We check tclsh can return a non-zero exit code. + expected_code = 123 + cmd = f"echo 'exit {expected_code}' | tclsh" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, expected_code) + + # We check a tcl program computing factorial run correctly. + input_value = 12 + expected_output = str(math.factorial(input_value)) + cmd = f"/root/factorial.tcl {input_value}" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], expected_output) diff --git a/support/testing/tests/package/test_tcl/rootfs-overlay/root/factorial.tcl b/support/testing/tests/package/test_tcl/rootfs-overlay/root/factorial.tcl new file mode 100755 index 000000000000..0398f24ceb94 --- /dev/null +++ b/support/testing/tests/package/test_tcl/rootfs-overlay/root/factorial.tcl @@ -0,0 +1,11 @@ +#! /usr/bin/env tclsh + +proc factorial {n} { + set f 1 + for {set i 1} {$i <= $n} {incr i} { + set f [expr {$f * $i}] + } + return $f +} + +puts [factorial [lindex $argv 0]] From 96130dc204d193f68070f8aa1665123e913c5f5b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Sep 2023 22:59:16 +0200 Subject: [PATCH 1963/2890] docs/manual: fix formatting for LIBFOO_SVN_EXTERNAL Commit 7dd27cbe5b9e (support/download: add support to exclude svn externals) introduced an improperly formatted list item. That was carried over with bf2d7f8f5395 (package/pkg-generic: don't download svn externals by default). Fix that. Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-generic.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 98f822c55cd4..76b037f43668 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -347,7 +347,7 @@ not and can not work as people would expect it should: Git LFS to store large files out of band. This is only available for packages downloaded with git (i.e. when +LIBFOO_SITE_METHOD=git+). -+ +LIBFOO_SVN_EXTERNALS+ can be set to +YES+ to create an archive with +* +LIBFOO_SVN_EXTERNALS+ can be set to +YES+ to create an archive with the svn external references. This is only available for packages downloaded with subversion. From 334d8078483f779b743b8e36dc34b2aab4220b18 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Wed, 20 Sep 2023 08:55:04 +0200 Subject: [PATCH 1964/2890] package/sshguard: bump to version 2.4.3 Signed-off-by: Angelo Compagnucci Signed-off-by: Yann E. MORIN --- package/sshguard/sshguard.hash | 4 ++-- package/sshguard/sshguard.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sshguard/sshguard.hash b/package/sshguard/sshguard.hash index b1752f1c68ce..d018428d1905 100644 --- a/package/sshguard/sshguard.hash +++ b/package/sshguard/sshguard.hash @@ -1,4 +1,4 @@ -# sha256 from https://sourceforge.net/projects/sshguard/files/sshguard/2.4.2/sshguard-2.4.2.sha256 -sha256 2770b776e5ea70a9bedfec4fd84d57400afa927f0f7522870d2dcbbe1ace37e8 sshguard-2.4.2.tar.gz +# sha256 from https://sourceforge.net/projects/sshguard/files/sshguard/2.4.3/sshguard-2.4.3.sha256 +sha256 64029deff6de90fdeefb1f497d414f0e4045076693a91da1a70eb7595e97efeb sshguard-2.4.3.tar.gz # Locally calculated sha256 c3ae64f12153a1bc55bc234d09f40a08ab0e0149fffc972c0b7f02d5a12c1a5c COPYING diff --git a/package/sshguard/sshguard.mk b/package/sshguard/sshguard.mk index d27c76e63f51..8d036357438d 100644 --- a/package/sshguard/sshguard.mk +++ b/package/sshguard/sshguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSHGUARD_VERSION = 2.4.2 +SSHGUARD_VERSION = 2.4.3 SSHGUARD_SITE = https://sourceforge.net/projects/sshguard/files/sshguard/$(SSHGUARD_VERSION) SSHGUARD_LICENSE = ISC, Public Domain (fnv hash), BSD-3-Clause (SimCList) SSHGUARD_LICENSE_FILES = COPYING From 93ef6997aeef443336651dab46b31ff87be07860 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 20 Sep 2023 19:07:11 +0200 Subject: [PATCH 1965/2890] package/ghostscript: security bump to version 10.02.0 - Fix CVE-2023-36664: Artifex Ghostscript through 10.01.2 mishandles permission validation for pipe devices (with the %pipe% prefix or the | pipe character prefix). - Fix CVE-2023-38559: A buffer overflow flaw was found in base/gdevdevn.c:1973 in devn_pcx_write_rle() in ghostscript. This issue may allow a local attacker to cause a denial of service via outputting a crafted PDF file for a DEVN device with gs. - Fix CVE-2023-38560: An integer overflow flaw was found in pcl/pl/plfont.c:418 in pl_glyph_name in ghostscript. This issue may allow a local attacker to cause a denial of service via transforming a crafted PCL file to PDF format. https://ghostscript.readthedocs.io/en/gs10.02.0/News.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-Fix-build-without-BUILD_PDF.patch | 34 +++++++++++++++++++ package/ghostscript/ghostscript.hash | 4 +-- package/ghostscript/ghostscript.mk | 2 +- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch diff --git a/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch b/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch new file mode 100644 index 000000000000..af69cd367072 --- /dev/null +++ b/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch @@ -0,0 +1,34 @@ +From 088f3cd6e58cff5fa51e072d1829f7691a5f6681 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 20 Sep 2023 13:44:28 +0100 +Subject: [PATCH] Fix build without BUILD_PDF + +The PDFSetParams PostScript extension operator was missing a stub function definition +when the PDF interpreter is not built in. + + Author: Fabrice Fontaine +Upstream: https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=088f3cd6e58cff5fa51e072d1829f7691a5f6681 +Signed-off-by: Fabrice Fontaine +--- + psi/zpdfops.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/psi/zpdfops.c b/psi/zpdfops.c +index e7e0a42ee..271687a18 100644 +--- a/psi/zpdfops.c ++++ b/psi/zpdfops.c +@@ -1507,6 +1507,11 @@ static int zPDFdrawannots(i_ctx_t *i_ctx_p) + return_error(gs_error_undefined); + } + ++static int zPDFSetParams(i_ctx_t *i_ctx_p) ++{ ++ return_error(gs_error_undefined); ++} ++ + static int zPDFInit(i_ctx_t *i_ctx_p) + { + return_error(gs_error_undefined); +-- +2.34.1 + diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 2e4b6ac75044..77c8faccbe12 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10012/SHA512SUMS -sha512 ee20f0e12f553a3d04578e71a0d45defebc71117ce4dc2c14043985bfe7348ad7f8b2fe98fc9b4f5b935ecb32e50dc340be67d6ef58190542ec6d0f9da1de380 ghostscript-10.01.2.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10020/SHA512SUMS +sha512 c49344151063e915add55a0a842c2a645d8362a5cbca663bd07638f4bd3699a08cade37a9efe905ad5a41e014353e5e1b1268b7925e43128ad30d5b031396b71 ghostscript-10.02.0.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 8a39d4b69532..161521f9707e 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 10.01.2 +GHOSTSCRIPT_VERSION = 10.02.0 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 From 8bf82aab0c0b7a1d329a02395e0353bb9c2eae67 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Wed, 20 Sep 2023 06:31:12 +0200 Subject: [PATCH 1966/2890] package/bind: drop CVE-2017-3139 from IGNORE_CVES As of 2021-05-14 CVE-2017-3139 is no longer listed as affecting bind, only RHEL. Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/bind/bind.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index b934ab31908f..618b5b9278ea 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -14,8 +14,6 @@ BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_CPE_ID_VENDOR = isc BIND_SELINUX_MODULES = bind -# Only applies to RHEL6.x with DNSSEC validation on -BIND_IGNORE_CVES = CVE-2017-3139 # Library CVE and not used by bind but used by ISC DHCP BIND_IGNORE_CVES += CVE-2019-6470 BIND_TARGET_SERVER_SBIN = arpaname ddns-confgen dnssec-checkds dnssec-coverage From 880e03ba7519597e813e910543b87b5a077c906c Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Wed, 20 Sep 2023 06:34:20 +0200 Subject: [PATCH 1967/2890] package/cpio: drop CVE-2021-38185 from IGNORE_CVES CVE-2021-38185 affects cpio <= 2.13. The mentioned patches were removed in b0306d94 when bumping to 2.14. Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/cpio/cpio.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/cpio/cpio.mk b/package/cpio/cpio.mk index 19224000bb21..911d16822b8a 100644 --- a/package/cpio/cpio.mk +++ b/package/cpio/cpio.mk @@ -12,10 +12,6 @@ CPIO_LICENSE = GPL-3.0+ CPIO_LICENSE_FILES = COPYING CPIO_CPE_ID_VENDOR = gnu -# 0002-Rewrite-dynamic-string-support.patch -# 0003-Fix-previous-commit.patch -CPIO_IGNORE_CVES += CVE-2021-38185 - # cpio uses argp.h which is not provided by uclibc or musl by default. # Use the argp-standalone package to provide this. ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) From dc0c7552735d299107385458c1889c7dc4633864 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Wed, 20 Sep 2023 06:36:58 +0200 Subject: [PATCH 1968/2890] package/e2fsprogs: drop CVE-2022-1304 CVE-2022-1304 only affects e2fsprogs 1.46.5. The mentioned patch was removed in 6a21733f when bumping to 1.47.0. Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/e2fsprogs/e2fsprogs.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 80090621bf97..7491f4c067fe 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -12,9 +12,6 @@ E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h E2FSPROGS_CPE_ID_VENDOR = e2fsprogs_project E2FSPROGS_INSTALL_STAGING = YES -# 0001-libext2fs-add-sanity-check-to-extent-manipulation.patch -E2FSPROGS_IGNORE_CVES += CVE-2022-1304 - # Use libblkid and libuuid from util-linux for host and target packages. # This prevents overriding them with e2fsprogs' ones, which may cause # problems for other packages. From 164d635f3782522c324c710b767ef21c598228c4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Sep 2023 23:04:05 +0200 Subject: [PATCH 1969/2890] package/xterm: security bump to version 384 - Fix CVE-2023-40359: xterm before 380 supports ReGIS reporting for character-set names even if they have unexpected characters (i.e., neither alphanumeric nor underscore), aka a pointer/overflow issue. This can only occur for xterm installations that are configured at compile time to use a certain experimental feature. - Update COPYING hash (update in year and version) https://invisible-island.net/xterm/xterm.log.html#xterm_384 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index 12cd2e639b90..1a2ad8fea0fe 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 1e5bb7aad068fb31d6d3cbb77f80c7ad1526cd4c956a4ddcf2c5cf28af5334e1 xterm-376.tgz +sha256 31ef870740ceae020c3c4b4a9601c7f47bfd46672c1aaf2d213a565d64cbc373 xterm-384.tgz # Locally calculated -sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING +sha256 98d02d0b7f7b8aabb742b05e6960caaa9ae20e26d2f0d0dc57808362f2ac79bc COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index d01b608d992d..2fc2f734c82f 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 376 +XTERM_VERSION = 384 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From 9c4c3c4c9c0f4e1bf8b98e6465832c05d85317c2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Sep 2023 22:49:10 +0200 Subject: [PATCH 1970/2890] package/opensc: fix CVE-2023-2977 A vulnerability was found in OpenSC. This security flaw cause a buffer overrun vulnerability in pkcs15 cardos_have_verifyrc_package. The attacker can supply a smart card package with malformed ASN1 context. The cardos_have_verifyrc_package function scans the ASN1 buffer for 2 tags, where remaining length is wrongly caculated due to moved starting pointer. This leads to possible heap-based buffer oob read. In cases where ASAN is enabled while compiling this causes a crash. Further info leak or more damage is possible. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...alculation-to-fix-buffer-overrun-bug.patch | 51 +++++++++++++++++++ package/opensc/opensc.mk | 3 ++ 2 files changed, 54 insertions(+) create mode 100644 package/opensc/0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch diff --git a/package/opensc/0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch b/package/opensc/0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch new file mode 100644 index 000000000000..079f960b59ae --- /dev/null +++ b/package/opensc/0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch @@ -0,0 +1,51 @@ +From 81944d1529202bd28359bede57c0a15deb65ba8a Mon Sep 17 00:00:00 2001 +From: fullwaywang +Date: Mon, 29 May 2023 10:38:48 +0800 +Subject: [PATCH] pkcs15init: correct left length calculation to fix buffer + overrun bug. Fixes #2785 + +Upstream: https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a +Signed-off-by: Fabrice Fontaine +--- + src/pkcs15init/pkcs15-cardos.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/pkcs15init/pkcs15-cardos.c b/src/pkcs15init/pkcs15-cardos.c +index 9715cf390f..f41f73c349 100644 +--- a/src/pkcs15init/pkcs15-cardos.c ++++ b/src/pkcs15init/pkcs15-cardos.c +@@ -872,7 +872,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + sc_apdu_t apdu; + u8 rbuf[SC_MAX_APDU_BUFFER_SIZE]; + int r; +- const u8 *p = rbuf, *q; ++ const u8 *p = rbuf, *q, *pp; + size_t len, tlen = 0, ilen = 0; + + sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0xca, 0x01, 0x88); +@@ -888,13 +888,13 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + return 0; + + while (len != 0) { +- p = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); +- if (p == NULL) ++ pp = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); ++ if (pp == NULL) + return 0; + if (card->type == SC_CARD_TYPE_CARDOS_M4_3) { + /* the verifyRC package on CardOS 4.3B use Manufacturer ID 0x01 */ + /* and Package Number 0x07 */ +- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x01, &ilen); ++ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x01, &ilen); + if (q == NULL || ilen != 4) + return 0; + if (q[0] == 0x07) +@@ -902,7 +902,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + } else if (card->type == SC_CARD_TYPE_CARDOS_M4_4) { + /* the verifyRC package on CardOS 4.4 use Manufacturer ID 0x03 */ + /* and Package Number 0x02 */ +- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x03, &ilen); ++ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x03, &ilen); + if (q == NULL || ilen != 4) + return 0; + if (q[0] == 0x02) diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index 32f0fdaa8b6a..823bc5010282 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -15,4 +15,7 @@ OPENSC_DEPENDENCIES = openssl pcsc-lite OPENSC_INSTALL_STAGING = YES OPENSC_CONF_OPTS = --disable-cmocka --disable-strict --disable-tests +# 0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch +OPENSC_IGNORE_CVES += CVE-2023-2977 + $(eval $(autotools-package)) From d170cde0272401fd79b0bd100b72da25b2a13e5c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Sep 2023 22:50:58 +0200 Subject: [PATCH 1971/2890] package/netatalk: security bump to version 3.1.17 - Drop patches (already in version) and so autoreconf - Update COPYING hash (gpl mailing address updated with https://github.com/Netatalk/netatalk/commit/9bd45cc06e02e9bbfe8156bb1e5e2843b7727a51 https://github.com/Netatalk/netatalk/commit/6a5997fbd64d6cd5a5400ea6a0a930d005ed89df) - Fix CVE-2022-43634: This vulnerability allows remote attackers to execute arbitrary code on affected installations of Netatalk. Authentication is not required to exploit this vulnerability. The specific flaw exists within the dsi_writeinit function. The issue results from the lack of proper validation of the length of user-supplied data prior to copying it to a fixed-length heap-based buffer. An attacker can leverage this vulnerability to execute code in the context of root. Was ZDI-CAN-17646. - Fix CVE-2022-45188: Netatalk through 3.1.13 has an afp_getappl heap-based buffer overflow resulting in code execution via a crafted .appl file. This provides remote root access on some platforms such as FreeBSD (used for TrueNAS). - Fix CVE-2023-42464: Validate data type in dalloc_value_for_key() https://github.com/Netatalk/netatalk/blob/netatalk-3-1-17/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 - ...ng-of-LD_LIBRARY_FLAGS-shlibpath_var.patch | 48 ------------------- ..._compat.h-fix-build-with-libressl-2..patch | 43 ----------------- package/netatalk/netatalk.hash | 10 ++-- package/netatalk/netatalk.mk | 8 ++-- 5 files changed, 8 insertions(+), 103 deletions(-) delete mode 100644 package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch delete mode 100644 package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch diff --git a/.checkpackageignore b/.checkpackageignore index 73a00d610cd8..8acd9558ebd1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -947,8 +947,6 @@ package/neard/S53neard Indent Shellcheck Variables package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch Upstream package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch Upstream package/neon/0002-configure.ac-fix-autoreconf.patch Upstream -package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch Upstream -package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch Upstream package/netatalk/S50netatalk EmptyLastLine Indent Variables package/netcat/0001-signed-bit-counting.patch Sob Upstream package/netopeer2/S52netopeer2 Shellcheck Variables diff --git a/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch b/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch deleted file mode 100644 index 01d577659631..000000000000 --- a/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 60d100713b5289948e9cdf5b0646ff3cdd2c206b Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Mon, 17 Dec 2012 22:32:44 +0100 -Subject: [PATCH] Fix setting of LD_LIBRARY_FLAGS ($shlibpath_var). - -LD_LIBRARY_PATH should not be set when cross-compiling, because it -adds the cross-libraries to the build's LD-path. - -Also the restoring of LD_LIBRARY_PATH was done incorrectly: it would -set LD_LIBRARY_PATH=LD_LIBRARY_PATH. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - macros/db3-check.m4 | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/macros/db3-check.m4 b/macros/db3-check.m4 -index 902220b..d5a5446 100644 ---- a/macros/db3-check.m4 -+++ b/macros/db3-check.m4 -@@ -94,7 +94,7 @@ if test "x$bdb_required" = "xyes"; then - savedldflags="$LDFLAGS" - savedcppflags="$CPPFLAGS" - savedlibs="$LIBS" -- saved_shlibpath_var=$shlibpath_var -+ eval saved_shlibpath_var=\$$shlibpath_var - - dnl required BDB version: 4.6, because of cursor API change - DB_MAJOR_REQ=4 -@@ -148,7 +148,7 @@ if test "x$bdb_required" = "xyes"; then - dnl -- LD_LIBRARY_PATH on many platforms. This will be fairly - dnl -- portable hopefully. Reference: - dnl -- http://lists.gnu.org/archive/html/autoconf/2009-03/msg00040.html -- eval export $shlibpath_var=$bdblibdir -+ test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir - NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var - -@@ -171,7 +171,7 @@ if test "x$bdb_required" = "xyes"; then - CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS" - LDFLAGS="-L$bdblibdir $LDFLAGS" - -- eval export $shlibpath_var=$bdblibdir -+ test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir - NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var - --- diff --git a/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch b/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch deleted file mode 100644 index 05913862f663..000000000000 --- a/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch +++ /dev/null @@ -1,43 +0,0 @@ -From 58ddc137021a938f37c3794305a839f8df449d3f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 5 Apr 2022 23:59:15 +0200 -Subject: [PATCH] etc/uams/openssl_compat.h: fix build with libressl >= 2.7.0 - -Fix the following build failure with libressl >= 2.7.0 which added -DH_set0_pqg with -https://github.com/libressl-portable/openbsd/commit/848e2a019c796b685fc8c5848283b86e48fbe0bf: - -In file included from uams_dhx_passwd.c:35: -openssl_compat.h:15:19: error: static declaration of 'DH_set0_pqg' follows non-static declaration - 15 | inline static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) - | ^~~~~~~~~~~ -In file included from uams_dhx_passwd.c:33: -/home/autobuild/autobuild/instance-2/output-1/host/mips64-buildroot-linux-uclibc/sysroot/usr/include/openssl/dh.h:195:5: note: previous declaration of 'DH_set0_pqg' was here - 195 | int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g); - | ^~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/fc6e308f346570f8198542602bc8c1bdd0a4869e - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] ---- - etc/uams/openssl_compat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/uams/openssl_compat.h b/etc/uams/openssl_compat.h -index ded377bc..5cc8de34 100644 ---- a/etc/uams/openssl_compat.h -+++ b/etc/uams/openssl_compat.h -@@ -11,7 +11,7 @@ http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - #ifndef OPENSSL_COMPAT_H - #define OPENSSL_COMPAT_H - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L) - inline static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) - { - /* If the fields p and g in d are NULL, the corresponding input --- -2.35.1 - diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 6dead5457c27..a35e6bc36c55 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ -md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 -sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.17/ +md5 a6429a28948f85b69c9012fb437dd9c2 netatalk-3.1.17.tar.xz +sha1 bc6578d9fa874b3816fd4ddd60a30a8f3aadc71d netatalk-3.1.17.tar.xz # Locally computed -sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 8c208e2c94bf3047db33cdbc3ce4325d2b80db61d6cc527f18f9dbd8e95b5cff netatalk-3.1.17.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 7cc950beb66d..a47bfa7e844d 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,11 +4,9 @@ # ################################################################################ -NETATALK_VERSION = 3.1.13 -NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) -NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 -# For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch -NETATALK_AUTORECONF = YES +NETATALK_VERSION = 3.1.17 +NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) +NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent From 7c6c018ad45c952a47e7f0e707da0d797cdbe4c3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Sep 2023 22:16:23 +0200 Subject: [PATCH 1972/2890] package/agentpp: fix build with gcc 4.8 Fix the following build failure with gcc 4.8 raised since bump of snmppp to version 3.5.0 in commit e011fa0415883b9d44df616cfaf6956e1a11da88: configure: error: Cannot find suitable libsnmp++ library [...] configure:9496: checking if libsnmp++ can be linked with flags from pkg-config configure:9528: /home/buildroot/autobuild/run/instance-1/output-1/host/bin/arm-none-linux-gnueabi-g++ -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D_XOPEN_SOURCE=XPG6 conftest.cpp -L/home/buildroot/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/lib -lsnmp++ >&5 In file included from /home/buildroot/autobuild/run/instance-1/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/snmp_pp/snmp_pp.h:71:0, from conftest.cpp:92: /home/buildroot/autobuild/run/instance-1/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/snmp_pp/uxsnmp.h:628:35: error: 'nullptr' was not declared in this scope CSNMPMessage *snmp_message = nullptr); ^ Fixes: - http://autobuild.buildroot.org/results/f272473e7b588f5390b183072935a0217290ee4e Signed-off-by: Fabrice Fontaine Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/agentpp/agentpp.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index 0ef549426e56..7616d3eb0c45 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -11,6 +11,7 @@ AGENTPP_LICENSE = Apache-2.0 AGENTPP_LICENSE_FILES = LICENSE-2_0.txt AGENTPP_INSTALL_STAGING = YES AGENTPP_DEPENDENCIES = host-pkgconf snmppp +AGENTPP_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" AGENTPP_CONF_OPTS += \ --disable-proxy \ --disable-forwarder \ From e9f2f48a7ebba2d5f0b38b6e9d2f12627575141a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Sep 2023 08:15:56 +0200 Subject: [PATCH 1973/2890] package/binutils: install libsframe for all relevant binutils versions Fix the following build failure with oprofile raised since bump of binutils to version 2.40 in commit 35656482d3b74ab12a6c2395ac9ca61b60a2fd49: configure: error: bfd library not found [...] configure:17928: checking for bfd_openr in -lbfd configure:17953: /home/buildroot/autobuild/run/instance-1/output-1/host/bin/arm-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lbfd -liberty -lpopt -ldl -lintl >&5 /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/12.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: warning: libsframe.so.0, needed by /home/buildroot/autobuild/run/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libbfd.so, not found (try using -rpath or -rpath-link) Indeed, in this case, libsframe is not installed even after applying commit 1b4d921e1da614a72fed2a79d5c4f8e0b6d1cd45 because BR2_BINUTILS_VERSION_2_40_X is not selected by anyone (binutils package is selected by oprofile and the toolchain is not generated by buildroot) To fix this issue, invert the logic: install libsframe by default (i.e. when binutils is selected or with a buildroot toolchain). libsframe will not be installed only if binutils < 2.40 is detected. Fixes: - http://autobuild.buildroot.org/results/af9a2d52823a332b48e6df14d2708b6a4b3833a4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 6 +++--- package/binutils/binutils.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 36436c0b27aa..bc7dc4443c3e 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -5,7 +5,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI default y depends on !BR2_microblaze -config BR2_PACKAGE_BINUTILS_HAS_LIBSFRAME +config BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME bool choice @@ -17,18 +17,18 @@ choice config BR2_BINUTILS_VERSION_2_39_X bool "binutils 2.39" + select BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME config BR2_BINUTILS_VERSION_2_40_X bool "binutils 2.40" - select BR2_PACKAGE_BINUTILS_HAS_LIBSFRAME config BR2_BINUTILS_VERSION_2_41_X bool "binutils 2.41" - select BR2_PACKAGE_BINUTILS_HAS_LIBSFRAME config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" depends on BR2_arc + select BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME endchoice diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index ecb00077d6bf..4bc1b69fa0fd 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -105,7 +105,7 @@ endif # our TARGET_CONFIGURE_ARGS are taken into consideration for those BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) -ifeq ($(BR2_PACKAGE_BINUTILS_HAS_LIBSFRAME),y) +ifeq ($(BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME),) define BINUTILS_INSTALL_STAGING_LIBSFRAME $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libsframe DESTDIR=$(STAGING_DIR) install endef From ebf9fa28e380a808c6b823a675447167ec0b0db0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Sep 2023 22:37:11 +0200 Subject: [PATCH 1974/2890] package/util-linux: fix build with uclibc-ng < 1.0.42 Define static_assert if needed to avoid the following build failure with uclibc-ng < 1.0.42 raised since bump to version 2.39 in commit ad276d94a392fb13244e042851a44269e6254d61 and https://github.com/util-linux/util-linux/commit/0ff57406522ba78ba829df7a64903b3066afb75f: /home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: ./.libs/libsmartcols.so: undefined reference to `static_assert' Fixes: - http://autobuild.buildroot.org/results/c3d38d92557ee9e59b717b85f6307810d5de1487 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux-libs/util-linux-libs.mk | 3 +++ package/util-linux/util-linux.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/package/util-linux/util-linux-libs/util-linux-libs.mk b/package/util-linux/util-linux-libs/util-linux-libs.mk index 20566345c63d..e1fe1ec19126 100644 --- a/package/util-linux/util-linux-libs/util-linux-libs.mk +++ b/package/util-linux/util-linux-libs/util-linux-libs.mk @@ -52,6 +52,9 @@ UTIL_LINUX_LIBS_CONF_OPTS += --disable-widechar # No libs use ncurses UTIL_LINUX_LIBS_CONF_OPTS += --without-ncursesw --without-ncurses +# workaround for static_assert on uclibc-ng < 1.0.42 +UTIL_LINUX_LIBS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -Dstatic_assert=_Static_assert" + # Unfortunately, the util-linux does LIBS="" at the end of its # configure script. So we have to pass the proper LIBS value when # calling the configure script to make configure tests pass properly, diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 73eda5c17134..72126adb005f 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -96,6 +96,9 @@ endif UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses endif +# workaround for static_assert on uclibc-ng < 1.0.42 +UTIL_LINUX_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -Dstatic_assert=_Static_assert" + # Unfortunately, the util-linux does LIBS="" at the end of its # configure script. So we have to pass the proper LIBS value when # calling the configure script to make configure tests pass properly, From e6045322853d8405a56c0c8e38d58dc76eb10832 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 19 Sep 2023 22:01:49 +0200 Subject: [PATCH 1975/2890] package/harfbuzz: bump version to 8.2.1 Release notes: https://github.com/harfbuzz/harfbuzz/blob/main/NEWS Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 8791899a4af6..3f601d29eed2 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cb7117a62f42d5ad25d4a697e1bbfc65933b3eed2ee7f247203c79c9f1b514c harfbuzz-8.2.0.tar.xz +sha256 0fec78f98c9c8faf228957a201c8846f809452c20f8445eb092a1ba6f22dbea5 harfbuzz-8.2.1.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 43c559ed1bdf..9a9859c133ba 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 8.2.0 +HARFBUZZ_VERSION = 8.2.1 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 60fad6628efbb187e243737704cac3778a7fb09a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Sep 2023 22:10:24 +0200 Subject: [PATCH 1976/2890] package/domoticz: bump to version 2023.2 https://github.com/domoticz/domoticz/blob/2023.2/History.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index fccb4ea42015..b54d0229fcba 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3144372d0847cb4d22a8c4b1362cd31885b37671adc682c3a8e9435762cde338 domoticz-2023.1.tar.gz +sha256 32bcf49df8c80c470352e63004a82d9601b90ccf406096099656250a4515ac28 domoticz-2023.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index ed82131dd30d..3fbff5f4d8d0 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2023.1 +DOMOTICZ_VERSION = 2023.2 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt From ec3b960418670db556d3aa1db9ed9f6f4c74d878 Mon Sep 17 00:00:00 2001 From: Roberto Medina Date: Tue, 19 Sep 2023 20:48:34 +0100 Subject: [PATCH 1977/2890] configs/roc_pc_rk3399: enable OpenSSL for U-Boot Enable OpenSSL to build U-boot. Reported by the daily autobuild. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5083367140 Signed-off-by: Roberto Medina Signed-off-by: Thomas Petazzoni --- configs/roc_pc_rk3399_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig index 3cc64be17655..79a51a82306e 100644 --- a/configs/roc_pc_rk3399_defconfig +++ b/configs/roc_pc_rk3399_defconfig @@ -31,6 +31,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="roc-pc-rk3399" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From 38f39a603167148476684254a57372a5f4ac8e09 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Sep 2023 21:52:16 +0200 Subject: [PATCH 1978/2890] package/zxing-cpp: fix python build Fix the following build failures raised since bump to version 1.4.0 in commit 456a7398316655ad0b669635f580e4887c24a700: -- Found PythonInterp: /usr/bin/python3.6 (found suitable version "3.6.9", minimum required is "3.6") CMake Error at /home/buildroot/autobuild/run/instance-3/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/share/cmake/pybind11/FindPythonLibsNew.cmake:147 (message): Python config failure: Traceback (most recent call last): File "", line 6, in ImportError: cannot import name 'sysconfig' and In file included from /home/buildroot/autobuild/instance-1/output-1/host/include/python3.11/Python.h:38, from /home/buildroot/autobuild/instance-1/output-1/host/sh4-buildroot-linux-gnu/sysroot/usr/include/pybind11/detail/common.h:266, from /home/buildroot/autobuild/instance-1/output-1/host/sh4-buildroot-linux-gnu/sysroot/usr/include/pybind11/attr.h:13, from /home/buildroot/autobuild/instance-1/output-1/host/sh4-buildroot-linux-gnu/sysroot/usr/include/pybind11/detail/class.h:12, from /home/buildroot/autobuild/instance-1/output-1/host/sh4-buildroot-linux-gnu/sysroot/usr/include/pybind11/pybind11.h:13, from /home/buildroot/autobuild/instance-1/output-1/host/sh4-buildroot-linux-gnu/sysroot/usr/include/pybind11/numpy.h:12, from /home/buildroot/autobuild/instance-1/output-1/build/zxing-cpp-2.1.0/wrappers/python/zxing.cpp:18: /home/buildroot/autobuild/instance-1/output-1/host/include/python3.11/pyport.h:601:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 601 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/665b246a4bb14480152ee59050672a7469148a5b - http://autobuild.buildroot.org/results/0502b05020de57e4910125c699c4264047187c51 - http://autobuild.buildroot.org/results/c5e7fe83d46c704e05800e3ae62bf476458c7b71 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zxing-cpp/zxing-cpp.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index 8256b1a25456..b0cadf1b1f67 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -33,7 +33,10 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy) ZXING_CPP_DEPENDENCIES += python3 python-pybind -ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=ON +ZXING_CPP_CONF_OPTS += \ + -DBUILD_PYTHON_MODULE=ON \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) else ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF endif From a01a6b8dc840eb99528d3c876d18e1f8952d2a58 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Thu, 21 Sep 2023 05:58:27 +0200 Subject: [PATCH 1979/2890] package/fail2ban: drop CVE-2021-32749 from IGNORE_CVES CVE-2021-32749 affects fail2ban <= 0.9.7, 0.10.0 through 0.10.6, and 0.11.0 through 0.11.2. The mentioned patch was removed in 76853089 when bumping to 1.0.1. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/fail2ban/fail2ban.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 828dfdd6e158..0c1208c6feed 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -12,9 +12,6 @@ FAIL2BAN_CPE_ID_VENDOR = fail2ban FAIL2BAN_SELINUX_MODULES = fail2ban FAIL2BAN_SETUP_TYPE = setuptools -# 0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch -FAIL2BAN_IGNORE_CVES += CVE-2021-32749 - define FAIL2BAN_PYTHON_2TO3 $(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban endef From f71c7940210420e156530e0993756f9c41e66f4a Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Thu, 21 Sep 2023 06:00:30 +0200 Subject: [PATCH 1980/2890] package/icu: drop CVE-2021-30535 from IGNORE_CVES The mentioned patch was removed in 7549e05b when bumping to 70-1. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/icu/icu.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index d4be2e4e8f3c..73547a753785 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -17,9 +17,6 @@ ICU_CPE_ID_VENDOR = icu-project ICU_CPE_ID_PRODUCT = international_components_for_unicode ICU_CPE_ID_VERSION = $(subst -,.,$(ICU_VERSION)) -# 0005-ICU-21587-Fix-memory-bug-w-baseName.patch -ICU_IGNORE_CVES += CVE-2021-30535 - ICU_DEPENDENCIES = host-icu ICU_INSTALL_STAGING = YES ICU_CONFIG_SCRIPTS = icu-config From 43dbfe4670c3283ea1b2f9a884a09ea6f8f9dcb9 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Thu, 21 Sep 2023 06:11:51 +0200 Subject: [PATCH 1981/2890] package/python3: drop CVE-2022-45061 from IGNORE_CVES CVE-2022-45061 affects python <= 3.7.15, 3.8.0 through 3.8.15, 3.9.0 through 3.9.15, 3.10.0 through 3.10.8 The mentioned patch was removed in c38de813 when bumping to 3.11.1. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/python3/python3.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 5f8fa5b58d77..cfe5e1ee6e0b 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -13,9 +13,6 @@ PYTHON3_LICENSE_FILES = LICENSE PYTHON3_CPE_ID_VENDOR = python PYTHON3_CPE_ID_PRODUCT = python -# 0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch -PYTHON3_IGNORE_CVES += CVE-2022-45061 - # This host Python is installed in $(HOST_DIR), as it is needed when # cross-compiling third-party Python modules. From 487c12a1f29140bf61abcf4cc575bd83b1fc933b Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Thu, 21 Sep 2023 06:19:54 +0200 Subject: [PATCH 1982/2890] package/tar: drop CVE-2007-4476 from IGNORE_CVES As off 2021-05-17 NVD added 1.19 as the first version that isn't affected by CVE-2007-4476. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/tar/tar.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 80d7495b005d..690a5952ba02 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -13,8 +13,6 @@ TAR_CONF_OPTS = --exec-prefix=/ TAR_LICENSE = GPL-3.0+ TAR_LICENSE_FILES = COPYING TAR_CPE_ID_VENDOR = gnu -# only tar <= 1.16 -TAR_IGNORE_CVES += CVE-2007-4476 ifeq ($(BR2_PACKAGE_ACL),y) TAR_DEPENDENCIES += acl From 45c41098ef50e50c4b0aa426e90e5758bf7bc330 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 20 Sep 2023 23:12:42 +0200 Subject: [PATCH 1983/2890] package/openvpn: dco needs headers >= 4.16 NLMSGERR_ATTR_MAX has been added in kernel 4.16 with https://github.com/torvalds/linux/commit/dc2b9f19e3bdaa87a7c3d123b8bba8a42d96d942 resulting in the following build failure since bump to version 2.6.4 in commit a46ac2346558d05afe405dda3730169df4b677d2 and https://github.com/OpenVPN/openvpn/commit/e34437c26b764851555e4acbe2ccca6bec235c7e: dco_linux.c: In function 'ovpn_nl_cb_error': dco_linux.c:303:27: error: 'NLMSGERR_ATTR_MAX' undeclared (first use in this function); did you mean '__CTRL_ATTR_MAX'? struct nlattr *tb_msg[NLMSGERR_ATTR_MAX + 1]; ^~~~~~~~~~~~~~~~~ __CTRL_ATTR_MAX Fixes: - http://autobuild.buildroot.org/results/69b9737913ac0b5cd2c117d526602874da3ee487 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/openvpn/openvpn.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 12c090ba3ede..619a22c3b320 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -16,7 +16,7 @@ OPENVPN_CONF_OPTS = \ $(if $(BR2_STATIC_LIBS),--disable-plugins) OPENVPN_CONF_ENV = NETSTAT=/bin/netstat -ifeq ($(BR2_PACKAGE_LIBNL),y) +ifeq ($(BR2_PACKAGE_LIBNL)$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16),yy) OPENVPN_CONF_OPTS += --enable-dco OPENVPN_DEPENDENCIES += libnl else From 40a2d729fd330e671624a587cee4eed1a36b9a9c Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 21 Sep 2023 10:16:25 +0300 Subject: [PATCH 1984/2890] package/postgis: bump version to 3.4.0 Changelog: https://git.osgeo.org/gitea/postgis/postgis/src/tag/3.4.0/NEWS Licenses updates: - BSD-3-Clause for xsl: https://github.com/postgis/postgis/commit/1a525819301c7b715a74cd1549142dede3e34e49 - Update urls and add SFCGAL links and licenses: https://github.com/postgis/postgis/commit/0015540bc60b716e169f9d2c928897e997bf8632 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgis/postgis.hash | 4 ++-- package/postgis/postgis.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/postgis/postgis.hash b/package/postgis/postgis.hash index 8550a579393f..812d2dc0179d 100644 --- a/package/postgis/postgis.hash +++ b/package/postgis/postgis.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9a2a219da005a1730a39d1959a1c7cec619b1efb009b65be80ffc25bad299068 postgis-3.3.2.tar.gz -sha256 55b69f22e1752830dd565852dc7ff242daf289dbd3a6bfede5db43f90d2e28c9 LICENSE.TXT +sha256 aee9b60a6c884d354164b3096c4657f324454186607f859d1ce05d899798af9d postgis-3.4.0.tar.gz +sha256 2a3bde0a77224496ea6d8efa686da7e29ab0dd6b1a8f90ba12beaf7ae28e878a LICENSE.TXT diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index 4148180adfec..2fb98245a386 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -4,11 +4,11 @@ # ################################################################################ -POSTGIS_VERSION = 3.3.2 +POSTGIS_VERSION = 3.4.0 POSTGIS_SITE = https://download.osgeo.org/postgis/source # parallel build issues POSTGIS_MAKE = $(MAKE1) -POSTGIS_LICENSE = GPL-2.0+ (PostGIS), BSD-2-Clause, MIT, Apache-2.0, ISC, BSL-1.0, CC-BY-SA-3.0 +POSTGIS_LICENSE = GPL-2.0+ (PostGIS), BSD-3-Clause (xsl), GPL-2.0+ or LGPL-3.0+ (SFCGAL), MIT, Apache-2.0, ISC, BSL-1.0, CC-BY-SA-3.0 POSTGIS_LICENSE_FILES = LICENSE.TXT POSTGIS_CPE_ID_VENDOR = postgis # configure.ac is patched so need to run autoreconf From 50827a45ee0eb3f4fa27e10a166c44953f653724 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 20 Sep 2023 23:18:44 +0200 Subject: [PATCH 1985/2890] package/multipath-tools: update hash of README.md Commit 9ca60c004d69e1f38000e3a74151b0a90aca7f21 forgot to update hash of README.md (multipathc added with https://github.com/opensvc/multipath-tools/commit/f220ab6678184b156b800c2885c0147acc9b2aa8) Fixes: - http://autobuild.buildroot.org/results/633ceb38996af7c95331ebe878ae8ba8a4b9b7de Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/multipath-tools/multipath-tools.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index 158f0faa960e..06aa5ccc809a 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -4,4 +4,4 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENS sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 b8b4369c539d6a61ad2a5a359a1ecdfb9f630a89590216d490314e19bf07aa0c README.md +sha256 5887418b2e0e595da5aca08b2dff25298f20618f9894d5e26ce852d9d1ae90c4 README.md From 51c497c90fb4fb009338d223f669fb47f4900e39 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 19 Sep 2023 17:37:08 +0200 Subject: [PATCH 1986/2890] package/python-web2py: bump to version 2.24.1 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-web2py/python-web2py.hash | 2 +- package/python-web2py/python-web2py.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index c0ce0cc3520d..03c71db8a5c8 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 f4066d76290b333bc1bb1cf4c23b612eebde712b7112e90a72e7609a14690d2c python-web2py-2.23.1.tar.gz +sha256 db42d52097d43fa797c29f9ce1493d7356f192dd0c2590ec56f36022252c284b python-web2py-2.24.1.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 2a666cae1742..91c041f6f23d 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.23.1 +PYTHON_WEB2PY_VERSION = 2.24.1 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From 1defedaf0bfdab6da63b52f4fd9b38cd19af19a4 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 19 Sep 2023 17:35:13 +0200 Subject: [PATCH 1987/2890] package/python-pillow: bump to version 10.0.1 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-pillow/python-pillow.hash | 4 ++-- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index bca66a743682..c2c5125678db 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 2a8f327ba2250aad26ed101337c8fa56 Pillow-10.0.0.tar.gz -sha256 9c82b5b3e043c7af0d95792d0d20ccf68f61a1fec6b3530e718b688422727396 Pillow-10.0.0.tar.gz +md5 93a0585ab0ee9717a7576129bdabdf93 Pillow-10.0.1.tar.gz +sha256 d72967b06be9300fed5cfbc8b5bafceec48bf7cdc7dab66b1d2549035287191d Pillow-10.0.1.tar.gz # Locally computed sha256 checksums sha256 0fdb68ffb39062553be40be4e6eaea9700b4f5e870a720ae86b8925d67613ddd LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 95a67f304e3f..d9f6fba86103 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 10.0.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/0f/8b/2ebaf9adcf4260c00f842154865f8730cf745906aa5dd499141fb6063e26 +PYTHON_PILLOW_VERSION = 10.0.1 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/64/9e/7e638579cce7dc346632f020914141a164a872be813481f058883ee8d421 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From 8f9d6e07f2f333ee3feb5bf1e6966a83ef36f40f Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 19 Sep 2023 14:39:57 +0200 Subject: [PATCH 1988/2890] package/python-minimalmodbus: bump to version 2.1.1 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-minimalmodbus/python-minimalmodbus.hash | 2 +- package/python-minimalmodbus/python-minimalmodbus.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-minimalmodbus/python-minimalmodbus.hash b/package/python-minimalmodbus/python-minimalmodbus.hash index b29e83773bc6..635090fae782 100644 --- a/package/python-minimalmodbus/python-minimalmodbus.hash +++ b/package/python-minimalmodbus/python-minimalmodbus.hash @@ -1,4 +1,4 @@ # sha256 from https://pypi.org/project/minimalmodbus -sha256 cf873a2530be3f4b86467c3e4d47b5f69fd345d47451baca4adbf59e2ac36d00 minimalmodbus-2.0.1.tar.gz +sha256 c3f5a56e107d537e4bb420f7e735841ab2939c8ca6fb528f5fe4124571315b64 minimalmodbus-2.1.1.tar.gz # Hash for license file sha256 abe787d472ae2069e935c84eb13fd770518dfb08b92d5f190f3cd7ff6d1f6f32 LICENSE diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk index b463cf9ffe01..5a6e7733beb6 100644 --- a/package/python-minimalmodbus/python-minimalmodbus.mk +++ b/package/python-minimalmodbus/python-minimalmodbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MINIMALMODBUS_VERSION = 2.0.1 +PYTHON_MINIMALMODBUS_VERSION = 2.1.1 PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz -PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/78/99/8cd22b4465e697bae2b02fd06aaccd4c5cdfbb18945d728db99f23d71df9 +PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE From 00e23b82b4b13a5c4603c3e813f82aa8e9ce248c Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 18 Sep 2023 12:30:35 +0200 Subject: [PATCH 1989/2890] package/gtest: bump to version 1.14.0 - tag prefix changed from 'release-' to 'v' - C++14 is now required which gcc5 already provides (tested with bootlin toolchain armv7-eabihf--glibc--stable-2017.05-toolchains-1-1) Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/gtest/Config.in | 2 +- package/gtest/gtest.hash | 2 +- package/gtest/gtest.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gtest/Config.in b/package/gtest/Config.in index 4591cb5e48b6..25d756f72cff 100644 --- a/package/gtest/Config.in +++ b/package/gtest/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_GTEST depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_USE_MMU # fork() help Google's framework for writing C++ tests on a variety of diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index a6dd15a8d24a..5b1dcf44a840 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2 gtest-1.12.1.tar.gz +sha256 8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7 gtest-1.14.0.tar.gz sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 LICENSE diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index a53253228e6e..c252ede818b9 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -4,8 +4,8 @@ # ################################################################################ -GTEST_VERSION = 1.12.1 -GTEST_SITE = $(call github,google,googletest,release-$(GTEST_VERSION)) +GTEST_VERSION = 1.14.0 +GTEST_SITE = $(call github,google,googletest,v$(GTEST_VERSION)) GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO GTEST_LICENSE = BSD-3-Clause From 7dc2462a8e511629e1ea300f32aa43ee1ec74fa1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 18 Sep 2023 13:22:28 +0200 Subject: [PATCH 1990/2890] package/mbedtls: bump to version 2.28.4 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/mbedtls/mbedtls.hash | 4 ++-- package/mbedtls/mbedtls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 2281bd5fe5bf..6aa6d0235d1d 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.3: -sha256 bdf7c5bbdc338da3edad89b2885d4f8668f9a6fffeba6ec17a60333e36dade6f mbedtls-2.28.3.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.4: +sha256 578c4dcd15bbff3f5cd56aa07cd4f850fc733634e3d5947be4f7157d5bfd81ac mbedtls-2.28.4.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 8f09fd72a8f5..62eda6ec9948 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.3 +MBEDTLS_VERSION = 2.28.4 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ From 9041b12d2a9be76e41c0d1e5954f2b973c455af2 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 18 Sep 2023 13:22:38 +0200 Subject: [PATCH 1991/2890] package/open62541: bump to version 1.3.7 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/open62541/open62541.hash | 2 +- package/open62541/open62541.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/open62541/open62541.hash b/package/open62541/open62541.hash index 2e650a1257c2..941aadf4eb25 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 372fd6b2d78823d3f9e8279f78fb43b6af2501603675450a194d2bac65925ca1 open62541-v1.3.6-br1.tar.gz +sha256 410603b0e567970d7148c6e9c91ccabeedeb4f32780be859cd2a4aac08cb5b9e open62541-v1.3.7-br1.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 672fb17be81b..43e1ad6b6137 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.6 +OPEN62541_VERSION = v1.3.7 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES From 23166132ebc6cf406f4eac801c8263dabd602127 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 18 Sep 2023 08:24:55 +0300 Subject: [PATCH 1992/2890] package/libraw: fix IGNORE_CVES assignment Commit bc4110b0739 ("package/libraw: fix CVE-2023-1729") mistakenly added the patch name to IGNORE_CVES instead of the CVE reference. Fix that. Cc: Fabrice Fontaine Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libraw/libraw.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index cbd509cfea8c..63b50e340da9 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -19,7 +19,7 @@ LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" # 0001-do-not-set-shrink-flag-for-3-4-component-images.patch -LIBRAW_IGNORE_CVES += 0001-do-not-set-shrink-flag-for-3-4-component-images.patch +LIBRAW_IGNORE_CVES += CVE-2023-1729 ifeq ($(BR2_PACKAGE_JASPER),y) LIBRAW_CONF_OPTS += --enable-jasper From 405ba7f2a64a05e19f6d4c178cbe48a10f4c3ddf Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Thu, 21 Sep 2023 14:11:13 +0000 Subject: [PATCH 1993/2890] package/nftables: install libnftables to staging Needed for network-config-manager: https://github.com/vmware/network-config-manager/blob/v0.6.4/meson.build#L119 Signed-off-by: TIAN Yuanhao Signed-off-by: Arnout Vandecappelle --- package/nftables/nftables.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 20a7cd07ef97..9cba24337231 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -10,6 +10,7 @@ NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) NFTABLES_LICENSE = GPL-2.0 NFTABLES_LICENSE_FILES = COPYING +NFTABLES_INSTALL_STAGING = YES NFTABLES_SELINUX_MODULES = iptables # Python bindings are handled by package nftables-python From 9a9a41f8dfd4388f6cb0d9d4132ad7cfa7dedf48 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 21 Sep 2023 13:10:16 +0200 Subject: [PATCH 1994/2890] package/esp-hosted: fix build failure on s390x s390x doesn't support Wi-Fi on Linux so let's disable the package for such architecture. Fixes: http://autobuild.buildroot.net/results/f52e8a14330ff281a7096baa47f387f8c1859345 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/esp-hosted/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/esp-hosted/Config.in b/package/esp-hosted/Config.in index 43c802fa440d..42e1afa8c561 100644 --- a/package/esp-hosted/Config.in +++ b/package/esp-hosted/Config.in @@ -1,8 +1,10 @@ comment "esp-hosted needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_ESP_HOSTED bool "esp-hosted" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help This package builds and installs the Linux kernel driver for From 0b764a7d1e6961cb7baa0b3a74de1167bf47a6dd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 21 Sep 2023 12:28:56 +0200 Subject: [PATCH 1995/2890] package/ne10: install shared libraries only when built The install to staging commands of the ne10 package are careful to install the shared libraries only if they are built, but we forgot to use the same care for the install to target commands, causing a build failure on BR2_STATIC_LIBS=y configurations as no shared library was built: cp: cannot stat '/home/autobuild/autobuild/instance-15/output-1/build/ne10-1.2.1/modules/libNE10*.so*': No such file or directory This commit fixes this by guarding the target installation commands to BR2_STATIC_LIBS being empty. The problem exists since the package was introduced in commit 318f3db0dcc052aa770ca57c143b5f7bc40cdaf3 ("ne10: new package"), a good 10 years ago. Most likely it was not seen for many years as this package is only available for ARM with NEON and AArch64, and we were not testing fully static builds, except for ARMv5 that don't have NEON. Now that we are doing more random testing, the problem started being visible. Fixes: http://autobuild.buildroot.net/results/45b2c1af052271bc2f1bb96544f138d29e4f7dfd/ Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- package/ne10/ne10.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk index 39466055568f..ce0f7e7b7750 100644 --- a/package/ne10/ne10.mk +++ b/package/ne10/ne10.mk @@ -42,8 +42,10 @@ define NE10_INSTALL_STAGING_CMDS $(NE10_INSTALL_STAGING_SHARED_LIB) endef +ifeq ($(BR2_STATIC_LIBS),) define NE10_INSTALL_TARGET_CMDS cp -dpf $(@D)/modules/libNE10*.so* $(TARGET_DIR)/usr/lib/ endef +endif $(eval $(cmake-package)) From 6425e0b8482e53d5ab5ff2d655628ba7d4be3960 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Thu, 21 Sep 2023 06:15:18 +0200 Subject: [PATCH 1996/2890] package/sysstat: drop CVE-2022-39377 from IGNORE_CVES As off 2022-11-22 CVE-2022-39377 is listed as affecting sysstat < 2.16.1 instead of < 2.17.1. The text is not updated, but the CPE info is. Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- package/sysstat/sysstat.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index eaf505dc493d..377396d986bf 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -14,9 +14,6 @@ SYSSTAT_LICENSE_FILES = COPYING SYSSTAT_CPE_ID_VENDOR = sysstat_project SYSSTAT_SELINUX_MODULES = sysstat -# NVD is not up-to-date; 12.6.1 includes c1e631eddc50, which fixes the issue -SYSSTAT_IGNORE_CVES += CVE-2022-39377 - ifeq ($(BR2_PACKAGE_LM_SENSORS),y) SYSSTAT_DEPENDENCIES += lm-sensors SYSSTAT_CONF_OPTS += --enable-sensors From ec8a9cc5189d41cf751e872f5c13da3fdc9187ee Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 18 Sep 2023 21:45:19 +0200 Subject: [PATCH 1997/2890] package/tcl: fix package patch The commit 4e365d1768 "package/tcl: bump to version 8.6.13" did NOT refreshed the package patch, because the patch was still applying correctly and the package was working as expected. It was refreshed in the previous bump, in commit 9cf314745a "package/tcl: bump to version 8.6.12". This was part of 2022.02. Looking closer at the patch content, the -/+ lines are exactly the same. So this patch does not change anything. Since the file was kept and the commit log mention a patch refresh, the intent was more likely to carry over the old patch (which was declaring all libc functions as "unbroken". This commit actually refreshes this patch. It was regenerated with git format-patch. Since the patch is renamed due to git format-patch, the .checkpackageignore is updated accordingly. Note: This ancient patch will be removed soon, as an upstream commit [1], not yet in a release, cleaned up and removed those old parts. [1] https://github.com/tcltk/tcl/commit/04d66a25716cb7738dad3170cca4d0a4683db08a Cc: Fabrice Fontaine Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 2 +- ... 0001-Disable-tcl-compatibility-layers.patch} | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) rename package/tcl/{0001-dont-build-compat.patch => 0001-Disable-tcl-compatibility-layers.patch} (61%) diff --git a/.checkpackageignore b/.checkpackageignore index 8acd9558ebd1..f8aaf41af909 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1388,7 +1388,7 @@ package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch Upstr package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch Upstream package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch Upstream package/tcf-agent/S55tcf-agent Shellcheck Variables -package/tcl/0001-dont-build-compat.patch Upstream +package/tcl/0001-Disable-tcl-compatibility-layers.patch Upstream package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch Upstream package/tesseract-ocr/0002-configure.ac-fix-build-on-aarch64_be.patch Upstream package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch Upstream diff --git a/package/tcl/0001-dont-build-compat.patch b/package/tcl/0001-Disable-tcl-compatibility-layers.patch similarity index 61% rename from package/tcl/0001-dont-build-compat.patch rename to package/tcl/0001-Disable-tcl-compatibility-layers.patch index 7a7d959cd254..b7b776ad5ddf 100644 --- a/package/tcl/0001-dont-build-compat.patch +++ b/package/tcl/0001-Disable-tcl-compatibility-layers.patch @@ -1,4 +1,6 @@ +From c829552921f0c7c8e522f911135ee100742b441b Mon Sep 17 00:00:00 2001 From: Andrew Ruder +Date: Tue, 8 Apr 2014 15:54:04 -0500 Subject: [PATCH] Disable tcl compatibility layers Turn off building compatibility layers for old/broken versions of @@ -9,17 +11,25 @@ to not have broken behavior. Signed-off-by: Andrew Ruder [Fabrice: Update for 8.6.12] Signed-off-by: Fabrice Fontaine +[Julien: Update for 8.6.13] +Signed-off-by: Julien Olivain --- + unix/tcl.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unix/tcl.m4 b/unix/tcl.m4 +index ca94abd4ad..42eb58d384 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 -@@ -2725,7 +2725,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ +@@ -2646,7 +2646,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ #include #include int main() {]$2[}]]])],[tcl_cv_$1_unbroken=ok], - [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=unknown])) -+ [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=unknown])) - if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then ++ [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=ok])) + if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then tcl_ok=1 else +-- +2.41.0 + From 90cfb81b510f9cae3bf2972b9cd5a362cbd4fa12 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 18 Sep 2023 09:59:36 +0200 Subject: [PATCH 1998/2890] package/python-can: bump to version 4.2.2 Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle --- package/python-can/python-can.hash | 4 ++-- package/python-can/python-can.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index 73be23020160..35e752ea5477 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-can/json -md5 d8365b7a09e49f47dac0da75d8518808 python-can-4.1.0.tar.gz -sha256 3f2b6b0dc5f459591d171ee0c0136dce79acedc2740ce695024aa3444e911bb9 python-can-4.1.0.tar.gz +md5 26d799fe952cb590fba03f3d26ee66a4 python-can-4.2.2.tar.gz +sha256 6ad50f4613289f3c4d276b6d2ac8901d776dcb929994cce93f55a69e858c595f python-can-4.2.2.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index ba98337d5d36..012c82682c62 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 4.1.0 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/90/55/898e69e37d5d4692bf21ba8750e095493d2ecbb29be7394d5cb735f0ab0f +PYTHON_CAN_VERSION = 4.2.2 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/dd/f1/327caaf05b6bca594250053058a2adac537a88dfb5c41bb5498cfda9de78 PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt From ba3c548562300e2956de1ae610aefb32e7cc24f2 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 18 Sep 2023 09:42:20 +0200 Subject: [PATCH 1999/2890] package/grep: bump to version 3.11 No security fixes introduced in the latest version. Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle --- package/grep/grep.hash | 4 ++-- package/grep/grep.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/grep/grep.hash b/package/grep/grep.hash index 142d15644de2..a0028a4e2f36 100644 --- a/package/grep/grep.hash +++ b/package/grep/grep.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -# https://ftp.gnu.org/gnu/grep/grep-3.10.tar.xz.sig +# https://ftp.gnu.org/gnu/grep/grep-3.11.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 24efa5b595fb5a7100879b51b8868a0bb87a71c183d02c4c602633b88af6855b grep-3.10.tar.xz +sha256 1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab grep-3.11.tar.xz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 2f3b405f93c8..61900bb9571c 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ################################################################################ -GREP_VERSION = 3.10 +GREP_VERSION = 3.11 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPL-3.0+ From 6fd23d68d53f13fe041894ac2eaf746874ce5a2c Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 18 Sep 2023 08:48:00 +0200 Subject: [PATCH 2000/2890] package/catch2: bump to version 3.4.0 Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle --- package/catch2/catch2.hash | 2 +- package/catch2/catch2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash index b533792f8f9f..88a6a06df256 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d90351cdc55421f640c553cfc0875a8c834428679444e8062e9187d05b18aace catch2-3.3.1.tar.gz +sha256 122928b814b75717316c71af69bd2b43387643ba076a6ec16e7882bfb2dfacbb catch2-3.4.0.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index 6e4af3d670af..580ddca5da1c 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.3.1 +CATCH2_VERSION = 3.4.0 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO From 565e494f8649a4085d6733c067aaf0927fc4ed85 Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Sun, 17 Sep 2023 22:54:16 +0200 Subject: [PATCH 2001/2890] package/linux-firmware: add iwlwifi quz firmware This commit integrates support for the iwlwifi QuZ firmware files to support the wifi chipsets for the intel NUC10 type of hardware. Thus, this change adds BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_QUZ. Signed-off-by: Jens Maus Signed-off-by: Arnout Vandecappelle --- package/linux-firmware/Config.in | 6 ++++++ package/linux-firmware/linux-firmware.mk | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 46e538776d01..5befe501228b 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -279,6 +279,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6E Firmware files for the Intel Wi-Fi 6 and Wi-Fi 6E devices supported by the iwlwifi kernel driver. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_QUZ + bool "Intel iwlwifi QuZ" + help + Firmware files for the Intel Wifi QuZ devices (used in NUC10) + supported by the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8 bool "Libertas SD 8686 v8" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index f8c239d8165b..0cd1f30c1622 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -527,6 +527,11 @@ LINUX_FIRMWARE_FILES += iwlwifi-so-a0-gf-a0*.{ucode,pnvm} LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_QUZ),y) +LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3),y) LINUX_FIRMWARE_FILES += tigon/* # No license file; the license is in the file WHENCE From 579896c2f240c927767b68979b12bf4747199a16 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 17 Sep 2023 22:29:26 +0200 Subject: [PATCH 2002/2890] package/expect: update Kconfig package URL The old expect homepage URL [1] is now redirecting to [2]. This commit updates the URL to the new one. [1] http://expect.sourceforge.net/ [2] https://core.tcl.tk/expect/ Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/expect/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/expect/Config.in b/package/expect/Config.in index 5557f4aee653..67dfe643b2dd 100644 --- a/package/expect/Config.in +++ b/package/expect/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_EXPECT Expect is a tool for automating interactive applications such as telnet, ftp, passwd, fsck, rlogin, ssh, tip, etc. - http://expect.sourceforge.net/ + https://core.tcl.tk/expect/ From 056958724b8c7581aff2bc022841c1ca6db1e590 Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Sun, 17 Sep 2023 22:29:17 +0200 Subject: [PATCH 2003/2890] package/fio: remove -march=native Per default, the fio package uses the "-march=native" GCC option. This is of course wildly inappropriate for cross-compilation and can result in illegal instructions. Thus we make sure fio will not use that compiler option by adding --disable-native to FIO_OPTS. Signed-off-by: Jens Maus Signed-off-by: Arnout Vandecappelle --- package/fio/fio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fio/fio.mk b/package/fio/fio.mk index b1763d6c7380..f6e7b036bb65 100644 --- a/package/fio/fio.mk +++ b/package/fio/fio.mk @@ -9,7 +9,7 @@ FIO_SITE = http://brick.kernel.dk/snaps FIO_LICENSE = GPL-2.0 FIO_LICENSE_FILES = COPYING MORAL-LICENSE -FIO_OPTS = --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)" +FIO_OPTS = --disable-native --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBAIO),y) FIO_DEPENDENCIES += libaio From c6e40c2e3e450bc8018638acf937868757ab28a4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Sep 2023 22:13:48 +0200 Subject: [PATCH 2004/2890] package/pound: include limits.h Fix the following build failure raised since bump to version 4.8 in commit 525cb6a8fbe04a959ea6e3a21a3f6f8828d7e9dc and https://github.com/graygnuorg/pound/commit/c951f2357d9f606a9e1f8727e74b55f1da91fa2f: Fixes: - http://autobuild.buildroot.org/results/4edfffcd5d4383c57947d97139331e0bf2cb6155 Signed-off-by: Fabrice Fontaine --- package/pound/0001-include-limits.h.patch | 75 +++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 package/pound/0001-include-limits.h.patch diff --git a/package/pound/0001-include-limits.h.patch b/package/pound/0001-include-limits.h.patch new file mode 100644 index 000000000000..8f188af07c2c --- /dev/null +++ b/package/pound/0001-include-limits.h.patch @@ -0,0 +1,75 @@ +From a0374d946e55129b36ba1e0024e1d94675a8f044 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Sep 2023 22:01:21 +0200 +Subject: [PATCH] include limits.h + +Include limits.h to avoid the following build failure: + +poundctl.c: In function 'oi_getn': +poundctl.c:232:29: error: 'INT_MAX' undeclared (first use in this function) + 232 | if (errno || n < 0 || n > INT_MAX) + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/4edfffcd5d4383c57947d97139331e0bf2cb6155 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/graygnuorg/pound/pull/17 +--- + src/config.c | 1 + + src/poundctl.c | 1 + + src/svc.c | 1 + + src/tmpl.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/src/config.c b/src/config.c +index b7e3150..12f5cfa 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -21,6 +21,7 @@ + #include "extern.h" + #include + #include ++#include + + + /* +diff --git a/src/poundctl.c b/src/poundctl.c +index bd1459f..7fa18c8 100644 +--- a/src/poundctl.c ++++ b/src/poundctl.c +@@ -19,6 +19,7 @@ + #include "pound.h" + #include "json.h" + #include ++#include + + char *conf_name = POUND_CONF; + char *socket_name; +diff --git a/src/svc.c b/src/svc.c +index 6e810a6..457f1e0 100644 +--- a/src/svc.c ++++ b/src/svc.c +@@ -20,6 +20,7 @@ + #include "pound.h" + #include "extern.h" + #include "json.h" ++#include + + /* + * basic hashing function, based on fmv +diff --git a/src/tmpl.c b/src/tmpl.c +index 2efa72f..0e5b65d 100644 +--- a/src/tmpl.c ++++ b/src/tmpl.c +@@ -26,6 +26,7 @@ + + #include "pound.h" + #include ++#include + #include "json.h" + + static void +-- +2.40.1 + From 5724145b1e7c70e44cc1b5befa3f11198bf497c7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Sep 2023 21:48:04 +0200 Subject: [PATCH 2005/2890] package/libuv: needs gcc >= 4.9 libuv unconditionally uses stdatomic since https://github.com/libuv/libuv/commit/2f33980a9141bd49cb2c34361854355b23b1e6fc resulting in the following build failure with gcc < 4.9 since bump to version 1.45.0 in commit 21764235cb7f7fb767ea4b5d825e39c711aee235: In file included from src/fs-poll.c:23:0: src/uv-common.h:41:24: fatal error: stdatomic.h: No such file or directory # include ^ Fixes: - http://autobuild.buildroot.org/results/6b9ce25ba7e5c5602313d533f460f8829f767f81 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/bind/Config.in | 6 ++++-- package/cmake/Config.in | 6 +++--- package/libuv/Config.in | 6 ++++-- package/luv/Config.in | 6 ++++-- package/luvi/Config.in | 6 ++++-- package/moarvm/Config.in | 6 ++++-- package/netdata/Config.in | 6 ++++-- package/python-uvloop/Config.in | 6 ++++-- package/ttyd/Config.in | 6 ++++-- package/wampcc/Config.in | 6 ++++-- package/xmrig/Config.in | 6 ++++-- 11 files changed, 43 insertions(+), 23 deletions(-) diff --git a/package/bind/Config.in b/package/bind/Config.in index 63ccd57db7c0..512e948ca226 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_BIND depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on !BR2_STATIC_LIBS # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_OPENSSL help @@ -43,7 +44,8 @@ config BR2_PACKAGE_BIND_TOOLS endif -comment "bind needs a toolchain w/ NPTL, dynamic library" +comment "bind needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 4ef5612b577e..00692fe78a9d 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_CMAKE config BR2_PACKAGE_CMAKE_CTEST bool "ctest" depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # jsoncpp, libuv depends on BR2_USE_WCHAR # libarchive depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS @@ -40,10 +40,10 @@ config BR2_PACKAGE_CMAKE_CTEST http://www.cmake.org/ -comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL" +comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.9, NPTL" depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package/libuv/Config.in b/package/libuv/Config.in index cdd73a672f1d..e23b2c5fe0dc 100644 --- a/package/libuv/Config.in +++ b/package/libuv/Config.in @@ -4,13 +4,15 @@ config BR2_PACKAGE_LIBUV depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h help libuv is a multi-platform support library with a focus on asynchronous I/O. https://github.com/libuv/libuv -comment "libuv needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "libuv needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/luv/Config.in b/package/luv/Config.in index 434cb3b459a3..d6aff8b6f7c8 100644 --- a/package/luv/Config.in +++ b/package/luv/Config.in @@ -4,13 +4,15 @@ config BR2_PACKAGE_LUV depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV help libuv bindings for LuaJIT and Lua. https://github.com/luvit/luv -comment "luv needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "luv needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/luvi/Config.in b/package/luvi/Config.in index 6e96f85f32cd..3a724acebb75 100644 --- a/package/luvi/Config.in +++ b/package/luvi/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LUVI depends on !BR2_STATIC_LIBS # libuv depends on BR2_PACKAGE_LUAJIT depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LUV select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL @@ -25,8 +26,9 @@ config BR2_PACKAGE_LUVI https://github.com/luvit/luvi -comment "luvi needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "luvi needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/moarvm/Config.in b/package/moarvm/Config.in index 11d8ac7ebc19..6972a5f8a649 100644 --- a/package/moarvm/Config.in +++ b/package/moarvm/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_MOARVM depends on BR2_USE_MMU # libuv depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # libatomic_ops depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LIBTOMMATH select BR2_PACKAGE_LIBATOMIC_OPS @@ -18,8 +19,9 @@ config BR2_PACKAGE_MOARVM http://moarvm.com -comment "moarvm needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "moarvm needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/netdata/Config.in b/package/netdata/Config.in index 34d139125d7a..d17b5e89aae8 100644 --- a/package/netdata/Config.in +++ b/package/netdata/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_NETDATA depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID @@ -35,7 +36,8 @@ comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 4.8" endif -comment "netdata needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "netdata needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/python-uvloop/Config.in b/package/python-uvloop/Config.in index b3fb275091aa..c9a05111cb3d 100644 --- a/package/python-uvloop/Config.in +++ b/package/python-uvloop/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_UVLOOP depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_PYTHON3_SSL help @@ -11,7 +12,8 @@ config BR2_PACKAGE_PYTHON_UVLOOP http://github.com/MagicStack/uvloop -comment "python-uvloop needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "python-uvloop needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU diff --git a/package/ttyd/Config.in b/package/ttyd/Config.in index ecc705b17e94..103a4ac4aa88 100644 --- a/package/ttyd/Config.in +++ b/package/ttyd/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_TTYD depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv, json-c depends on BR2_USE_MMU # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LIBWEBSOCKETS @@ -15,7 +16,8 @@ config BR2_PACKAGE_TTYD https://github.com/tsl0922/ttyd -comment "ttyd needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "ttyd needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/wampcc/Config.in b/package/wampcc/Config.in index 92abc9cb25ab..41919361136e 100644 --- a/package/wampcc/Config.in +++ b/package/wampcc/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_WAMPCC depends on !BR2_STATIC_LIBS # libuv depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future select BR2_PACKAGE_LIBUV select BR2_PACKAGE_JANSSON @@ -16,12 +17,13 @@ config BR2_PACKAGE_WAMPCC https://github.com/darrenjs/wampcc -comment "wampcc needs a toolchain w/ C++, NPTL, dynamic library" +comment "wampcc needs a toolchain w/ C++, NPTL, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 comment "wampcc needs a toolchain not affected by GCC bug 64735" depends on BR2_USE_MMU diff --git a/package/xmrig/Config.in b/package/xmrig/Config.in index 4dd16fa2b05f..0b5f5370e4e8 100644 --- a/package/xmrig/Config.in +++ b/package/xmrig/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_XMRIG # xmrig needs fenv.h which is not provided by uclibc depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_STATIC_LIBS # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBUV help @@ -22,10 +23,11 @@ config BR2_PACKAGE_XMRIG https://xmrig.com -comment "xmrig needs a glibc or musl toolchain w/ NPTL, dynamic library, C++" +comment "xmrig needs a glibc or musl toolchain w/ NPTL, dynamic library, C++, gcc >= 4.9" depends on BR2_PACKAGE_XMRIG_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ BR2_TOOLCHAIN_USES_UCLIBC || BR2_STATIC_LIBS || \ - !BR2_INSTALL_LIBSTDCPP + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From 6e7bc7ee8ce02d7bad20566d86982b26641235bb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Sep 2023 21:22:43 +0200 Subject: [PATCH 2006/2890] package/swupdate: fix musl build Fix the following musl build failure raised since bump to version 2023.05 in commit b86542085df87da91057017b17f261a213bfd918 and https://github.com/sbabic/swupdate/commit/8228b1390632195158f4387d7aae659ebd6f1469: In file included from core/bootloader.c:9: include/util.h:210:23: error: unknown type name 'mode_t' 210 | int mkpath(char *dir, mode_t mode); | ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/e545f294c7f032fd7434fdb91aa18a38b2e19038 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...001-include-util-h-fix-build-on-musl.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/swupdate/0001-include-util-h-fix-build-on-musl.patch diff --git a/package/swupdate/0001-include-util-h-fix-build-on-musl.patch b/package/swupdate/0001-include-util-h-fix-build-on-musl.patch new file mode 100644 index 000000000000..d1e0db6b56cf --- /dev/null +++ b/package/swupdate/0001-include-util-h-fix-build-on-musl.patch @@ -0,0 +1,41 @@ +From 1999685830d6e9b57014666b9e53e46de17a471c Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Fri, 15 Sep 2023 18:14:57 +0900 +Subject: [PATCH] include/util.h: fix build on musl + +Building on musl 1.2.4 fails with the following error/warnings: + +include/util.h:211:23: error: unknown type name 'mode_t' + 211 | int mkpath(char *dir, mode_t mode); +include/util.h:269:36: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration + 269 | char *swupdate_time_iso8601(struct timeval *tv); + +These were caused by a recent reorganization of the headers and glibc +appears more tolerant here. + +Fixes: 8228b1390632 ("Reorganize includes to have smaller files") +Signed-off-by: Dominique Martinet +Upstream: https://github.com/sbabic/swupdate/commit/1999685830d6e9b57014666b9e53e46de17a471c +Signed-off-by: Fabrice Fontaine +--- + include/util.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/util.h b/include/util.h +index 2f5c7adc..5f4cdc01 100644 +--- a/include/util.h ++++ b/include/util.h +@@ -8,11 +8,13 @@ + #ifndef _UTIL_H + #define _UTIL_H + ++#include + #include + #include + #include + #include + #include ++#include + #if defined(__linux__) + #include + #endif From de349df08c653a822166f94dbe01295a5a3cfa6e Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 17 Sep 2023 22:51:07 +0200 Subject: [PATCH 2007/2890] docs/manual: add section to explain how to give credits to a sponsor Sometimes it happens that a Company or a Physical Person sponsors the creation and/or the upstreaming process of a patch, but at the moment there is no way to give credits to it. In Linux they prepend '+sponsor' to the e-mail of the contributor in both authorship and commit log tag as discussed here[0]. So let's describe in the manual how to do that as a standard. [0]: https://lore.kernel.org/linux-doc/20230817220957.41582-1-giulio.benetti@benettiengineering.com/ Signed-off-by: Giulio Benetti [yann.morin.1998@free.fr: - reword to reference sub-addressing and the RFC - move to the "submitting patches" section, that already deals with SoB tags - differentiate between Your/Their names ] Signed-off-by: Yann E. MORIN --- docs/manual/contribute.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 94f1c64496fd..15fe36aef03e 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -247,6 +247,23 @@ which have the upstream license), and that you are allowed to do so. See http://developercertificate.org/[the Developer Certificate of Origin] for details. +To give credits to who sponsored the creation of a patch or the process of +upstreaming it, you may use +https://datatracker.ietf.org/doc/html/rfc5233[email subaddressing] for +your git identity (i.e. what is used as commit author and email +From:+ +field, as well as your Signed-off-by tag); add suffix to the local part, +separated from it by a plus `+` sign. E.g.: + +* for a company which sponsored the submitted work, use the company name + as the detail (suffix) part: ++ +`Your-Name Your-Surname ` + +* for an individual who sponsored who sponsored the submitted work, use + their name and surname: ++ +`Your-Name Your-Surname ` + When adding new packages, you should submit every package in a separate patch. This patch should have the update to +package/Config.in+, the package +Config.in+ file, the +.mk+ file, the From 3ba27e682a861e304138fa2a460c10db2c83abe4 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sat, 9 Sep 2023 09:57:50 +0200 Subject: [PATCH 2008/2890] package/webkitgtk: security bump to version 2.40.5 Bugfix release with many security fixes, including (but not limited to) patches for CVE-2023-37450, CVE-2023-38133, CVE-2023-38572, CVE-2023-38592, CVE-2023-38594, CVE-2023-38595, CVE-2023-38597, CVE-2023-38599, CVE-2023-38600, and CVE-2023-38611. Release notes: https://webkitgtk.org/2023/07/21/webkitgtk2.40.4-released.html https://webkitgtk.org/2023/08/01/webkitgtk2.40.5-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0006.html https://webkitgtk.org/security/WSA-2023-0007.html Signed-off-by: Thomas Devoogdt Signed-off-by: Yann E. MORIN --- ...e-when-gstreamer-support-is-disabled.patch | 36 +++++++++++++++++++ package/webkitgtk/webkitgtk.hash | 6 ++-- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch diff --git a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch b/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch new file mode 100644 index 000000000000..3fa23b215bdb --- /dev/null +++ b/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch @@ -0,0 +1,36 @@ +From 9b31965cdf362768e86f7e592e59e68fb3351261 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Tue, 8 Aug 2023 16:51:25 -0700 +Subject: [PATCH] Fix build failure when gstreamer support is disabled + https://bugs.webkit.org/show_bug.cgi?id=259931 https://bugs.gentoo.org/911663 + +Reviewed by Carlos Alberto Lopez Perez. + +* Source/WebCore/loader/MixedContentChecker.cpp: + +Canonical link: https://commits.webkit.org/260527.429@fix-build + +(cherry picked from commit f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732) + +Upstream: https://github.com/WebKit/WebKit/commit/f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732 +Signed-off-by: Thomas Devoogdt +--- + Source/WebCore/loader/MixedContentChecker.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/WebCore/loader/MixedContentChecker.cpp b/Source/WebCore/loader/MixedContentChecker.cpp +index 9b4c7fe62020..ac4733bc08bc 100644 +--- a/Source/WebCore/loader/MixedContentChecker.cpp ++++ b/Source/WebCore/loader/MixedContentChecker.cpp +@@ -33,6 +33,8 @@ + #include "ContentSecurityPolicy.h" + #include "Document.h" + #include "Frame.h" ++#include "FrameLoader.h" ++#include "FrameLoaderClient.h" + #include "SecurityOrigin.h" + + namespace WebCore { +-- +2.42.0 + diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 756ac13ec280..7f50f1aa7b21 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.40.3.tar.xz.sums -sha1 74ee7241f2add46897019e22bd4f8e19e09027bb webkitgtk-2.40.3.tar.xz -sha256 cc0aa83f40dbc64c1c6ae42ec6b85af4be2a9dbf524cfcb95f89a367fb5098dd webkitgtk-2.40.3.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.40.5.tar.xz.sums +sha1 2f4d06b021115eb4106177f7d5f534f45b5d3b2e webkitgtk-2.40.5.tar.xz +sha256 7de051a263668621d91a61a5eb1c3771d1a7cec900043d4afef06c326c16037f webkitgtk-2.40.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 32f6102797f8..71599477f248 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.40.3 +WEBKITGTK_VERSION = 2.40.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From a23251d3f738b44eab40375fc8822e0358d70517 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Sat, 9 Sep 2023 09:57:51 +0200 Subject: [PATCH 2009/2890] package/webkitgtk: allow both X11 and Wayland Allow enabling support for both the X11 and Wayland backends. This in turn needs reorganizing how desktop GL or OpenGL ES is chosen, as it no longer can depend on whether Wayland support is enabled: the BR2_PACKAGE_HAS_LIBGL and BR2_PACKAGE_HAS_LIBGLES variables are both checked, and ENABLE_GLES2 is set only if the package providing OpenGL claims only GLES is supported; otherwise desktop GL is preferred. This matches the existing logic. The existing comment indicating that only one of both windowing systems can be enabled was wrong: the same WebKitGTK build can target both X11 and Wayland at the same time, as long as GTK itself has been built accordingly. Enabling both is the approach taken by most Linux distributions, and has been supported for years. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Devoogdt Signed-off-by: Yann E. MORIN --- package/webkitgtk/webkitgtk.mk | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 71599477f248..bb6df3d592bc 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -80,32 +80,32 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF endif -# Only one target platform can be built, assume X11 > Wayland +# Use GLES if available and desktop GL is not. +ifeq ($(BR2_PACKAGE_HAS_LIBGL):$(BR2_PACKAGE_HAS_LIBGLES),:y) +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON +WEBKITGTK_DEPENDENCIES += libgles +else +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF +endif -# GTK3-X11 target gives OpenGL from newer libgtk3 versions -# Consider this better than EGL + maybe GLESv2 since both can't be built -# 2D CANVAS acceleration requires OpenGL proper with cairo-gl ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=OFF \ - -DENABLE_X11_TARGET=ON +WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt -else # !X11 -# GTK3-BROADWAY/WAYLAND needs at least EGL -WEBKITGTK_DEPENDENCIES += libegl -# GLESv2 support is optional though -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON -WEBKITGTK_DEPENDENCIES += libgles else -# Disable general OpenGL (shading) if there's no GLESv2 -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=OFF endif -# We must explicitly state the wayland target + ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON +WEBKITGTK_DEPENDENCIES += libegl +else +WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=OFF endif + +# If only the GTK Broadway backend is enabled, EGL is still needed. +ifeq ($(BR2_PACKAGE_LIBGTK3_X11):$(BR2_PACKAGE_LIBGTK3_WAYLAND):$(BR2_PACKAGE_LIBGTK3_BROADWAY),::y) +WEBKITGTK_DEPENDENCIES += libegl endif ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND)$(BR2_PACKAGE_WPEBACKEND_FDO),yy) From 38063994d65537f22cec558e8a1c44f71e1dbfaa Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 17 Sep 2023 12:41:24 +0200 Subject: [PATCH 2010/2890] package/tcllib: bump to version 1.21 For change log, see: https://core.tcl-lang.org/tcllib/doc/tcllib-1-21/support/releases/history/README-1.21.txt Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/tcllib/tcllib.hash | 4 ++-- package/tcllib/tcllib.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tcllib/tcllib.hash b/package/tcllib/tcllib.hash index fb80841998ec..fe0ece238e53 100644 --- a/package/tcllib/tcllib.hash +++ b/package/tcllib/tcllib.hash @@ -1,5 +1,5 @@ -# From https://core.tcl-lang.org/tcllib/uv/tcllib-1.20.SHA256 -sha256 199e8ec7ee26220e8463bc84dd55c44965fc8ef4d4ac6e4684b2b1c03b1bd5b9 tcllib-1.20.tar.xz +# From https://core.tcl-lang.org/tcllib/uv/tcllib-1.21.SHA256 +sha256 10c7749e30fdd6092251930e8a1aa289b193a3b7f1abf17fee1d4fa89814762f tcllib-1.21.tar.xz # Locally computed: sha256 38e1f556213f4008cfd280457af57c76a1fe043dc026ece1c704c09b5f6e865c license.terms diff --git a/package/tcllib/tcllib.mk b/package/tcllib/tcllib.mk index 0f60eb8acaa7..1f2b575b2963 100644 --- a/package/tcllib/tcllib.mk +++ b/package/tcllib/tcllib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCLLIB_VERSION = 1.20 +TCLLIB_VERSION = 1.21 TCLLIB_SOURCE = tcllib-$(TCLLIB_VERSION).tar.xz TCLLIB_SITE = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION) TCLLIB_LICENSE = TCL From a34a370f4ea27981be43df817f49320a59088e68 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Wed, 6 Sep 2023 22:09:27 +0200 Subject: [PATCH 2011/2890] package/libssh: ignore CVE-2023-3603 The affected code isn't present in any release, see [0]. [0]: https://www.libssh.org/2023/07/14/cve-2023-3603-potential-null-dereference-in-libsshs-sftp-server/ The CPE entry for this CVE is cpe:2.3:a:libssh:libssh:-:*:*:*:*:*:*:* We interpret the "-" as matching any version. It actually means "unspecified version", which is the cop-out in case there is nothing useful to match. We can't really make our infrastructure ignore "-" entirely, because for all we know our version is an unreleased commit sha which _is_ vulnerable. Thus, the only way out is an exclusion which we'll never be able to remove. Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- package/libssh/libssh.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index e770d2b92443..ff4cddaf91dc 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -17,6 +17,10 @@ LIBSSH_CONF_OPTS = \ -DWITH_STACK_PROTECTOR=OFF \ -DWITH_EXAMPLES=OFF +# Not part of any release +# https://www.libssh.org/2023/07/14/cve-2023-3603-potential-null-dereference-in-libsshs-sftp-server/ +LIBSSH_IGNORE_CVES += CVE-2023-3603 + ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) LIBSSH_CONF_OPTS += -DWITH_STACK_CLASH_PROTECTION=OFF endif From 868be6f6ae8db1090b97b618d7dca4ec4d9799ed Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Wed, 6 Sep 2023 21:44:17 +0200 Subject: [PATCH 2012/2890] package/libcoap: fix CVE-2023-30362 Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- ...0001-Backport-fix-for-CVE-2023-30362.patch | 59 +++++++++++++++++++ package/libcoap/libcoap.mk | 2 + 2 files changed, 61 insertions(+) create mode 100644 package/libcoap/0001-Backport-fix-for-CVE-2023-30362.patch diff --git a/package/libcoap/0001-Backport-fix-for-CVE-2023-30362.patch b/package/libcoap/0001-Backport-fix-for-CVE-2023-30362.patch new file mode 100644 index 000000000000..ddc532929937 --- /dev/null +++ b/package/libcoap/0001-Backport-fix-for-CVE-2023-30362.patch @@ -0,0 +1,59 @@ +From c63ecbdc6b38cc7e571a72964fe9ca63834dcc89 Mon Sep 17 00:00:00 2001 +From: Jon Shallow +Date: Wed, 6 Sep 2023 21:38:13 +0200 +Subject: [PATCH] Backport fix for CVE-2023-30362 + +Upstream: https://github.com/obgm/libcoap/issues/1063#issuecomment-1626962307 +Signed-off-by: Daniel Lang +--- + src/net.c | 34 +++++++++++++++++++++------------- + 1 file changed, 21 insertions(+), 13 deletions(-) + +diff --git a/src/net.c b/src/net.c +index 98859443..e259ab00 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -1305,19 +1305,27 @@ coap_send_internal(coap_session_t *session, coap_pdu_t *pdu) { + + /* Need to check that we are not seeing this proxy in the return loop */ + if (pdu->data && opt == NULL) { +- if (pdu->used_size + 1 <= pdu->max_size) { +- char *a_match; +- size_t data_len = pdu->used_size - (pdu->data - pdu->token); +- pdu->data[data_len] = '\000'; +- a_match = strstr((char*)pdu->data, cp); +- if (a_match && (a_match == (char*)pdu->data || a_match[-1] == ' ') && +- ((size_t)(a_match - (char*)pdu->data + len) == data_len || +- a_match[len] == ' ')) { +- coap_log(LOG_WARNING, "Proxy loop detected '%s'\n", +- (char*)pdu->data); +- coap_delete_pdu(pdu); +- return (coap_mid_t)COAP_DROPPED_RESPONSE; +- } ++ char *a_match; ++ size_t data_len; ++ ++ if (pdu->used_size + 1 > pdu->max_size) { ++ /* No space */ ++ return (coap_mid_t)COAP_DROPPED_RESPONSE; ++ } ++ if (!coap_pdu_resize(pdu, pdu->used_size + 1)) { ++ /* Internal error */ ++ return (coap_mid_t)COAP_DROPPED_RESPONSE; ++ } ++ data_len = pdu->used_size - (pdu->data - pdu->token); ++ pdu->data[data_len] = '\000'; ++ a_match = strstr((char*)pdu->data, cp); ++ if (a_match && (a_match == (char*)pdu->data || a_match[-1] == ' ') && ++ ((size_t)(a_match - (char*)pdu->data + len) == data_len || ++ a_match[len] == ' ')) { ++ coap_log(LOG_WARNING, "Proxy loop detected '%s'\n", ++ (char*)pdu->data); ++ coap_delete_pdu(pdu); ++ return (coap_mid_t)COAP_DROPPED_RESPONSE; + } + } + if (pdu->used_size + len + 1 <= pdu->max_size) { +-- +2.42.0 + diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index 4b536d81176d..3773ad293cbe 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -14,6 +14,8 @@ LIBCOAP_DEPENDENCIES = host-pkgconf LIBCOAP_CONF_OPTS = \ --disable-examples --disable-examples-source --without-tinydtls LIBCOAP_AUTORECONF = YES +# 0001-Backport-fix-for-CVE-2023-30362.patch +LIBCOAP_IGNORE_CVES += CVE-2023-30362 ifeq ($(BR2_PACKAGE_GNUTLS),y) LIBCOAP_DEPENDENCIES += gnutls From 20c023a3b1363f914a18652a79f83648af2cf1e6 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Wed, 6 Sep 2023 21:44:19 +0200 Subject: [PATCH 2013/2890] package/libcoap: ignore CVE-2023-35862 According to a collaborator [0] the affected code isn't in 4.3.1 [0]: https://github.com/obgm/libcoap/issues/1117 Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- package/libcoap/libcoap.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index 3773ad293cbe..94bfc5970205 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -16,6 +16,8 @@ LIBCOAP_CONF_OPTS = \ LIBCOAP_AUTORECONF = YES # 0001-Backport-fix-for-CVE-2023-30362.patch LIBCOAP_IGNORE_CVES += CVE-2023-30362 +# Doesn't affect 4.3.1, see https://github.com/obgm/libcoap/issues/1117 +LIBCOAP_IGNORE_CVES += CVE-2023-35862 ifeq ($(BR2_PACKAGE_GNUTLS),y) LIBCOAP_DEPENDENCIES += gnutls From 719921bebe1704f5b88b7419bac1fb1105c0c151 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 23 Sep 2023 20:34:24 +0200 Subject: [PATCH 2014/2890] package/kexec: bump to version 2.0.27 For release announce, see: https://lists.infradead.org/pipermail/kexec/2023-August/027830.html This new version introduced a usage of memfd_create() in [1]. This function was introduced in Kernel 3.17. Therefore, this commit adds this new dependency. This direct use of memfd_create() requires a glibc >= 2.27. As is, this version would no longer work with uclibc-ng or musl libc. This commit also adds a patch to allow compilation with glibc < 2.27, and also uclibc and musl. See the patch commit log for more details. [1] https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=714fa11590febc9cf6fd3c6309374a040a05ebb0 Signed-off-by: Julien Olivain [yann.morin.1998@free.fr: add arch dependency to comment] Signed-off-by: Yann E. MORIN --- ...memfd_create-wrapper-if-not-present-.patch | 113 ++++++++++++++++++ package/kexec/Config.in | 5 + package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 4 +- 4 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 package/kexec/0002-kexec-provide-a-memfd_create-wrapper-if-not-present-.patch diff --git a/package/kexec/0002-kexec-provide-a-memfd_create-wrapper-if-not-present-.patch b/package/kexec/0002-kexec-provide-a-memfd_create-wrapper-if-not-present-.patch new file mode 100644 index 000000000000..649ec56042c2 --- /dev/null +++ b/package/kexec/0002-kexec-provide-a-memfd_create-wrapper-if-not-present-.patch @@ -0,0 +1,113 @@ +From 417382aecd6964f97a0a0774a5cccd29c1b9edb3 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 23 Sep 2023 13:09:23 +0200 +Subject: [PATCH] kexec: provide a memfd_create() wrapper if not present in + libc + +Commit 714fa115 "kexec/arm64: Simplify the code for zImage" introduced +a use of the memfd_create() system call, included in version +kexec-tools v2.0.27. + +This system call was introduced in kernel commit [1], first included +in kernel v3.17 (released on 2014-10-05). + +The memfd_create() glibc wrapper function was added much later in +commit [2], first included in glibc version 2.27 (released on +2018-02-01). + +This direct use memfd_create() introduced a requirement on +Kernel >= 3.17 and glibc >= 2.27. + +There is old toolchains like [3] for example (which ships gcc 7.3.1, +glibc 2.25 and includes kernel v4.10 headers), that can still be used +to build newer kernels. Even if such toolchains can be seen as +outdated, they are is still claimed as supported by recent kernel. +For example, Kernel v6.5.5 has a requirement on gcc version 5.1 and +greater. See [4]. + +Moreover, kexec-tools <= 2.0.26 could be compiled using recent +toolchains with alternative libc (e.g. uclibc-ng, musl) which are not +providing the memfd_create() wrapper. + +When compiling kexec-tools v2.0.27 with a toolchain not providing the +memfd_create() syscall wrapper, the compilation fail with message: + + kexec/kexec.c: In function 'copybuf_memfd': + kexec/kexec.c:645:7: warning: implicit declaration of function 'memfd_create'; did you mean 'SYS_memfd_create'? [-Wimplicit-function-declaration] + fd = memfd_create("kernel", MFD_ALLOW_SEALING); + ^~~~~~~~~~~~ + SYS_memfd_create + kexec/kexec.c:645:30: error: 'MFD_ALLOW_SEALING' undeclared (first use in this function); did you mean '_PC_ALLOC_SIZE_MIN'? + fd = memfd_create("kernel", MFD_ALLOW_SEALING); + ^~~~~~~~~~~~~~~~~ + _PC_ALLOC_SIZE_MIN + +In order to let kexec-tools compile in a wider range of configurations, +this commit adds a memfd_create() function check in autoconf configure +script, and adds a system call wrapper which will be used if the +function is not available. With this commit, the environment +requirement is relaxed to only kernel >= v3.17. + +Note: this issue was found in kexec-tools integration in Buildroot [5] +using the command "utils/test-pkg -a -p kexec", which tests many +toolchain/arch combinations. + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9183df25fe7b194563db3fec6dc3202a5855839c +[2] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=59d2cbb1fe4b8601d5cbd359c3806973eab6c62d +[3] https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/aarch64-linux-gnu/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz +[4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/Documentation/process/changes.rst?h=v6.5.5#n32 +[5] https://buildroot.org/ + +Upstream: https://lists.infradead.org/pipermail/kexec/2023-September/028168.html +Signed-off-by: Julien Olivain +--- + configure.ac | 3 +++ + kexec/kexec.c | 11 +++++++++++ + 2 files changed, 14 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 192976c..212ef2c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -208,6 +208,9 @@ if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then + AC_MSG_NOTICE([The kexec_status call is not available])) + fi + ++dnl Check if libc has the memfd_create() syscall wrapper ++AC_CHECK_FUNCS([memfd_create]) ++ + dnl ---Sanity checks + if test "$CC" = "no"; then AC_MSG_ERROR([cc not found]); fi + if test "$CPP" = "no"; then AC_MSG_ERROR([cpp not found]); fi +diff --git a/kexec/kexec.c b/kexec/kexec.c +index c3b182e..c44c4b7 100644 +--- a/kexec/kexec.c ++++ b/kexec/kexec.c +@@ -31,6 +31,10 @@ + #include + #include + #include ++#ifndef HAVE_MEMFD_CREATE ++#include ++#include ++#endif + #include + #include + #include +@@ -638,6 +642,13 @@ char *slurp_decompress_file(const char *filename, off_t *r_size) + return kernel_buf; + } + ++#ifndef HAVE_MEMFD_CREATE ++static int memfd_create(const char *name, unsigned int flags) ++{ ++ return syscall(SYS_memfd_create, name, flags); ++} ++#endif ++ + static int copybuf_memfd(const char *kernel_buf, size_t size) + { + int fd, count; +-- +2.41.0 + diff --git a/package/kexec/Config.in b/package/kexec/Config.in index 836d740788bc..707f8663a45b 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_KEXEC_ARCH_SUPPORTS config BR2_PACKAGE_KEXEC bool "kexec" depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd_create() help Kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with @@ -25,3 +26,7 @@ config BR2_PACKAGE_KEXEC_ZLIB Support for compressed kernel images endif + +comment "kexec needs a toolchain w/ headers >= 3.17" + depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 4e16a53a3571..650f0992de00 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 7fe36a064101cd5c515e41b2be393dce3ca88adce59d6ee668e0af7c0c4570cd kexec-tools-2.0.26.tar.xz +sha256 38d78bcfa33a88928324b57dc81f50c1dfc279eede45e80957ca18f4e84b8187 kexec-tools-2.0.27.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 562b09012b63..5d30f4884bf8 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,11 +4,13 @@ # ################################################################################ -KEXEC_VERSION = 2.0.26 +KEXEC_VERSION = 2.0.27 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 KEXEC_LICENSE_FILES = COPYING +# 0002-kexec-provide-a-memfd_create-wrapper-if-not-present-.patch +KEXEC_AUTORECONF = YES KEXEC_CPE_ID_PRODUCT = kexec-tools KEXEC_CPE_ID_VENDOR = kexec-tools_project KEXEC_SELINUX_MODULES = kdump From cd46e1b1439e854dc9e4c016795d6e5276e4c573 Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Sat, 23 Sep 2023 18:52:14 +0200 Subject: [PATCH 2015/2890] package/nut: package/nut: specify --with-user/group when building NUT This commit fixes a problem where the NUT package couldn't be used as a NUT server due to the fact that the default group for nobody is "nogroup" and not "nobody" like the internal default of NUT. Thus, when starting a NUT server daemon the daemon starts with incorrect group permissions. This commit fixes this shortcoming by introducing a dedicated 'nut' user and 'nut' group to drop priviledges to it. Signed-off-by: Jens Maus Signed-off-by: Yann E. MORIN --- package/nut/nut.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/nut/nut.mk b/package/nut/nut.mk index fb98ba04f032..4c322aeb8506 100644 --- a/package/nut/nut.mk +++ b/package/nut/nut.mk @@ -24,7 +24,9 @@ NUT_POST_PATCH_HOOKS += NUT_FIX_CONFIGURE NUT_CONF_OPTS = \ --with-altpidpath=/var/run/upsd \ --with-dev \ - --without-doc + --without-doc \ + --with-user=nut \ + --with-group=nut NUT_CONF_ENV = \ ax_cv_check_cflags__Werror__Wno_unknown_warning_option=no \ @@ -34,6 +36,10 @@ NUT_CONF_ENV = \ ac_cv_func_strncasecmp=yes \ ax_cv__printf_string_null=yes +define NUT_USERS + nut -1 nut -1 * - - - NUT user +endef + ifeq ($(call qstrip,$(BR2_PACKAGE_NUT_DRIVERS)),) NUT_CONF_OPTS += --with-drivers=auto else From 7447700f057a4bf8b2ee84c22a2319ab05f9aeea Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 23 Sep 2023 11:24:14 +0200 Subject: [PATCH 2016/2890] package/libpjsip: security bump to version 2.13.1 Fixes the following security vulnerability: - CVE-2023-27585: Heap buffer overflow when parsing DNS packet https://github.com/pjsip/pjproject/security/advisories/GHSA-q9cp-8wcq-7pfr Drop now upstreamed security fixes for CVE-2022-23537 and CVE-2022-23547. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 - ...ull-request-from-GHSA-9pfh-r8x4-w26w.patch | 99 ------------------- ...ull-request-from-GHSA-cxwq-5g9x-x7fr.patch | 54 ---------- package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 8 +- 5 files changed, 2 insertions(+), 163 deletions(-) delete mode 100644 package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch delete mode 100644 package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch diff --git a/.checkpackageignore b/.checkpackageignore index f8aaf41af909..0250805be1b1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -740,8 +740,6 @@ package/liboping/0004-Fix-compile-error-on-GCC-7.patch Upstream package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch Upstream package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch Upstream package/libpam-tacplus/0001-Add-an-option-to-disable-Werror.patch Upstream -package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch Upstream -package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch Upstream package/libplatform/0001-cmake-require-c-11-as-the-minimum-standard.patch Upstream package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch Upstream package/libpthsem/0001-fix-build-on-linux-3.x-host.patch Upstream diff --git a/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch deleted file mode 100644 index 01e18781897e..000000000000 --- a/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch +++ /dev/null @@ -1,99 +0,0 @@ -From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001 -From: Nanang Izzuddin -Date: Tue, 20 Dec 2022 11:39:12 +0700 -Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w - -* Fix buffer overread in STUN message decoder - -* Updates based on comments - -[Retrieved from: -https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1] -Signed-off-by: Fabrice Fontaine ---- - pjnath/include/pjnath/stun_msg.h | 4 ++++ - pjnath/src/pjnath/stun_msg.c | 14 +++++++++++--- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h -index b52f95c586..e49f096f3a 100644 ---- a/pjnath/include/pjnath/stun_msg.h -+++ b/pjnath/include/pjnath/stun_msg.h -@@ -442,6 +442,7 @@ typedef enum pj_stun_status - - \endverbatim - */ -+#pragma pack(1) - typedef struct pj_stun_msg_hdr - { - /** -@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr - pj_uint8_t tsx_id[12]; - - } pj_stun_msg_hdr; -+#pragma pack() - - - /** -@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr - - \endverbatim - */ -+#pragma pack(1) - typedef struct pj_stun_attr_hdr - { - /** -@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr - pj_uint16_t length; - - } pj_stun_attr_hdr; -+#pragma pack() - - - /** -diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c -index 3def6b3eac..e904a0ba47 100644 ---- a/pjnath/src/pjnath/stun_msg.c -+++ b/pjnath/src/pjnath/stun_msg.c -@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr) - - #define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \ - (a)->hdr.length=(pj_uint16_t)(l) --#define ATTR_HDR_LEN 4 -+#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr) - - static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) - { -@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, - status = pj_stun_msg_check(pdu, pdu_len, options); - if (status != PJ_SUCCESS) - return status; -+ } else { -+ /* For safety, verify packet length at least */ -+ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20; -+ if (msg_len > pdu_len || -+ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len)) -+ { -+ return PJNATH_EINSTUNMSGLEN; -+ } - } - - /* Create the message, copy the header, and convert to host byte order */ -@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, - p_response = NULL; - - /* Parse attributes */ -- while (pdu_len >= 4) { -+ while (pdu_len >= ATTR_HDR_LEN) { - unsigned attr_type, attr_val_len; - const struct attr_desc *adesc; - -@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, - attr_val_len = (attr_val_len + 3) & (~3); - - /* Check length */ -- if (pdu_len < attr_val_len) { -+ if (pdu_len < attr_val_len + ATTR_HDR_LEN) { - pj_str_t err_msg; - char err_msg_buf[80]; - diff --git a/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch b/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch deleted file mode 100644 index 82249a2076b0..000000000000 --- a/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch +++ /dev/null @@ -1,54 +0,0 @@ -From bc4812d31a67d5e2f973fbfaf950d6118226cf36 Mon Sep 17 00:00:00 2001 -From: sauwming -Date: Fri, 23 Dec 2022 15:05:28 +0800 -Subject: [PATCH] Merge pull request from GHSA-cxwq-5g9x-x7fr - -* Fixed heap buffer overflow when parsing STUN errcode attribute - -* Also fixed uint parsing - -[Retrieved from: -https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36] -Signed-off-by: Fabrice Fontaine ---- - pjnath/src/pjnath/stun_msg.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c -index c6b0bdd284..b55d29849a 100644 ---- a/pjnath/src/pjnath/stun_msg.c -+++ b/pjnath/src/pjnath/stun_msg.c -@@ -1438,12 +1438,12 @@ static pj_status_t decode_uint_attr(pj_pool_t *pool, - attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr); - GETATTRHDR(buf, &attr->hdr); - -- attr->value = GETVAL32H(buf, 4); -- - /* Check that the attribute length is valid */ - if (attr->hdr.length != 4) - return PJNATH_ESTUNINATTRLEN; - -+ attr->value = GETVAL32H(buf, 4); -+ - /* Done */ - *p_attr = attr; - -@@ -1757,14 +1757,15 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool, - attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr); - GETATTRHDR(buf, &attr->hdr); - -+ /* Check that the attribute length is valid */ -+ if (attr->hdr.length < 4) -+ return PJNATH_ESTUNINATTRLEN; -+ - attr->err_code = buf[6] * 100 + buf[7]; - - /* Get pointer to the string in the message */ - value.ptr = ((char*)buf + ATTR_HDR_LEN + 4); - value.slen = attr->hdr.length - 4; -- /* Make sure the length is never negative */ -- if (value.slen < 0) -- value.slen = 0; - - /* Copy the string to the attribute */ - pj_strdup(pool, &attr->reason, &value); diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 993557556716..2edd97bed4c8 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4178bb9f586299111463fc16ea04e461adca4a73e646f8ddef61ea53dafa92d9 pjproject-2.13.tar.gz +sha256 32a5ab5bfbb9752cb6a46627e4c410e61939c8dbbd833ac858473cfbd9fb9d7d pjproject-2.13.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 24db64144672..f97d547fd7bf 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.13 +LIBPJSIP_VERSION = 2.13.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) @@ -15,12 +15,6 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) -# 0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch -LIBPJSIP_IGNORE_CVES += CVE-2022-23537 - -# 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch -LIBPJSIP_IGNORE_CVES += CVE-2022-23547 - LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 # relocation truncated to fit: R_68K_GOT16O From 84c24ab1b5a7d38b481b37a759480ff2273b499d Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Sat, 23 Sep 2023 18:04:11 +0200 Subject: [PATCH 2017/2890] package/nodejs: fix parallel build Unless told otherwise, ninja will spawn as many jobs as there are CPU (plus 2). Nodejs is built with ninja, but it is a generic package, so there is no variable (like with cmake-package) that passes the proper number of parallel jobs as configured by the user. As a consequence, the nodejs build will use as many CPU as are available, possibly overcommitting the rsources the user expected to be used. Set the JOBS variableto limit that number. Signed-off-by: Jens Maus [yann.morin.1998@free.fr: reword commit log] Signed-off-by: Yann E. MORIN --- package/nodejs/nodejs.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index fe629ada21d5..4e70bd71a3c7 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -46,14 +46,16 @@ HOST_NODEJS_MAKE_OPTS = \ CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) + PATH=$(@D)/bin:$(BR_PATH) \ + JOBS=$(BR2_JLEVEL) NODEJS_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) \ LDFLAGS="$(NODEJS_LDFLAGS)" \ - LD="$(TARGET_CXX)" + LD="$(TARGET_CXX)" \ + JOBS=$(BR2_JLEVEL) # nodejs's build system uses python which can be a symlink to an unsupported # python version (e.g. python 3.10 with nodejs 14.18.1). We work around this by From 9194e8cdedc02aa3c22636acfec2463277a11305 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 13:17:35 +0200 Subject: [PATCH 2018/2890] package/{mesa3d, mesa3d-headers}: bump version to 23.1.8 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-September/000729.html https://lists.freedesktop.org/archives/mesa-announce/2023-September/000730.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 5dbf984735b2..e70d3fe13700 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.1.6 +MESA3D_HEADERS_VERSION = 23.1.8 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 95133d3de995..a88ec5909f51 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-August/000727.html -sha256 f4c7fd8e7b472a88da7d83e9a48f6f3bd17d4ea2cc4386f7231b796f3964157a mesa-23.1.6.tar.xz -sha512 24f1c626fa05a82bcdfb24b67b8e5f96f94d5748309631b83e8d7a62142853cd3be90b92c56bac3bc4d223bf40b424d6d6a9977537b899107295b7d45d7e2575 mesa-23.1.6.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-September/000730.html +sha256 45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e736f36134db14ad mesa-23.1.8.tar.xz +sha512 02dc6f8b10dd3827a2b62fba3035726b1b60ec0c3188817deea2ad14f80f332a37272e9f15c5f653f20cecb14f8ff91697d73c89afc83674c19b686a674b677d mesa-23.1.8.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index f86140f17e2e..2a10f92c2a3d 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.1.6 +MESA3D_VERSION = 23.1.8 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From fb8999f59b45c66e06209c9b1ea8de51dd3d5e04 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 13:31:31 +0200 Subject: [PATCH 2019/2890] package/libopenssl: bump version to 3.1.3 Fixes CVE-2023-4807 (Windows-only): https://www.openssl.org/news/vulnerabilities.html Changelog: https://www.openssl.org/news/cl31.txt Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 1c82cd7cf87f..912617597792 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-3.1.2.tar.gz.sha256 -sha256 a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539 openssl-3.1.2.tar.gz +# From https://www.openssl.org/source/openssl-3.1.3.tar.gz.sha256 +sha256 f0316a2ebd89e7f2352976445458689f80302093788c466692fb2a188b2eacf6 openssl-3.1.3.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 9c1dbe869431..b69ef032f2e0 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.1.2 +LIBOPENSSL_VERSION = 3.1.3 LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 From 227d414ded61058b9cf41815b5683a84ece3aec2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 13:47:12 +0200 Subject: [PATCH 2020/2890] package/alsa-lib: bump version to 1.2.10 Removed patch which is included in this release: https://github.com/alsa-project/alsa-lib/commit/c72bbed82513074fb5f0d474c7e88e2b4b945905 Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.9_v1.2.10#alsa-lib Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...ver-build-error-on-non-ELF-platforms.patch | 84 ------------------- package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 3 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 package/alsa-lib/0002-Fix-symver-build-error-on-non-ELF-platforms.patch diff --git a/package/alsa-lib/0002-Fix-symver-build-error-on-non-ELF-platforms.patch b/package/alsa-lib/0002-Fix-symver-build-error-on-non-ELF-platforms.patch deleted file mode 100644 index 499bbb2ae44a..000000000000 --- a/package/alsa-lib/0002-Fix-symver-build-error-on-non-ELF-platforms.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 317aafb133ed797c4cd62599565a77ecc595daea Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Thu, 29 Jun 2023 07:57:21 +0200 -Subject: [PATCH] Fix symver build error on non-ELF platforms - -The following error is observed on Microblaze [1] build: - - error: symver is only supported on ELF platforms - -due to using __attribute__((symver)) on non-ELF platform. - -[1] http://autobuild.buildroot.net/results/1e9/1e965d83d75615f35308440c5db044314a349357/build-end.log - -ac_check_attribute_symver.m4 was downloaded from -https://github.com/smuellerDD/libkcapi/blob/master/m4/ac_check_attribute_symver.m4 - -Upstream: https://github.com/alsa-project/alsa-lib/pull/334 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 1 + - include/alsa-symbols.h | 2 +- - m4/ac_check_attribute_symver.m4 | 24 ++++++++++++++++++++++++ - 3 files changed, 26 insertions(+), 1 deletion(-) - create mode 100644 m4/ac_check_attribute_symver.m4 - -diff --git a/configure.ac b/configure.ac -index 0588eec3..71ec0b15 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -46,6 +46,7 @@ dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - AC_C_INLINE - AC_HEADER_TIME -+AC_CHECK_ATTRIBUTE_SYMVER - - dnl Checks for library functions. - AC_PROG_GCC_TRADITIONAL -diff --git a/include/alsa-symbols.h b/include/alsa-symbols.h -index f8c49103..521e5956 100644 ---- a/include/alsa-symbols.h -+++ b/include/alsa-symbols.h -@@ -29,7 +29,7 @@ - #define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post - #define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name) - --#if __GNUC__ > 10 -+#if HAVE_ATTRIBUTE_SYMVER && __GNUC__ > 10 - #define symbol_version(real, name, version) \ - extern __typeof (real) real __attribute__((symver (#name "@" #version))) - #define default_symbol_version(real, name, version) \ -diff --git a/m4/ac_check_attribute_symver.m4 b/m4/ac_check_attribute_symver.m4 -new file mode 100644 -index 00000000..b484c5eb ---- /dev/null -+++ b/m4/ac_check_attribute_symver.m4 -@@ -0,0 +1,24 @@ -+dnl Check compiler support for symver function attribute -+AC_DEFUN([AC_CHECK_ATTRIBUTE_SYMVER], [ -+ saved_CFLAGS=$CFLAGS -+ CFLAGS="-O0 -Werror" -+ AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[ -+ void _test_attribute_symver(void); -+ __attribute__((__symver__("sym@VER_1.2.3"))) void _test_attribute_symver(void) {} -+ ]], -+ [[ -+ _test_attribute_symver() -+ ]] -+ )], -+ [ -+ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 if __attribute__((symver)) is supported]) -+ ], -+ [ -+ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 0, [Define to 0 if __attribute__((symver)) is not supported]) -+ ] -+ ) -+ CFLAGS=$saved_CFLAGS -+]) -+ --- -2.39.2 - diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index f6735cd5409c..a6d9c7dbdcd5 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 dc9c643fdc4ccfd0572cc685858dd41e08afb583f30460b317e4188275f615b2 alsa-lib-1.2.9.tar.bz2 +sha256 c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e alsa-lib-1.2.10.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 70f4c969d575..5dfcd1e861bc 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.9 +ALSA_LIB_VERSION = 1.2.10 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) From f7ae22240bac0300961fa60c7d684b6584d7a631 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 13:47:13 +0200 Subject: [PATCH 2021/2890] package/alsa-utils: bump version to 1.2.10 Updated patch due to upstream commit https://github.com/alsa-project/alsa-utils/commit/8ed9d7607f97537ca4c8f359ee76462174c6e77e Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.9_v1.2.10#alsa-utils Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...sactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch | 6 ++++-- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/alsa-utils/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch b/package/alsa-utils/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch index 97c4729bf9b7..145c9da01718 100644 --- a/package/alsa-utils/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch +++ b/package/alsa-utils/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch @@ -28,6 +28,8 @@ functions when support is not available. Signed-off-by: Thomas Petazzoni Upstream: https://mailman.alsa-project.org/pipermail/alsa-devel/2022-July/203846.html +[Bernd: update patch for 1.2.10] +Signed-off-by: Bernd Kuhls --- alsactl/info.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) @@ -96,9 +98,9 @@ index 253539d..9bd72af 100644 +#ifdef __ALSA_RAWMIDI_H first = true; if (err >= 0) - err = rawmidi_device_list(ctl, SND_PCM_STREAM_PLAYBACK, &first); + err = rawmidi_device_list(ctl, SND_RAWMIDI_STREAM_INPUT, &first); if (err >= 0) - err = rawmidi_device_list(ctl, SND_PCM_STREAM_CAPTURE, &first); + err = rawmidi_device_list(ctl, SND_RAWMIDI_STREAM_OUTPUT, &first); +#endif if (err >= 0) diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index 44cd928e453e..0ace406286c0 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e7623d4525595f92e11ce25ee9a97f2040a14c6e4dcd027aa96e06cbce7817bd alsa-utils-1.2.9.tar.bz2 +sha256 104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a alsa-utils-1.2.10.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 20fe65afe6c1..7487e3c2bbfd 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.9 +ALSA_UTILS_VERSION = 1.2.10 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 From e926c83928e08c0ecd6cd4383e1cca151a8a4d2c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 13:48:49 +0200 Subject: [PATCH 2022/2890] package/libva: bump version to 2.20.0 Release notes: https://github.com/intel/libva/blob/v2.20-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libva/libva.hash | 2 +- package/libva/libva.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index b9dba9e91a45..2fffe8701f2b 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cb5e2a9287a76b12c0b6cb96f4f27a0321bbe693df43cd950e5d4542db7f227 libva-2.19.0.tar.gz +sha256 117f8d658a5fc9ea406ca80a3eb4ae1d70b15a54807c9ed77199c812bed73b60 libva-2.20.0.tar.gz sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index fd796cfd6abf..9e9d5d698cb8 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.19.0 +LIBVA_VERSION = 2.20.0 LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING From 28c7d826006c14833827c19a6ca493112269cdb1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 13:48:50 +0200 Subject: [PATCH 2023/2890] package/libva-utils: bump version to 2.20.0 Release notes: https://github.com/intel/libva-utils/blob/v2.20-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libva-utils/libva-utils.hash | 2 +- package/libva-utils/libva-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index e46a0522f8f6..b7b6fe3bbc3d 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4135992ab534d0cfd71a93c28e1a22f79c0003cf8d157ffd4621e5e482191b4f libva-utils-2.19.0.tar.gz +sha256 1a5e3c3c24677a6b4bbee21042c4c06b0a2c62e56ebb1baa4e712392b5c72f9b libva-utils-2.20.0.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 4b2f5907ea8b..4f0fa68aa96b 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.19.0 +LIBVA_UTILS_VERSION = 2.20.0 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From 3ea7e8b80b813424c8b6e103ea48b0872c924f8a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 15:27:02 +0200 Subject: [PATCH 2024/2890] package/dovecot: bump version to 2.3.21 Release notes: https://dovecot.org/mailman3/archives/list/dovecot-news@dovecot.org/thread/KYDR7WWPEQOBZA3IA4NL5XDSLODZLG6N/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 7036df57a8fa..e42bb577a82c 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 caa832eb968148abdf35ee9d0f534b779fa732c0ce4a913d9ab8c3469b218552 dovecot-2.3.20.tar.gz +sha256 05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d dovecot-2.3.21.tar.gz sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 4b17784f93cf..2933401cbc09 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).20 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).21 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From 2c811e7aa3a8d2c93a6f1e9412c29a4bebd20de8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 15:27:03 +0200 Subject: [PATCH 2025/2890] package/dovecot-pigeonhole: bump version to 0.5.21 Release notes: https://dovecot.org/mailman3/archives/list/dovecot-news@dovecot.org/thread/Y5SJWAIAVEAQ2KKSWJM7VSJUUFRMFAH5/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index 5c7ba322b27f..8cd3356dce25 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 ae32bd4870ea2c1328ae09ba206e9ec12128046d6afca52fbbc9ef7f75617c98 dovecot-2.3-pigeonhole-0.5.20.tar.gz +sha256 1ca71d2659076712058a72030288f150b2b076b0306453471c5261498d3ded27 dovecot-2.3-pigeonhole-0.5.21.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 0b64cb0d6f69..679fd4db989e 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.20 +DOVECOT_PIGEONHOLE_VERSION = 0.5.21 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 From 33e5043ebac2e11873a9f1dcb02fc4afa497886e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 16:03:24 +0200 Subject: [PATCH 2026/2890] package/cmake: bump version to 3.27.6 Changelog: https://cmake.org/cmake/help/v3.27/release/3.27.html#updates Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 35f25c00663f..8b1ae5b4a650 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.27/cmake-3.27.3-SHA-256.txt -sha256 66afdc0f181461b70b6fedcde9ecc4226c5cd184e7203617c83b7d8e47f49521 cmake-3.27.3.tar.gz +# From https://cmake.org/files/v3.27/cmake-3.27.6-SHA-256.txt +sha256 ef3056df528569e0e8956f6cf38806879347ac6de6a4ff7e4105dc4578732cfb cmake-3.27.6.tar.gz # Locally calculated sha256 4a01ccf2dc580ba570d02bc015bbe0ec92f1f318717aae9540ba841ba7946756 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index a0c775e37cdb..3bb2c4bffb81 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -6,7 +6,7 @@ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y CMAKE_VERSION_MAJOR = 3.27 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt From 3e8e2e0b43b557286cf29f99c8923e5a92a6b44d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 23 Sep 2023 22:33:59 +0200 Subject: [PATCH 2027/2890] package/libostree: needs headers >= 5.4 linux/fsverity.h is only available since kernel 5.4 and https://github.com/torvalds/linux/commit/085771ec14b9bdb843fe9283d4703ced395d1b0b resulting in the following build failure since bump to version 2023.5 in commit c64a3e9767757f6bab0ecf2df35871508003f39e and https://github.com/containers/composefs/commit/d3b4b1a2599e74757a3ada47a88645b363067a0a: composefs/libcomposefs/lcfs-writer-erofs.c:37:10: fatal error: linux/fsverity.h: No such file or directory 37 | #include | ^~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/045987a09cf9061dae80db6ada1f912b2867db26 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libostree/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libostree/Config.in b/package/libostree/Config.in index 696e8e1d6c5f..9c59413eb166 100644 --- a/package/libostree/Config.in +++ b/package/libostree/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LIBOSTREE depends on BR2_USE_MMU # e2fsprogs, libglib2, libgpgme # doesn't build with musl due to lack of TEMP_FAILURE_RETRY() depends on !BR2_TOOLCHAIN_USES_MUSL + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 # linux/fsverity.h select BR2_PACKAGE_E2FSPROGS select BR2_PACKAGE_LIBARCHIVE if BR2_s390x select BR2_PACKAGE_LIBGLIB2 @@ -18,8 +19,9 @@ config BR2_PACKAGE_LIBOSTREE https://ostree.readthedocs.io/en/latest/ -comment "libostree needs a uClibc or glibc toolchain w/ threads, dynamic library, wchar" +comment "libostree needs a uClibc or glibc toolchain w/ threads, dynamic library, wchar, headers >= 5.4" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL + || !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU From 2314928cf828ff02939b9c0041964c3ee2dd907d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 23 Sep 2023 22:54:37 +0200 Subject: [PATCH 2028/2890] package/open-iscsi: bump to version 2.1.9 - Drop patch (already in version) - Drop license comment and add REAMDE and libopeniscsiusr/COPYING as license files due to https://github.com/open-iscsi/open-iscsi/commit/10d50ed4bcf9ef6820f7fe544df0c3605ea4144f https://github.com/open-iscsi/open-iscsi/blob/2.1.9/Changelog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...01-SHA3-is-not-supported-by-libressl.patch | 144 ------------------ package/open-iscsi/open-iscsi.hash | 4 +- package/open-iscsi/open-iscsi.mk | 8 +- 4 files changed, 6 insertions(+), 151 deletions(-) delete mode 100644 package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch diff --git a/.checkpackageignore b/.checkpackageignore index 0250805be1b1..72fd5ac40432 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1023,7 +1023,6 @@ package/olsr/0003-pud-adapt-to-API-changes-in-gpsd-3-20.patch Upstream package/olsr/0005-lib-pud-src-gpsdclient.c-drop-handling-of-gpsdata-fi.patch Upstream package/olsr/S50olsr Indent Shellcheck Variables package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch Upstream -package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch Upstream package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch Upstream package/open2300/0001-fix-makefile.patch Upstream package/openjdk/17.0.8+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream diff --git a/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch deleted file mode 100644 index 0423179d9375..000000000000 --- a/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 29a4c3a518d13bfc0a07915e7e87fbec2b66597c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 13 Feb 2023 08:55:11 +0100 -Subject: [PATCH] SHA3 is not supported by libressl - -Disable SHA3 with libressl as it is not supported resulting in the -following build failure: - -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': -auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' - -Fixes: - - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/open-iscsi/open-iscsi/pull/396] ---- - libopeniscsiusr/idbm.h | 2 ++ - usr/auth.c | 13 ++++++++++++- - usr/auth.h | 4 ++++ - usr/idbm.c | 2 ++ - 4 files changed, 20 insertions(+), 1 deletion(-) - -diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h -index be5986f..1043b27 100644 ---- a/libopeniscsiusr/idbm.h -+++ b/libopeniscsiusr/idbm.h -@@ -56,7 +56,9 @@ enum iscsi_chap_algs { - ISCSI_AUTH_CHAP_ALG_MD5 = 5, - ISCSI_AUTH_CHAP_ALG_SHA1 = 6, - ISCSI_AUTH_CHAP_ALG_SHA256 = 7, -+#ifndef LIBRESSL_VERSION_NUMBER - ISCSI_AUTH_CHAP_ALG_SHA3_256 = 8, -+#endif - AUTH_CHAP_ALG_MAX_COUNT = 5, - }; - -diff --git a/usr/auth.c b/usr/auth.c -index 46c328e..5f50e26 100644 ---- a/usr/auth.c -+++ b/usr/auth.c -@@ -181,9 +181,11 @@ static int auth_hash_init(EVP_MD_CTX **context, int chap_alg) { - case AUTH_CHAP_ALG_SHA256: - digest = EVP_sha256(); - break; -+#ifndef LIBRESSL_VERSION_NUMBER - case AUTH_CHAP_ALG_SHA3_256: - digest = EVP_sha3_256(); - break; -+#endif - } - - if (*context == NULL) -@@ -298,7 +300,9 @@ static int - acl_chk_chap_alg_optn(int chap_algorithm) - { - if (chap_algorithm == AUTH_OPTION_NONE || -+#ifndef LIBRESSL_VERSION_NUMBER - chap_algorithm == AUTH_CHAP_ALG_SHA3_256 || -+#endif - chap_algorithm == AUTH_CHAP_ALG_SHA256 || - chap_algorithm == AUTH_CHAP_ALG_SHA1 || - chap_algorithm == AUTH_CHAP_ALG_MD5) -@@ -711,9 +715,11 @@ acl_chk_chap_alg_key(struct iscsi_acl *client) - case AUTH_CHAP_ALG_SHA256: - client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN; - break; -+#ifndef LIBRESSL_VERSION_NUMBER - case AUTH_CHAP_ALG_SHA3_256: - client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN; - break; -+#endif - } - return; - } -@@ -862,7 +868,10 @@ acl_local_auth(struct iscsi_acl *client) - client->local_state = AUTH_LOCAL_STATE_ERROR; - client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT; - break; -- } else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && -+ } else if ( -+#ifndef LIBRESSL_VERSION_NUMBER -+ (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && -+#endif - (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) && - (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) && - (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) { -@@ -1824,6 +1833,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { - "SHA256 due to crypto lib configuration"); - } - break; -+#ifndef LIBRESSL_VERSION_NUMBER - case AUTH_CHAP_ALG_SHA3_256: - if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) { - value_list[i++] = AUTH_CHAP_ALG_SHA3_256; -@@ -1832,6 +1842,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { - "SHA3-256 due to crypto lib configuration"); - } - break; -+#endif - case ~0: - /* unset value in array, just ignore */ - break; -diff --git a/usr/auth.h b/usr/auth.h -index 16cdb24..9357772 100644 ---- a/usr/auth.h -+++ b/usr/auth.h -@@ -32,7 +32,9 @@ enum { - AUTH_CHAP_MD5_RSP_LEN = 16, - AUTH_CHAP_SHA1_RSP_LEN = 20, - AUTH_CHAP_SHA256_RSP_LEN = 32, -+#ifndef LIBRESSL_VERSION_NUMBER - AUTH_CHAP_SHA3_256_RSP_LEN = 32, -+#endif - AUTH_CHAP_RSP_MAX = 32, - }; - -@@ -67,7 +69,9 @@ enum { - AUTH_CHAP_ALG_MD5 = 5, - AUTH_CHAP_ALG_SHA1 = 6, - AUTH_CHAP_ALG_SHA256 = 7, -+#ifndef LIBRESSL_VERSION_NUMBER - AUTH_CHAP_ALG_SHA3_256 = 8, -+#endif - AUTH_CHAP_ALG_MAX_COUNT = 5 - }; - -diff --git a/usr/idbm.c b/usr/idbm.c -index 90bc142..082e1c6 100644 ---- a/usr/idbm.c -+++ b/usr/idbm.c -@@ -200,7 +200,9 @@ static struct int_list_tbl { - { "MD5", AUTH_CHAP_ALG_MD5 }, - { "SHA1", AUTH_CHAP_ALG_SHA1 }, - { "SHA256", AUTH_CHAP_ALG_SHA256 }, -+#ifndef LIBRESSL_VERSION_NUMBER - { "SHA3-256", AUTH_CHAP_ALG_SHA3_256 }, -+#endif - }; - - static void --- -2.39.0 - diff --git a/package/open-iscsi/open-iscsi.hash b/package/open-iscsi/open-iscsi.hash index 9fd651cae8d9..de75cbf1e9aa 100644 --- a/package/open-iscsi/open-iscsi.hash +++ b/package/open-iscsi/open-iscsi.hash @@ -1,3 +1,5 @@ # Locally calculated -sha256 9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2 open-iscsi-2.1.8.tar.gz +sha256 60e2a1e3058a8af7f702e86a5a0511b05b8754d29d3d2df4e0e301399b5cf70a open-iscsi-2.1.9.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 7e6580de9d99b680697d51ec0c5e88acd9ed329139d181472cc5a592d0684fa5 README +sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 libopeniscsiusr/COPYING diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index e5b965b80da0..00370a339ae2 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -4,12 +4,10 @@ # ################################################################################ -OPEN_ISCSI_VERSION = 2.1.8 +OPEN_ISCSI_VERSION = 2.1.9 OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) -# The COPYING file says GPL-2.0, but there is some GPL-3.0+ code as -# well. See https://github.com/open-iscsi/open-iscsi/issues/379 -OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ -OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+ +OPEN_ISCSI_LICENSE_FILES = COPYING README libopeniscsiusr/COPYING OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux From 278d1db56becb4c6b5784c9bb9a0c452ea73ae16 Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Sat, 23 Sep 2023 12:59:32 +0200 Subject: [PATCH 2029/2890] package/nodejs: fix cross-compile builds When nodejs is build, a qemu wrapper script is used to execute some programs built for the target in user-mode emulation. However, when the target and build machines are similar (e.g. x86_74), running those programs fails, with errors such as: cd ../../tools/v8_gypfiles; python ../../deps/v8/tools/run.py ../../out/Release/v8-qemu-wrapper ../../out/Release/bytecode_builtins_list_generator ../../out/Release/obj.host/gen/generate-bytecode-output-root/builtins-generated/bytecodes-builtins-list.h ../../out/Release/bytecode_builtins_list_generator: /lib/x86_64-linux-gnu/libstdc++.so.6: version `GLIBCXX_3.4.29' not found (required by ../../out/Release/bytecode_builtins_list_generator) ../../out/Release/bytecode_builtins_list_generator: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.33' not found (required by ../../out/Release/bytecode_builtins_list_generator) ../../out/Release/bytecode_builtins_list_generator: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.32' not found (required by ../../out/Release/bytecode_builtins_list_generator) ../../out/Release/bytecode_builtins_list_generator: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34' not found (required by ../../out/Release/bytecode_builtins_list_generator) Return code is 1 So the question is: why the heck does Qemu use the host C library? To answer this question, we first have to look at how the -L option of Qemu is implemented. This option is documented as such: -L path QEMU_LD_PREFIX set the elf interpreter prefix to 'path' The v8-qemu-wrapper script makes this option point to $(STAGING_DIR), so that the ELF interpreter used is the one in $(STAGING_DIR). However, contrary to what the option documentation says, this option does much more than setting the ELF interpreter prefix: it is going to affect how *all* system calls manipulating files (open, etc.) are going to work. When this option is passed, the function init_paths() in https://git.qemu.org/?p=qemu.git;a=blob;f=util/path.c is called at initialization time, and essentially its sets the global "base" variable to point to the directory passed as -L argument. Then, for every single syscall that manipulates a path, this path will be passed through the path() function in the same file. This function will first attempt to resolve the path with "base" as a prefix, and if not, return the unprefixed path. After adding some traces into this function, I was able to understand what happens: (1) -L$(STAGING_DIR) is passed, causing "base" to point to $(STAGING_DIR) (2) The target ELF interpreter from $(STAGING_DIR) is properly invoked (3) When this ELF interpreter then resolves the libc.so.6 library, it first looks for /etc/ld.so.cache. (4) Qemu first looks for /etc/ld.so.cache with the -L prefix, i.e $(STAGING_DIR)/etc/ld.so.cache, but it does not exist. So, the Qemu system call emulation falls back to /etc/ld.so.cache, which means the target ELF interpreter reads the /etc/ld.so.cache of the host system. (5) This /etc/ld.so.cache of the host system says that libc.so.6 is in /lib/x86_64-linux-gnu/ (6) The target ELF interpreter therefore tries to use /lib/x86_64-linux-gnu/libc.so.6. The Qemu system call emulation first tries $(STAGING_DIR)/lib/x86_64-linux-gnu/libc.so.6, but this library does not exist (it is in $(STAGING_DIR)/lib/libc.so.6), so the Qemu system call emulation falls back to /lib/x86_64-linux-gnu/libc.so.6 of the host system, which exist... but is too old compared to the target C library. Indeed, results from ld.so.cache take precedence over the simple resolution of library paths in /usr/lib and /lib. We see 3 possible ideas to resolve this problem: (A) Change the behavior of Qemu to not fallback to unprefixed paths: when -L is passed, all path-related system calls should see the paths prefixed by the -L option. Issue with this is that this change is unlikely to get accepted by Qemu upstream. And there might be some side effects we have not really identified. (B) Create an empty $(STAGING_DIR)/etc/ld.so.cache. We have tested this solution and it works: it gets used instead of the host /etc/ld.so.cache. Because $(STAGING_DIR)/etc/ld.so.cache is empty, there's no libc.so.6 match, so the target ELF interpreter goes through its normal library location resolution logic, which falls back to trying in /usr/lib and /lib, which works as those paths ends up being prefixed with $(STAGING_DIR) by Qemu. (C) Pass LD_LIBRARY_PATH pointing to $(STAGING_DIR)/lib and $(STAGING_DIR)/usr/lib in the Qemu wrapper. This works because LD_LIBRARY_PATH paths have precedence over paths given by ld.so.cache. This is the solution already used by the GOI qemu wrapper in package/gobject-introspection/g-ir-scanner-qemuwrapper.in. We chose to go with the third option, because it has been proven to work for the GOI wrapper, and has been reported to solve #14366. Even though the first option would be the best, it is also the one that has the least chances to land any time soon (if ever); the second has not been exercised, and the impact is not fully understood either (e.g what about non-glibc toolchains?). Fixes: #14366 Signed-off-by: Jens Maus [yann.morin.1998@free.fr: - add whole analsys done by Thomas in: https://lore.kernel.org/buildroot/20221031213926.50d3c778@windsurf/ ] Signed-off-by: Yann E. MORIN --- package/nodejs/v8-qemu-wrapper.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nodejs/v8-qemu-wrapper.in b/package/nodejs/v8-qemu-wrapper.in index e1083f47f704..48222d089b15 100644 --- a/package/nodejs/v8-qemu-wrapper.in +++ b/package/nodejs/v8-qemu-wrapper.in @@ -5,5 +5,6 @@ exec @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ @QEMU_USERMODE_ARGS@ \ -L "${STAGING_DIR}/" \ + -E LD_LIBRARY_PATH="${STAGING_DIR}/lib:${STAGING_DIR}/usr/lib/" \ "$@" From 0a0dd63c824c1c8a104e09b4f773764daf5b3e3f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 18:29:09 +0200 Subject: [PATCH 2030/2890] package/pppd: drop PPPD_DROP_INTERNAL_IF_PPOL2TP_H PPPD_DROP_INTERNAL_IF_PPOL2TP_H is not needed since bump to version 2.4.6 in commit 49b239ab20e632792a6c61173ba830cdc2128ebf and https://github.com/ppp-project/ppp/commit/c41092dd4c49267f232f6cba3d31c6c68bfdf68d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/pppd/pppd.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index d9d6244f103c..25d017a84f29 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -37,15 +37,6 @@ PPPD_DEPENDENCIES += libpcap PPPD_MAKE_OPTS += FILTER=y endif -# pppd bundles some but not all of the needed kernel headers. The embedded -# if_pppol2tp.h is unfortunately not compatible with kernel headers > 2.6.34, -# and has been part of the kernel headers since 2.6.23, so drop it -define PPPD_DROP_INTERNAL_IF_PPOL2TP_H - $(RM) $(@D)/include/linux/if_pppol2tp.h -endef - -PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_INTERNAL_IF_PPOL2TP_H - # pppd defaults to /etc/ppp/resolv.conf, which not be writable and is # definitely not useful since the C library only uses # /etc/resolv.conf. Therefore, we change pppd to use /etc/resolv.conf From a0831dd5f5bb4bbbb72fd0b90964695cafc99da5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 26 Sep 2023 23:37:00 +0200 Subject: [PATCH 2031/2890] Update for 2023.05.3 Signed-off-by: Peter Korsgaard (cherry picked from commit 70638523a704aca46313aba05b74783340b11b32) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/CHANGES b/CHANGES index 260e8839732d..4fc069a68d7e 100644 --- a/CHANGES +++ b/CHANGES @@ -94,6 +94,35 @@ Removed packages: libasplib, ocf-linux, tovid +2023.05.3, released September 26th, 2023 + + Important / security related fixes. + + Defconfigs: PC x86-64 bios/efi: Needs libelf. Raspberrypi: + Also enable HDMI console when systemd is used. + + Updated/fixed packages: agentpp, asterisk, at91dataflashboot, + aubio, berkeleydb, bind, bwm-ng, chocolate-doom, clamav, + compiler-rt, connman, cpio, cups, dav1d, diffutils, dracut, + dt, expect, fail2ban, fio, flite, freerdp, freeswitch, + fstrcmp, gcc, gdb, ghostscript, gmp, go, grub2, haproxy, + heirloom-mailx, hwloc, icu, intel-microcode, irssi, less, + libcoap, libcurl, libglib2, libiec61850, libjxl, libks, + libksba, libmodsecurity, libpjsip, libqb, libraw, libssh, + libtommath, lldpd, log4cxx, lsof, mdadm, mosquitto, mpd, mpv, + mutt, mv-ddr-marvell, ne10, netatalk, network-manager, + nftables, nodejs, ntpsec, nut, openblas, openjdk, openjdk-bin, + opensc, openssh, pcm-tools, perftest, petitboot, php, pixman, + poppler, postgresql, python-django, python-ipython, + python-pip, python-pylibfdt, python-tornado, python3, qt5, + ramspeed, rtl8189fs, rtl8812au-aircrack-ng, samba4, screen, + screenfetch, sngrep, sofia-sip, stellarium, stress-ng, + strongswan, sysstat, tar, tcl, uboot, uclibc, vim, webkitgtk, + webp, wireshark, xfsprogs, xserver_xorg-server, xterm, yajl, + zbar, zxing-cpp + + New packages: xlib_libXpresent + 2023.05.2, released August 31th, 2023 Important / security related fixes. From de48ecb83d2e69ea2a191a70fd353c93844a7382 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Sep 2023 08:20:29 +0200 Subject: [PATCH 2032/2890] docs/website: Update for 2023.05.3 Signed-off-by: Peter Korsgaard --- docs/website/news.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 1eeb162e1018..56247e90d5a7 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

                          News

                            +
                          • +
                            +
                            +
                            +

                            2023.05.3 released, 2023.05.x series EOL

                            +

                            26 September 2023

                            +
                            +
                            +

                            The 2023.05.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2023.05.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2023.05.3 release.

                            + +

                            Notice that the 2023.05.x series is now end of life. Please migrate to + the 2023.08 series instead.

                            +
                            +
                            +
                            • +
                          • From 8ea74a5b49375d6a661338e5e20ac1bb7f3d392c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Sep 2023 13:52:12 +0200 Subject: [PATCH 2033/2890] Update for 2023.02.5 Signed-off-by: Peter Korsgaard (cherry picked from commit df2c4a2301636a3818f36f37f7361ec89b38f36d) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/CHANGES b/CHANGES index 4fc069a68d7e..2d18c32f247b 100644 --- a/CHANGES +++ b/CHANGES @@ -260,6 +260,36 @@ #15376: Libiconv config #15461: QtVirtualKeyboard segfaults +2023.02.5, released September 27th, 2023 + + Important / security related fixes. + + Updated/fixed packages: agentpp, asterisk, at91dataflashboot, + aubio, berkeleydb, bind, bwm-ng, chocolate-doom, clamav, + compiler-rt, connman, cups, dav1d, diffutils, dracut, dt, + expect, fail2ban, fio, flite, freerdp, freeswitch, fstrcmp, + gcc, gdb, ghostscript, gmp, go, grub2, haproxy, + heirloom-mailx, hwloc, icu, intel-microcode, irssi, libcoap, + libcurl, libiec61850, libjxl, libks, libksba, libmodsecurity, + libpjsip, libqb, libraw, libssh, libtommath, less, lldpd, + log4cxx, lsof, mdadm, mosquitto, mpd, mutt, mv-ddr-marvell, + ne10, netatalk, network-manager, nftables, nodejs, ntpsec, + nut, openblas, openjdk, openjdk-bin, opensc, openssh, + pcm-tools, perftest, php, pixman, poppler, postgresql, pppd, + python-django, python-ipython, python-pip, python-pylibfdt, + python-tornado, python3, qt5, ramspeed, rtl8189fs, samba4, + screen, screenfetch, sngrep, sofia-sip, stellarium, + strongswan, sysstat, tar, tcl, uboot, uclibc, vim, webkitgtk, + webp, wireshark, xfsprogs, xserver_xorg-server, xterm, yajl, + zbar, zxing-cpp + + Issues resolved (http://bugs.uclibc.org): + + #14366: Nodejs fails with "version `GLIBC_2.34' not found".. + #15754: The docker-engine and docker-cli versions are not... + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + 2023.02.4, released August 31th, 2023 Important / security related fixes. From 7239f204cb5d675ba410ac6be0f5d639210bd028 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Sep 2023 19:33:08 +0200 Subject: [PATCH 2034/2890] docs/website/news.html: fix left/right ordering for 2023.05.3 announcement Signed-off-by: Peter Korsgaard --- docs/website/news.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index 56247e90d5a7..02c176e7cc8c 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,7 +9,7 @@

                            News

                              -
                            • +
                            • From 5fdc797aba984cdd61b19c14c83349966b05d085 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Sep 2023 19:35:36 +0200 Subject: [PATCH 2035/2890] docs/website: Update for 2023.02.5 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 46db748c8237..65d048d45018 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
                              Download
                              -

                              Latest long term support release: 2023.02.4

                              +

                              Latest long term support release: 2023.02.5

                              - +
                              - +
                              -

                              buildroot-2023.02.4.tar.gz

                              -

                              PGP signature

                              +

                              buildroot-2023.02.5.tar.gz

                              +

                              PGP signature

                              - +
                              - +
                              -

                              buildroot-2023.02.4.tar.xz

                              -

                              PGP signature

                              +

                              buildroot-2023.02.5.tar.xz

                              +

                              PGP signature

                              diff --git a/docs/website/news.html b/docs/website/news.html index 02c176e7cc8c..a4cb7dd58696 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

                              News

                                +
                              • +
                                +
                                +
                                +

                                2023.02.5 released

                                +

                                27 September 2023

                                +
                                +
                                +

                                The 2023.02.5 bugfix release is out, fixing a number of important / + security related issues discovered since the 2023.02.4 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2023.02.5 release.

                                +
                                +
                                +
                                • +
                              • From 285f136a1528a7ebfb881c41b026c794d6b14438 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Mon, 25 Sep 2023 15:21:30 +0200 Subject: [PATCH 2036/2890] package/sdl2: bump version to 2.28.3 Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 4 ++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 4b2e4d9cd37e..dde33bb9b6ae 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.28.1.tar.gz.sig -sha256 4977ceba5c0054dbe6c2f114641aced43ce3bf2b41ea64b6a372d6ba129cb15d SDL2-2.28.1.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.28.3.tar.gz.sig +sha256 7acb8679652701a2504d734e2ba7543ec1a83e310498ddd22fd44bf965eb5518 SDL2-2.28.3.tar.gz # Locally calculated sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index ce42aee4e8b6..840a7283d2cf 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.28.1 +SDL2_VERSION = 2.28.3 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From c76f5f24c7b06e276a471aa618d4b5c2f7f7975a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 23:02:24 +0200 Subject: [PATCH 2037/2890] package/libdnet: bump to version 1.16.4 Drop second patch (already in version) https://github.com/ofalk/libdnet/releases/tag/libdnet-1.16.2 https://github.com/ofalk/libdnet/releases/tag/libdnet-1.16.3 https://github.com/ofalk/libdnet/releases/tag/libdnet-1.16.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...02-Correct-path-to-string-h-from-bsd.patch | 26 ------------------- package/libdnet/libdnet.hash | 2 +- package/libdnet/libdnet.mk | 2 +- 4 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch diff --git a/.checkpackageignore b/.checkpackageignore index 72fd5ac40432..cb1d333fe3ef 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -653,7 +653,6 @@ package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch package/libcuefile/0001-fix-static-link.patch Upstream package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch Upstream package/libdnet/0001-python-makefile.patch Upstream -package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch Upstream package/libdrm/0001-tests-meson.build-disable-nouveau-tests-for-static-b.patch Upstream package/libdvbcsa/0001-altivec-powerpc64.patch Upstream package/libeXosip2/0001-src-eXtl_dtls.c-fix-build-with-libressl-3.4.1.patch Upstream diff --git a/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch b/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch deleted file mode 100644 index 2aa4f4516b0f..000000000000 --- a/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 347c23da1ec6f19b0b0143d53edcc209e522bbf2 Mon Sep 17 00:00:00 2001 -From: Oliver Falk -Date: Wed, 29 Jun 2022 13:27:45 +0200 -Subject: [PATCH] Correct path to string.h (from bsd); Fixes #74 - -[Retrieved (and backported) from: -https://github.com/ofalk/libdnet/commit/347c23da1ec6f19b0b0143d53edcc209e522bbf2] -Signed-off-by: Fabrice Fontaine ---- - python/dnet.c | 64 +++++++++++++++++++++++-------------------------- - python/dnet.pyx | 2 +- - 2 files changed, 31 insertions(+), 35 deletions(-) - -diff --git a/python/dnet.pyx b/python/dnet.pyx -index d9cbc90..af65a11 100644 ---- a/python/dnet.pyx -+++ b/python/dnet.pyx -@@ -40,7 +40,7 @@ cdef extern from *: - unsigned long htonl(unsigned long n) - unsigned long ntohl(unsigned long n) - --cdef extern from "string.h": -+cdef extern from "bsd/string.h": - int strlcpy(char *dst, char *src, int size) - - cdef __memcpy(char *dst, object src, int n): diff --git a/package/libdnet/libdnet.hash b/package/libdnet/libdnet.hash index c31ec905966c..0ffeca603a58 100644 --- a/package/libdnet/libdnet.hash +++ b/package/libdnet/libdnet.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b151c4913758ef80daf4558361b4f2680a37b01d59272625bb78c77183062c63 libdnet-1.16.1.tar.gz +sha256 7df1f0a3db9cf03b48cf50ab273fd6a20c1be99eb9344b9663fe3fd9ed9dab65 libdnet-1.16.4.tar.gz sha256 6b46ec86e290066c47b6607d322135b3c473566e7225ac23d35a7c0588a82da6 LICENSE diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index 14af07e6d55d..fc2995979d30 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDNET_VERSION = 1.16.1 +LIBDNET_VERSION = 1.16.4 LIBDNET_SITE = $(call github,ofalk,libdnet,libdnet-$(LIBDNET_VERSION)) LIBDNET_LICENSE = BSD-3-Clause LIBDNET_LICENSE_FILES = LICENSE From 35dcf9ee56695023ace9b2505fa169d262f8ff38 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 14:34:08 +0200 Subject: [PATCH 2038/2890] package/nanomsg: bump to version 1.2 https://github.com/nanomsg/nanomsg/releases/tag/1.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/nanomsg/nanomsg.hash | 2 +- package/nanomsg/nanomsg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nanomsg/nanomsg.hash b/package/nanomsg/nanomsg.hash index 04b658e8d8e8..abf117a572bc 100644 --- a/package/nanomsg/nanomsg.hash +++ b/package/nanomsg/nanomsg.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 218b31ae1534ab897cb5c419973603de9ca1a5f54df2e724ab4a188eb416df5a nanomsg-1.1.5.tar.gz +sha256 6ef7282e833df6a364f3617692ef21e59d5c4878acea4f2d7d36e21c8858de67 nanomsg-1.2.tar.gz # Hash for license file: sha256 4e51f6a04312ea7c5f4f0e92d91b6415c1eeb09bdaf86a6fd11d93499457c07a COPYING diff --git a/package/nanomsg/nanomsg.mk b/package/nanomsg/nanomsg.mk index b86e8c128a32..e5c576ef2ccb 100644 --- a/package/nanomsg/nanomsg.mk +++ b/package/nanomsg/nanomsg.mk @@ -4,7 +4,7 @@ # ################################################################################ -NANOMSG_VERSION = 1.1.5 +NANOMSG_VERSION = 1.2 NANOMSG_SITE = $(call github,nanomsg,nanomsg,$(NANOMSG_VERSION)) NANOMSG_INSTALL_STAGING = YES NANOMSG_LICENSE = MIT From da8bd82e3b0cdba0d3cbf73a85913a9b567c840e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 14:30:58 +0200 Subject: [PATCH 2039/2890] package/ndisc6: bump to version 1.0.7 https://git.remlab.net/gitweb/?p=ndisc6.git;a=blob;f=NEWS;h=34d9a653087a8e89f595156a4ec69969e5ca3013 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ndisc6/ndisc6.hash | 2 +- package/ndisc6/ndisc6.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ndisc6/ndisc6.hash b/package/ndisc6/ndisc6.hash index e258382c53da..550b9fffac94 100644 --- a/package/ndisc6/ndisc6.hash +++ b/package/ndisc6/ndisc6.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 a713210e9be1f15cfa0809f4c2728b00cd5f25881d7585126986982055453cfb ndisc6-1.0.6.tar.bz2 +sha256 edc431d70510d7321a5a39d243de0d0f63846dc9145b3b549c7348cc2bc96609 ndisc6-1.0.7.tar.bz2 # Locally computed sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk index 23734ca7d7e4..d797b82e653e 100644 --- a/package/ndisc6/ndisc6.mk +++ b/package/ndisc6/ndisc6.mk @@ -4,7 +4,7 @@ # ################################################################################ -NDISC6_VERSION = 1.0.6 +NDISC6_VERSION = 1.0.7 NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2 NDISC6_SITE = http://www.remlab.net/files/ndisc6 NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=c11" LIBS=$(TARGET_NLS_LIBS) From 6dc3d3c36063b4ef7a76badc0db2a60786eafee9 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Wed, 27 Sep 2023 09:36:00 +0200 Subject: [PATCH 2040/2890] package/gnuplot: bump version to 5.4.9 Changelog: http://www.gnuplot.info/ReleaseNotes_5_4_9.html Signed-off-by: Michael Fischer [Peter: use --without-qt for consistency] Signed-off-by: Peter Korsgaard --- package/gnuplot/gnuplot.hash | 8 ++++---- package/gnuplot/gnuplot.mk | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 2f482ca43416..6ed24b6d3c34 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.7/ -md5 cdc9bb3ac0cc7e717246ed3df2d6ffa2 gnuplot-5.4.7.tar.gz -sha1 6e68f94af822ff56549beab3a465c2fe976d3b34 gnuplot-5.4.7.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.9/ +md5 345533e461e41c263b3293f46651f0b2 gnuplot-5.4.9.tar.gz +sha1 1a3953660656a38178ae2b368efa895af55a5001 gnuplot-5.4.9.tar.gz # Locally computed -sha256 318a1501c9e659f39cf05ee5268335671bddc6c20eae06851f262fde27c2e739 gnuplot-5.4.7.tar.gz +sha256 a328a021f53dc05459be6066020e9a71e8eab6255d3381e22696120d465c6a97 gnuplot-5.4.9.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 23fbae10a9b3..b98da4267a14 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.7 +GNUPLOT_VERSION = 5.4.9 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright @@ -23,7 +23,8 @@ GNUPLOT_CONF_OPTS = \ --disable-wxwidgets \ --without-lua \ --without-latex \ - --without-cairo + --without-cairo \ + --without-qt # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) From 1c7d532ee9a9a4c9882412cfda7447df28fc3884 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Sep 2023 13:22:58 +0200 Subject: [PATCH 2041/2890] package/tor: bump version to 0.4.8.6 Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.8/ReleaseNotes Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index b6b183c2d1a4..ccc3c2c20540 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.8.5.tar.gz.sha256sum -sha256 6957cfd14a29eee7555c52f8387a46f2ce2f5fe7dadf93547f1bc74b1657e119 tor-0.4.8.5.tar.gz +# From https://dist.torproject.org/tor-0.4.8.6.tar.gz.sha256sum +sha256 552d895fcaf66c7cd2b50f5abe63b7884b30fed254115be7bfb9236807355088 tor-0.4.8.6.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index e86fec29f4ca..8e31ca749b8b 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.8.5 +TOR_VERSION = 0.4.8.6 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From df78ca175c9bd16200b96ad667d6f99b36acbc7b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 13:59:13 +0200 Subject: [PATCH 2042/2890] package/newt: bump to version 0.52.23 https://pagure.io/newt/blob/6e3a852c6becac7f2f231453682089577ad3de3d/f/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/newt/newt.hash | 4 ++-- package/newt/newt.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/newt/newt.hash b/package/newt/newt.hash index 36487d998ee9..6d5f7c3dcad3 100644 --- a/package/newt/newt.hash +++ b/package/newt/newt.hash @@ -1,5 +1,5 @@ # From https://releases.pagure.org/newt/CHECKSUMS -sha256 265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31 newt-0.52.21.tar.gz -sha512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c newt-0.52.21.tar.gz +sha256 caa372907b14ececfe298f0d512a62f41d33b290610244a58aed07bbc5ada12a newt-0.52.23.tar.gz +sha512 c845d03946f72a6b46301152d7dc308f71d17b03d255d73d02ea7deb5392e22522dc8504f941fcffe5309c6c10f1b56742dac8585a16b0dc7e0c463f18871dda newt-0.52.23.tar.gz # Locally calculated sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/newt/newt.mk b/package/newt/newt.mk index b39acb0fcf83..3c9efe132f3e 100644 --- a/package/newt/newt.mk +++ b/package/newt/newt.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEWT_VERSION = 0.52.21 +NEWT_VERSION = 0.52.23 NEWT_SITE = https://pagure.io/releases/newt NEWT_INSTALL_STAGING = YES NEWT_DEPENDENCIES = popt slang $(TARGET_NLS_DEPENDENCIES) From 9e2b91b7ac909065ce4931ad29f46def615413cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 14:06:36 +0200 Subject: [PATCH 2043/2890] package/omniorb: bump to version 4.3.1 https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.1/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/omniorb/omniorb.hash | 8 ++++---- package/omniorb/omniorb.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/omniorb/omniorb.hash b/package/omniorb/omniorb.hash index f522c1ef67df..36db67191d30 100644 --- a/package/omniorb/omniorb.hash +++ b/package/omniorb/omniorb.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0/ -sha1 c3f12c2278f8c4603910c02c8fe892c1dde7217e omniORB-4.3.0.tar.bz2 -md5 8889ab13b444b495ca2c2b48ea6a6bd7 omniORB-4.3.0.tar.bz2 +# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.1/ +sha1 b6581c9b6a956c1d442c442767b5a58899a09513 omniORB-4.3.1.tar.bz2 +md5 dc3e4467ef3f457025fedcc6403f8f13 omniORB-4.3.1.tar.bz2 # Locally generated -sha256 976045a2341f4e9a85068b21f4bd928993292933eeecefea372db09e0219eadd omniORB-4.3.0.tar.bz2 +sha256 0f42bc3eb737cae680dafa85b3ae3958e9f56a37912c5fb6b875933f8fb7390d omniORB-4.3.1.tar.bz2 sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index d6434735cf09..8235fac79705 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -OMNIORB_VERSION = 4.3.0 +OMNIORB_VERSION = 4.3.1 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 OMNIORB_INSTALL_STAGING = YES From cf155e0d0480f96746cff0ac84025580d375c237 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 14:08:26 +0200 Subject: [PATCH 2044/2890] package/openipmi: bump to version 2.0.34 https://sourceforge.net/p/openipmi/news/2023/09/openipmi-2034-released/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openipmi/openipmi.hash | 6 +++--- package/openipmi/openipmi.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index fc3cf1a5206f..fdba9518c78b 100644 --- a/package/openipmi/openipmi.hash +++ b/package/openipmi/openipmi.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 4387f227aad92756e296d1c9421e83231d355dbd OpenIPMI-2.0.33.tar.gz -md5 923d2914dbbc3307712f8c58401bab0f OpenIPMI-2.0.33.tar.gz +sha1 bc910d5d682710e9ff290c33e0780a71edba29d4 OpenIPMI-2.0.34.tar.gz +md5 9d27cc86b95a29251009db96452e7213 OpenIPMI-2.0.34.tar.gz # Locally computed -sha256 fb53e9ea5e2681cf8af7cda024b1a0044c675f84116ca27ae9616c8b7ad95b49 OpenIPMI-2.0.33.tar.gz +sha256 93227e43c72b5c3bd5949323e0669aa5527d1a971473a3a365af03fb8284a95f OpenIPMI-2.0.34.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index ccf86f93cd6f..1c406879e381 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.33 +OPENIPMI_VERSION = 2.0.34 OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause From 757c81f12690449e290078d9a2b8f8191e057616 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 14:15:40 +0200 Subject: [PATCH 2045/2890] package/openresolv: bump to version 3.13.2 https://github.com/NetworkConfiguration/openresolv/compare/v3.12.0...v3.13.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openresolv/openresolv.hash | 2 +- package/openresolv/openresolv.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/openresolv/openresolv.hash b/package/openresolv/openresolv.hash index 7a5fb0e1407b..c32b856de91e 100644 --- a/package/openresolv/openresolv.hash +++ b/package/openresolv/openresolv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 96b573e26d145f208d3758c2cd6fbf824b01005fc4cb7cedbdae29b3a3c8cb02 openresolv-3.12.0.tar.gz +sha256 36b5bcbe257a940c884f0d74321a47407baabab9e265e38859851c8311f6f0b0 openresolv-3.13.2.tar.xz sha256 384740bf5e19e7628d20f4dcc22925062fdc6020e9a6f074e567d4d797be57a0 LICENSE diff --git a/package/openresolv/openresolv.mk b/package/openresolv/openresolv.mk index 3857ab833dbb..176f6dab3ad8 100644 --- a/package/openresolv/openresolv.mk +++ b/package/openresolv/openresolv.mk @@ -4,8 +4,9 @@ # ################################################################################ -OPENRESOLV_VERSION = 3.12.0 -OPENRESOLV_SITE = $(call github,rsmarples,openresolv,openresolv-$(OPENRESOLV_VERSION)) +OPENRESOLV_VERSION = 3.13.2 +OPENRESOLV_SITE = https://github.com/rsmarples/openresolv/releases/download/v$(OPENRESOLV_VERSION) +OPENRESOLV_SOURCE = openresolv-$(OPENRESOLV_VERSION).tar.xz OPENRESOLV_LICENSE = BSD-2-Clause OPENRESOLV_LICENSE_FILES = LICENSE OPENRESOLV_CPE_ID_VENDOR = openresolv_project From 56c7da8e08c141ef078f5e6812c2380d76085baf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 16:51:55 +0200 Subject: [PATCH 2046/2890] package/xxhash: bump to version 0.8.2 - Drop all patches (already in version) - Update hash of LICENSE file (year updated with https://github.com/Cyan4973/xxHash/commit/f035303b8a86c1db9be70cbb638678ef6ef4cb2d) https://github.com/Cyan4973/xxHash/releases/tag/v0.8.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 4 -- .../0001-fix-man-page-installation.patch | 66 ----------------- ...kefile-add-dedicated-install-targets.patch | 71 ------------------- ...nd-on-assert-h-for-XXH_STATIC_ASSERT.patch | 29 -------- ...dd-install_libxxhash.includes-target.patch | 39 ---------- package/xxhash/xxhash.hash | 4 +- package/xxhash/xxhash.mk | 2 +- 7 files changed, 3 insertions(+), 212 deletions(-) delete mode 100644 package/xxhash/0001-fix-man-page-installation.patch delete mode 100644 package/xxhash/0002-Makefile-add-dedicated-install-targets.patch delete mode 100644 package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch delete mode 100644 package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch diff --git a/.checkpackageignore b/.checkpackageignore index cb1d333fe3ef..f7e82ed9e2d4 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1557,10 +1557,6 @@ package/xinetd/0004-configure-rlim_t.patch Upstream package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch Upstream package/xl2tp/xl2tpd TrailingSpace package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch Upstream -package/xxhash/0001-fix-man-page-installation.patch Upstream -package/xxhash/0002-Makefile-add-dedicated-install-targets.patch Upstream -package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch Upstream -package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch Upstream package/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch Upstream package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch Upstream package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch Upstream diff --git a/package/xxhash/0001-fix-man-page-installation.patch b/package/xxhash/0001-fix-man-page-installation.patch deleted file mode 100644 index 5d2a5a4efa85..000000000000 --- a/package/xxhash/0001-fix-man-page-installation.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 836f4e735cf368542f14005e41d2f84ec29dfd60 Mon Sep 17 00:00:00 2001 -From: Yann Collet -Date: Sat, 4 Dec 2021 10:29:49 -0800 -Subject: [PATCH] fix man page installation - -for variant redirectors (`xxh32sum`, `xxh64sum` and `xxh128sum`). -fix #647, reported by @jpalus. - -Also : slightly updated man page text, for clarity and accuracy. - -[Retrieved (and updated to keep only Makefile update) from: -https://github.com/Cyan4973/xxHash/commit/836f4e735cf368542f14005e41d2f84ec29dfd60] -Signed-off-by: Fabrice Fontaine ---- - Makefile | 14 ++++++++------ - cli/xxhsum.1 | 8 ++++---- - cli/xxhsum.1.md | 8 +++++--- - 3 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/Makefile b/Makefile -index 2fbefbc6..63273e16 100644 ---- a/Makefile -+++ b/Makefile -@@ -457,6 +457,7 @@ endif - - INSTALL_PROGRAM ?= $(INSTALL) - INSTALL_DATA ?= $(INSTALL) -m 644 -+INSTALL_DIR ?= $(INSTALL) -d -m 755 - - - # Escape special symbols by putting each character into its separate class -@@ -496,7 +497,7 @@ libxxhash.pc: libxxhash.pc.in - .PHONY: install - install: lib libxxhash.pc xxhsum ## install libraries, CLI, links and man page - @echo Installing libxxhash -- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR) -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(Q)$(INSTALL_DATA) libxxhash.a $(DESTDIR)$(LIBDIR) - $(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(LIBDIR) - $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR) -@@ -508,19 +509,20 @@ ifeq ($(DISPATCH),1) - $(Q)$(INSTALL_DATA) xxh_x86dispatch.h $(DESTDIR)$(INCLUDEDIR) - endif - @echo Installing pkgconfig -- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGCONFIGDIR)/ - $(Q)$(INSTALL_DATA) libxxhash.pc $(DESTDIR)$(PKGCONFIGDIR)/ - @echo Installing xxhsum -- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/ -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/ - $(Q)$(INSTALL_PROGRAM) xxhsum $(DESTDIR)$(BINDIR)/xxhsum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh32sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh128sum - @echo Installing man pages -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/ - $(Q)$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MANDIR)/xxhsum.1 -- $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh32sum.1 -- $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh64sum.1 -- $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh128sum.1 -+ $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1 -+ $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh64sum.1 -+ $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 - @echo xxhash installation completed - - .PHONY: uninstall diff --git a/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch deleted file mode 100644 index 17d34a082333..000000000000 --- a/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0e7418bce83bb9c236d9cb4535a36a80cd0cc663 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 15 Dec 2021 21:45:14 +0100 -Subject: [PATCH] Makefile: add dedicated install targets - -Add dedicated install targets to allow the user to install only xxhsum, -the static library, the shared library, etc. - -This is especially useful on embedded systems where dynamic library is -not always supported by toolchains - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/Cyan4973/xxHash/commit/db9c199e99f7b4d419647b1ef49c547fc2547516] ---- - Makefile | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 8d4fcd21..5fe72972 100644 ---- a/Makefile -+++ b/Makefile -@@ -505,11 +505,14 @@ libxxhash.pc: libxxhash.pc.in - $< > $@ - - --.PHONY: install --install: lib libxxhash.pc xxhsum ## install libraries, CLI, links and man page -- @echo Installing libxxhash -+install_libxxhash.a: libxxhash.a -+ @echo Installing libxxhash.a - $(Q)$(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(Q)$(INSTALL_DATA) libxxhash.a $(DESTDIR)$(LIBDIR) -+ -+install_libxxhash: libxxhash -+ @echo Installing libxxhash -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(LIBDIR) - $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR) - $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT) -@@ -519,21 +522,30 @@ install: lib libxxhash.pc xxhsum ## install libraries, CLI, links and man page - ifeq ($(DISPATCH),1) - $(Q)$(INSTALL_DATA) xxh_x86dispatch.h $(DESTDIR)$(INCLUDEDIR) - endif -+ -+install_libxxhash.pc: libxxhash.pc - @echo Installing pkgconfig - $(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGCONFIGDIR)/ - $(Q)$(INSTALL_DATA) libxxhash.pc $(DESTDIR)$(PKGCONFIGDIR)/ -+ -+install_xxhsum: xxhsum - @echo Installing xxhsum - $(Q)$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/ - $(Q)$(INSTALL_PROGRAM) xxhsum $(DESTDIR)$(BINDIR)/xxhsum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh32sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh128sum -+ -+install_man: - @echo Installing man pages - $(Q)$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/ - $(Q)$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MANDIR)/xxhsum.1 - $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1 - $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh64sum.1 - $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 -+ -+.PHONY: install -+install: install_libxxhash.a install_libxxhash install_libxxhash.pc install_xxhsum install_man ## install libraries, CLI, links and man page - @echo xxhash installation completed - - .PHONY: uninstall diff --git a/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch b/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch deleted file mode 100644 index 3b65ae1d6c2f..000000000000 --- a/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6189ecd3d44a693460f86280ccf49d33cb4b18e1 Mon Sep 17 00:00:00 2001 -From: Yann Collet -Date: Sun, 26 Dec 2021 15:15:26 -0800 -Subject: [PATCH] do no longer depend on `` for XXH_STATIC_ASSERT - -since some versions are buggy. - -Use `_Static_assert` instead, which is part of the C11 language. -[Retrieved from: -https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1] -Signed-off-by: Fabrice Fontaine ---- - xxhash.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/xxhash.h b/xxhash.h -index 311a69c7..5dfd5c45 100644 ---- a/xxhash.h -+++ b/xxhash.h -@@ -1749,8 +1749,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) - /* note: use after variable declarations */ - #ifndef XXH_STATIC_ASSERT - # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ --# include --# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) -+# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) - # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ - # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) - # else diff --git a/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch b/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch deleted file mode 100644 index 22c8cdaadff8..000000000000 --- a/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b7c91f761b6d0b79398d0a064d2d6e34de3dfa47 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 27 Dec 2022 23:12:37 +0100 -Subject: [PATCH] Makefile: add install_libxxhash.includes target - -Add install_libxxhash.includes to be able to install headers when -building and installing the static library - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/Cyan4973/xxHash/pull/776] ---- - Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index cfa5779..2276282 100644 ---- a/Makefile -+++ b/Makefile -@@ -557,6 +557,8 @@ install_libxxhash: libxxhash - $(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(LIBDIR) - $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR) - $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT) -+ -+install_libxxhash.includes: - $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR) # includes - $(Q)$(INSTALL_DATA) xxhash.h $(DESTDIR)$(INCLUDEDIR) - $(Q)$(INSTALL_DATA) xxh3.h $(DESTDIR)$(INCLUDEDIR) # for compatibility, will be removed in v0.9.0 -@@ -586,7 +588,7 @@ install_man: - $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 - - .PHONY: install --install: install_libxxhash.a install_libxxhash install_libxxhash.pc install_xxhsum install_man ## install libraries, CLI, links and man page -+install: install_libxxhash.a install_libxxhash install_libxxhash.includes install_libxxhash.pc install_xxhsum install_man ## install libraries, CLI, links and man page - @echo xxhash installation completed - - .PHONY: uninstall --- -2.35.1 - diff --git a/package/xxhash/xxhash.hash b/package/xxhash/xxhash.hash index 2c99236a45dd..216d07ddbdc6 100644 --- a/package/xxhash/xxhash.hash +++ b/package/xxhash/xxhash.hash @@ -1,4 +1,4 @@ # locally computed -sha256 3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c xxhash-0.8.1.tar.gz -sha256 553d0035773ddd1590045f8fdc3a4c6ead31e36336721aeca8421e88ed1c9f80 LICENSE +sha256 baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4 xxhash-0.8.2.tar.gz +sha256 6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 cli/COPYING diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 75d375a2fa13..7708ba1e1969 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -4,7 +4,7 @@ # ################################################################################ -XXHASH_VERSION = 0.8.1 +XXHASH_VERSION = 0.8.2 XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) XXHASH_LICENSE_FILES = LICENSE cli/COPYING From 6ce55ab0ed3b7125cd11ecfe8c18aaf156b5f060 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 17:09:26 +0200 Subject: [PATCH 2047/2890] package/memcached: bump to version 1.6.21 - Send first patch upstream - Drop second and third patches (already in version) and so drop autoreconf https://github.com/memcached/memcached/wiki/ReleaseNotes1618 https://github.com/memcached/memcached/wiki/ReleaseNotes1619 https://github.com/memcached/memcached/wiki/ReleaseNotes1620 https://github.com/memcached/memcached/wiki/ReleaseNotes1621 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 - .../0001-logger.c-initialize-rport.patch | 2 +- .../memcached/0002-check-for-sys-auxv.h.patch | 50 -------------- ...0003-configure.ac-add-disable-werror.patch | 65 ------------------- package/memcached/memcached.hash | 6 +- package/memcached/memcached.mk | 4 +- 6 files changed, 5 insertions(+), 125 deletions(-) delete mode 100644 package/memcached/0002-check-for-sys-auxv.h.patch delete mode 100644 package/memcached/0003-configure.ac-add-disable-werror.patch diff --git a/.checkpackageignore b/.checkpackageignore index f7e82ed9e2d4..95ea697c4974 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -883,9 +883,6 @@ package/matchbox/0001-defaulttheme.patch Upstream package/matchbox/0002-src-Fix-build-with-gcc-10.patch Upstream package/mediastreamer/0001-src-videofilters-nowebcam.c-fix-build-without-ffmpeg.patch Upstream package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch Upstream -package/memcached/0001-logger.c-initialize-rport.patch Upstream -package/memcached/0002-check-for-sys-auxv.h.patch Upstream -package/memcached/0003-configure.ac-add-disable-werror.patch Upstream package/memstat/0001-PATH_MAX.patch Upstream package/mender-connect/S43mender-connect Shellcheck package/menu-cache/0001-Support-gcc10-compilation.patch Upstream diff --git a/package/memcached/0001-logger.c-initialize-rport.patch b/package/memcached/0001-logger.c-initialize-rport.patch index 5fb13d5eee45..002a6896018e 100644 --- a/package/memcached/0001-logger.c-initialize-rport.patch +++ b/package/memcached/0001-logger.c-initialize-rport.patch @@ -23,7 +23,7 @@ Fixes: - http://autobuild.buildroot.org/results/7a46ac38d10b1859034017e0294961daa8f48dd2 Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] +Upstream: https://github.com/memcached/memcached/pull/1077 --- logger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/memcached/0002-check-for-sys-auxv.h.patch b/package/memcached/0002-check-for-sys-auxv.h.patch deleted file mode 100644 index a7d0dfdd0016..000000000000 --- a/package/memcached/0002-check-for-sys-auxv.h.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 58b6de2135c10b64918f25c48f69f144d08a9c0d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 3 Jun 2022 19:10:15 +0200 -Subject: [PATCH] check for sys/auxv.h - -Check for sys/auxv.h to avoid the following uclibc build failure on -aarch64: - -crc32c.c:277:10: fatal error: sys/auxv.h: No such file or directory - 277 | #include - | ^~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/08591fbf9677ff126492c50c15170c641bcab56a - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] ---- - configure.ac | 1 + - crc32c.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0985f07..3337fe7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -516,6 +516,7 @@ AH_BOTTOM([#ifdef HAVE_INTTYPES_H - #include - #endif - ]) -+AC_CHECK_HEADERS([sys/auxv.h]) - - dnl ********************************************************************** - dnl Figure out if this system has the stupid sasl_callback_ft -diff --git a/crc32c.c b/crc32c.c -index 26df879..05e61ff 100644 ---- a/crc32c.c -+++ b/crc32c.c -@@ -273,7 +273,7 @@ void crc32c_init(void) { - } - - #elif defined(__aarch64__) && (defined(__linux__) || defined(__APPLE__)) --#if defined(__linux__) -+#if defined(__linux__) && defined(HAVE_SYS_AUX_H) - #include - #elif defined(__APPLE__) - #include --- -2.35.1 - diff --git a/package/memcached/0003-configure.ac-add-disable-werror.patch b/package/memcached/0003-configure.ac-add-disable-werror.patch deleted file mode 100644 index dab9b8835dcf..000000000000 --- a/package/memcached/0003-configure.ac-add-disable-werror.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 8497f7ed38146378a988bc22800b3a5eba38b0fd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 13 Jun 2022 16:29:38 +0200 -Subject: [PATCH] configure.ac: add --disable-werror - -Allow the user to disable -Werror to avoid the following build failure: - -In file included from hash.c:7: -xxhash.h:2667:5: error: #warning is a GCC extension [-Werror] - 2667 | # warning "XXH3 is highly inefficient without ARM or Thumb-2." - | ^~~~~~~ -xxhash.h:2667:5: error: #warning "XXH3 is highly inefficient without ARM or Thumb-2." [-Werror=cpp] - -Fixes: - - http://autobuild.buildroot.org/results/3124bae73c207f1a118e57e41e222ef464ccb297 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/memcached/memcached/pull/926] ---- - configure.ac | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3337fe7..7683b8f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -114,6 +114,9 @@ AC_ARG_ENABLE(static, - AC_ARG_ENABLE(unix_socket, - [AS_HELP_STRING([--disable-unix-socket], [Disable unix domain socket])]) - -+AC_ARG_ENABLE(werror, -+ [AS_HELP_STRING([--disable-werror], [Disable -Werror])]) -+ - dnl ********************************************************************** - dnl DETECT_SASL_CB_GETCONF - dnl -@@ -783,6 +786,10 @@ AM_CONDITIONAL([BUILD_SPECIFICATIONS], - [test "x$enable_docs" != "xno" -a "x$XML2RFC" != "xno" -a "x$XSLTPROC" != "xno"]) - - -+if test "x$enable_werror" != "xno"; then -+ CFLAGS="$CFLAGS -Werror" -+fi -+ - dnl Let the compiler be a bit more picky. Please note that you cannot - dnl specify these flags to the compiler before AC_CHECK_FUNCS, because - dnl the test program will generate a compilation warning and hence fail -@@ -790,12 +797,12 @@ dnl to detect the function ;-) - if test "$ICC" = "yes" - then - dnl ICC trying to be gcc. -- CFLAGS="$CFLAGS -diag-disable 187 -Wall -Werror" -+ CFLAGS="$CFLAGS -diag-disable 187 -Wall" - AC_DEFINE([_GNU_SOURCE],[1],[make sure IOV_MAX is defined]) - elif test "$GCC" = "yes" - then - GCC_VERSION=`$CC -dumpversion` -- CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls" -+ CFLAGS="$CFLAGS -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls" - if test "x$enable_asan" = "xyes"; then - CFLAGS="$CFLAGS -fsanitize=address" - fi --- -2.35.1 - diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 78875dde662b..c223a14bacf2 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.6.17.tar.gz.sha1 -sha1 e25639473e15f1bd9516b915fb7e03ab8209030f memcached-1.6.17.tar.gz +# From http://www.memcached.org/files/memcached-1.6.21.tar.gz.sha1 +sha1 6d899680b4ba4b76b6c92120143cf87630ee984a memcached-1.6.21.tar.gz # Locally computed -sha256 2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224 memcached-1.6.17.tar.gz +sha256 c788980efc417dd5d93c442b1c8b8769fb2018896c29de3887d22a2f143da2ee memcached-1.6.21.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 7183da6c14e6..2ebc672d1c5a 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.6.17 +MEMCACHED_VERSION = 1.6.21 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' @@ -13,8 +13,6 @@ MEMCACHED_LICENSE = BSD-3-Clause MEMCACHED_LICENSE_FILES = COPYING MEMCACHED_CPE_ID_VENDOR = memcached MEMCACHED_SELINUX_MODULES = memcached -# We're patching configure.ac -MEMCACHED_AUTORECONF = YES ifeq ($(BR2_ENDIAN),"BIG") MEMCACHED_CONF_ENV += ac_cv_c_endian=big From 181cf756ca42422569ed4fa8ac00ea844722208d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 19:32:49 +0200 Subject: [PATCH 2048/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 90ab04805502..7ddcf013f88a 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.4.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.4.16" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index d62fc7de0916..cac7fba207e9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 75eae323747ae37b05086c5a51326a744eb611b0e890e7ebe77de362b30450e6 linux-6.4.14.tar.xz -sha256 58b0446d8ea4bc0b26a35e2e3509bd53efcdeb295c9e4f48d33a23b1cdaa103b linux-6.1.51.tar.xz +sha256 9626ec84a39ecb009bf11a271dd520941159c165d4e62f82e3a77b79d20ff27d linux-6.4.16.tar.xz +sha256 a87e241ec15d53452c4efe219713a3769d88cc436b5b98cf6efb262c4aff15c0 linux-6.1.55.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 ab464e4107329ff5262f1c585c40fc29dc68f17687a9a918f3e90faba5303d62 linux-5.15.130.tar.xz -sha256 240d5e47bb378c6813ecd07704fb887651ea7617159d2771071fd70bf33cd995 linux-5.10.194.tar.xz -sha256 c7a4086ba23507b8539d18534565de0d6591138bfa2e449e93964fd5132e353a linux-5.4.256.tar.xz +sha256 ef845e7934897b88e4448378ea9daacac19e07f156fe904844fab0a7d8ff5ddd linux-5.15.133.tar.xz +sha256 183a4507b0ebec7816a79ceba6253aa7ad345e25b0fcd4e834ee154be9a993ab linux-5.10.197.tar.xz +sha256 2e775970521ea7ff6eb613fc85a6e34cec73feaeb67b88a77a2fbd4f75483df0 linux-5.4.257.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 ccadbde939a788934436125a1ecd4464175b68ebe6c18072fbc90c8596eea00f linux-4.19.294.tar.xz -sha256 5b69e182ced5190a1fca117682cf7967c5bab24c4cf1364733ee14055b0df784 linux-4.14.325.tar.xz +sha256 b732c2e4f08576a9dd5bb14213cead3835acbb101a91aaba3d6ace302fd538ac linux-4.19.295.tar.xz +sha256 555ce40f1df4c0f4a74cbefcaad0c67108615860968720faabe51cdee2df1478 linux-4.14.326.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7e67dfad5cfb..a0bdbe85551b 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -400,13 +400,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.325" if BR2_KERNEL_HEADERS_4_14 - default "4.19.294" if BR2_KERNEL_HEADERS_4_19 - default "5.4.256" if BR2_KERNEL_HEADERS_5_4 - default "5.10.194" if BR2_KERNEL_HEADERS_5_10 - default "5.15.130" if BR2_KERNEL_HEADERS_5_15 - default "6.1.51" if BR2_KERNEL_HEADERS_6_1 - default "6.4.14" if BR2_KERNEL_HEADERS_6_4 + default "4.14.326" if BR2_KERNEL_HEADERS_4_14 + default "4.19.295" if BR2_KERNEL_HEADERS_4_19 + default "5.4.257" if BR2_KERNEL_HEADERS_5_4 + default "5.10.197" if BR2_KERNEL_HEADERS_5_10 + default "5.15.133" if BR2_KERNEL_HEADERS_5_15 + default "6.1.55" if BR2_KERNEL_HEADERS_6_1 + default "6.4.16" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 18d21c9cfc93da9896e32bdd173b607c85980708 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 19:32:50 +0200 Subject: [PATCH 2049/2890] {toolchain, linux-headers}: add support for 6.5 headers And add (and default to) 6.5 to linux-headers. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index cac7fba207e9..858e615a121c 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95 linux-6.5.5.tar.xz sha256 9626ec84a39ecb009bf11a271dd520941159c165d4e62f82e3a77b79d20ff27d linux-6.4.16.tar.xz sha256 a87e241ec15d53452c4efe219713a3769d88cc436b5b98cf6efb262c4aff15c0 linux-6.1.55.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a0bdbe85551b..ee4e953bf026 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_4 + default BR2_KERNEL_HEADERS_6_5 help Select the kernel version to get headers from. @@ -52,6 +52,10 @@ config BR2_KERNEL_HEADERS_6_1 config BR2_KERNEL_HEADERS_6_4 bool "Linux 6.4.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 + +config BR2_KERNEL_HEADERS_6_5 + bool "Linux 6.5.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -129,8 +133,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5 + bool "6.5.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 - bool "6.4.x or later" + bool "6.4.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_3 @@ -407,6 +415,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.133" if BR2_KERNEL_HEADERS_5_15 default "6.1.55" if BR2_KERNEL_HEADERS_6_1 default "6.4.16" if BR2_KERNEL_HEADERS_6_4 + default "6.5.5" if BR2_KERNEL_HEADERS_6_5 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index da6bf5f4c87a..d8081f1b9d30 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -636,6 +636,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -649,6 +653,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 default "6.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 default "6.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 0f4f5eef2e24..556ca7a642c4 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -162,8 +162,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_5 + bool "6.5.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_4 - bool "6.4.x or later" + bool "6.4.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_3 From b5ba9f80ad99980a290905a57a447148c097a7b1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 19:32:51 +0200 Subject: [PATCH 2050/2890] linux: bump latest version to 6.5 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 7ddcf013f88a..8dcc493e2e70 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.4)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.5)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.162-cip24)" @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.4.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.5.5" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From 2a711479d38e1862a754159c76307bbad3e92fb8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2023 19:32:52 +0200 Subject: [PATCH 2051/2890] package/linux-headers: drop 6.4.x option The 6.4.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index daf83dda4a1c..ca802792122e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.11" +config BR2_KERNEL_HEADERS_6_4 + bool "kernel headers version 6.4.x are no longer supported" + select BR2_LEGACY + help + Version 6.4.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS bool "google-material-design-icons removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 858e615a121c..bdd27eb6007d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95 linux-6.5.5.tar.xz -sha256 9626ec84a39ecb009bf11a271dd520941159c165d4e62f82e3a77b79d20ff27d linux-6.4.16.tar.xz sha256 a87e241ec15d53452c4efe219713a3769d88cc436b5b98cf6efb262c4aff15c0 linux-6.1.55.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 ef845e7934897b88e4448378ea9daacac19e07f156fe904844fab0a7d8ff5ddd linux-5.15.133.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ee4e953bf026..d1023a15e6c4 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -49,10 +49,6 @@ config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 -config BR2_KERNEL_HEADERS_6_4 - bool "Linux 6.4.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 - config BR2_KERNEL_HEADERS_6_5 bool "Linux 6.5.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 @@ -414,7 +410,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.197" if BR2_KERNEL_HEADERS_5_10 default "5.15.133" if BR2_KERNEL_HEADERS_5_15 default "6.1.55" if BR2_KERNEL_HEADERS_6_1 - default "6.4.16" if BR2_KERNEL_HEADERS_6_4 default "6.5.5" if BR2_KERNEL_HEADERS_6_5 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From ff82db21f8da62a0dbf149814f2b36fe33052ec1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Sep 2023 20:36:20 +0200 Subject: [PATCH 2052/2890] package/intel-gmmlib: bump version to 22.3.12 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 9f2c8cc1fddb..c71f2593d105 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8a6005440bf336309a2abbeeb3e006e229715c4b39ca31c6d0e510050e53dcc7 intel-gmmlib-22.3.10.tar.gz +sha256 14ec859936aea696a65e6b9488e95a0ac26b15126ef65b20956ef219004dd9a6 intel-gmmlib-22.3.12.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index dddd1a13fdfa..578a6ab76265 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.10 +INTEL_GMMLIB_VERSION = 22.3.12 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 6b7f001a475e522233c06c6e92f8aa17d07b794c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Sep 2023 20:36:21 +0200 Subject: [PATCH 2053/2890] package/intel-mediadriver: bump version to 23.3.3 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 012317db3dbf..d2ef168a64cf 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6a0fc8513fb60e2e2fc2178a8fb0b25cb5dbacf52a645af9a9297fc5f43822ab intel-media-23.3.2.tar.gz +sha256 66bcce50e9ade800891d08ae3e6cac5aeda60c7ede945ab19e8d2a33e321d06e intel-media-23.3.3.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 44edba600774..435424c5a472 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 23.3.2 +INTEL_MEDIADRIVER_VERSION = 23.3.3 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From c7cd67517c97cfaed4316faab3015482a93794af Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Sep 2023 20:36:22 +0200 Subject: [PATCH 2054/2890] package/onevpl-intel-gpu: bump version to 23.3.3 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/onevpl-intel-gpu/onevpl-intel-gpu.hash | 2 +- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash index 70af121d2898..fab7ca0eae82 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 311658f18b45645ffa9337a6307d59a1025b6f77f8fe122c332f536a14e1ef44 onevpl-intel-gpu-23.3.2.tar.gz +sha256 4f31a10d51fb09c87fa62afb6da51778f0d946de900f3367816864dc0e096b29 onevpl-intel-gpu-23.3.3.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index cbc612f4f340..311ab88b4efd 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_INTEL_GPU_VERSION = 23.3.2 +ONEVPL_INTEL_GPU_VERSION = 23.3.3 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) ONEVPL_INTEL_GPU_LICENSE = MIT ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE From 197d0a4cb26d1fca3b7efaf1682a36aaaec253a2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 22:08:45 +0200 Subject: [PATCH 2055/2890] package/sg3_utils: bump to version 1.48 - Drop patches (already in version) and so drop autoreconf - Update hash of BSD_LICENSE (update in year: https://github.com/hreinecke/sg3_utils/commit/551657bfbf3b571a7b8ca6e489a407cb22eab387) https://github.com/hreinecke/sg3_utils/blob/v1.48/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 - .../0001-src-sg_dd.c-fix-musl-build.patch | 39 ------------------- ...002-configure.ac-fix-uclibc-ng-build.patch | 36 ----------------- package/sg3_utils/sg3_utils.hash | 4 +- package/sg3_utils/sg3_utils.mk | 4 +- 5 files changed, 3 insertions(+), 82 deletions(-) delete mode 100644 package/sg3_utils/0001-src-sg_dd.c-fix-musl-build.patch delete mode 100644 package/sg3_utils/0002-configure.ac-fix-uclibc-ng-build.patch diff --git a/.checkpackageignore b/.checkpackageignore index 95ea697c4974..1040dba90501 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1304,8 +1304,6 @@ package/ser2net/S50ser2net Indent Shellcheck Variables package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch Upstream package/setserial/0001-build-system-fix.patch Upstream package/setserial/0002-tiocghayesesp-build-fix.patch Upstream -package/sg3_utils/0001-src-sg_dd.c-fix-musl-build.patch Upstream -package/sg3_utils/0002-configure.ac-fix-uclibc-ng-build.patch Upstream package/shadowsocks-libev/0001-configure.ac-use-pkg-config-to-find-netfilter_conntr.patch Upstream package/shadowsocks-libev/0002-fix-maybe-uninitialized-errors.patch Upstream package/shadowsocks-libev/0003-lib-Makefile.am-remove-static-from-LDFLAGS.patch Upstream diff --git a/package/sg3_utils/0001-src-sg_dd.c-fix-musl-build.patch b/package/sg3_utils/0001-src-sg_dd.c-fix-musl-build.patch deleted file mode 100644 index 50a81a78a469..000000000000 --- a/package/sg3_utils/0001-src-sg_dd.c-fix-musl-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c93ad13ecd8ddfbb8bb3e4d5d5ad7f3f2c633db6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 14 Nov 2021 12:37:16 +0100 -Subject: [PATCH] src/sg_dd.c: fix musl build - -Fix the following build failure on musl raised since version 1.47 and -https://github.com/doug-gilbert/sg3_utils/commit/f0195003bb0c66ba55084b2f7e0fe982f08c5675: - -sg_dd.c: In function 'main': -sg_dd.c:2402:17: error: unknown type name 'uint'; did you mean 'int'? - 2402 | uint off; - | ^~~~ - | int - -Fixes: - - http://autobuild.buildroot.org/results/9ead59ffefefe2a4e3b94a153b3d23231736d882 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/doug-gilbert/sg3_utils/pull/7] ---- - src/sg_dd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sg_dd.c b/src/sg_dd.c -index 9d05c93..35e2423 100644 ---- a/src/sg_dd.c -+++ b/src/sg_dd.c -@@ -2399,7 +2399,7 @@ main(int argc, char * argv[]) - res = blocks * blk_sz; - if (iflag.zero && iflag.ff && (blk_sz >= 4)) { - uint32_t pos = (uint32_t)skip; -- uint off; -+ uint32_t off; - - for (k = 0, off = 0; k < blocks; ++k, off += blk_sz, ++pos) { - for (j = 0; j < (blk_sz - 3); j += 4) --- -2.33.0 - diff --git a/package/sg3_utils/0002-configure.ac-fix-uclibc-ng-build.patch b/package/sg3_utils/0002-configure.ac-fix-uclibc-ng-build.patch deleted file mode 100644 index 4c475ee1ff47..000000000000 --- a/package/sg3_utils/0002-configure.ac-fix-uclibc-ng-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1e95d5b8c507a49f6d15d2795dc46d82b4d1ded0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 16 Nov 2021 08:41:48 +0100 -Subject: [PATCH] configure.ac: fix uclibc-ng build - -Fix the following build failure with uclibc-ng raised because SG_IO is -not defined: - -/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: sg_dd.o: in function `sg_read_low.constprop.0': -sg_dd.c:(.text+0xc6c): undefined reference to `sg_chk_n_print3' - -Fixes: - - http://autobuild.buildroot.org/results/38a0dfc70a21ce574368b7a485deb231f778b3e7 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/doug-gilbert/sg3_utils/pull/8] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0a65d94..23378ad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -107,7 +107,7 @@ case "${host}" in - AC_DEFINE_UNQUOTED(HAVE_NVME, 1, [Found NVMe]) - check_for_getrandom - CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO";; -- *-*-linux-gnu* | *-*-linux*) -+ *-*-linux-gnu* | *-*-linux* | *-*-uclinux-gnu* | *-*-uclinux*) - AC_DEFINE_UNQUOTED(SG_LIB_LINUX, 1, [sg3_utils on linux]) - check_for_linux_sg_v4_hdr - check_for_getrandom --- -2.33.0 - diff --git a/package/sg3_utils/sg3_utils.hash b/package/sg3_utils/sg3_utils.hash index ff2ef5518017..0a06595a3127 100644 --- a/package/sg3_utils/sg3_utils.hash +++ b/package/sg3_utils/sg3_utils.hash @@ -1,6 +1,6 @@ # Locally calculated from download (no sig, hash) -sha256 ddb0cab85fedd8b0db020f3e3f02f6967a055616bf16ea9d5c7408cde41472b2 sg3_utils-1.47.tar.xz +sha256 d6b9a41690d540e58d1e99c26ac8db37336c849ef6a03f96ea48ca2fe334dbfa sg3_utils-1.48.tar.xz # Hash for license files sha256 d212debdb0a5d7754c977f6dc53bb6c88b4ace7ab784ddbccd06bb970adb1a37 COPYING -sha256 8ddd1d82f2be2f5cbd5b5c3b5c2ee94a90d2ca7112958448da74dd78384fd96a BSD_LICENSE +sha256 6b1a1de0b3394002973daaa407b93a1d2c13efd8dd1a32095d6872c36f09ba66 BSD_LICENSE diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk index b291bd69d9e9..3d85a59a57c4 100644 --- a/package/sg3_utils/sg3_utils.mk +++ b/package/sg3_utils/sg3_utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SG3_UTILS_VERSION = 1.47 +SG3_UTILS_VERSION = 1.48 SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz SG3_UTILS_SITE = http://sg.danny.cz/sg/p SG3_UTILS_LICENSE = BSD-2-Clause (library) @@ -13,8 +13,6 @@ ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y) SG3_UTILS_LICENSE += , GPL-2.0+ (programs), BSD-2-Clause (programs) endif SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE -# We're patching configure.ac -SG3_UTILS_AUTORECONF = YES # install the libsgutils2 library SG3_UTILS_INSTALL_STAGING = YES From 7aa5e8f84fa47259db3b4f66edb452a94e8eca1e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 22:55:05 +0200 Subject: [PATCH 2056/2890] package/snappy: bump to version 1.1.10 Drop patch (already in version) https://github.com/google/snappy/blob/1.1.10/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch | 71 ------------------- package/snappy/snappy.hash | 2 +- package/snappy/snappy.mk | 2 +- 4 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch diff --git a/.checkpackageignore b/.checkpackageignore index 1040dba90501..2e24f4c27c8a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1319,7 +1319,6 @@ package/smcroute/S41smcroute Indent NotExecutable Variables package/smstools3/0001-fix-Makefile.patch Upstream package/smstools3/0002-fix-build-with-gcc-10.x.patch Upstream package/smstools3/S50smsd Shellcheck Variables -package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch Upstream package/snmppp/0001-fix-build-without-v3.patch Upstream package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch Upstream package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch Upstream diff --git a/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch b/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch deleted file mode 100644 index bd2ef0779445..000000000000 --- a/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0c716d435abe65250100c2caea0e5126ac4e14bd Mon Sep 17 00:00:00 2001 -From: "Georgi D. Sotirov" -Date: Wed, 5 May 2021 14:16:46 +0300 -Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE - -Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to -fix the following compilation errors and a warning with GCC: - -[ 2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o -/usr/bin/c++ -DHAVE_CONFIG_H -Dsnappy_EXPORTS --I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9 -O3 --march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3 --DNDEBUG -fPIC -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c -/tmp/snappy-1.1.9/snappy.cc -/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline -function might not be inlinable [-Wattributes] - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair snappy::DecompressBranchless(const uint8_t*, const -uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned -char; ptrdiff_t = int]': -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -CMakeFiles/snappy.dir/build.make:137: recipe for target -'CMakeFiles/snappy.dir/snappy.cc.o' failed - -Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE -macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++ -inline specifier. - -[Retrieved from: -https://github.com/google/snappy/pull/128/commits/0c716d435abe65250100c2caea0e5126ac4e14bd] -Signed-off-by: Fabrice Fontaine ---- - snappy.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/snappy.cc b/snappy.cc -index 79dc0e8d..51157be2 100644 ---- a/snappy.cc -+++ b/snappy.cc -@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) { - } - - SNAPPY_ATTRIBUTE_ALWAYS_INLINE --size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { -+inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - const uint8_t*& ip = *ip_p; - // This section is crucial for the throughput of the decompression loop. - // The latency of an iteration is fundamentally constrained by the diff --git a/package/snappy/snappy.hash b/package/snappy/snappy.hash index b49b0e7e3b4a..729d696d7e62 100644 --- a/package/snappy/snappy.hash +++ b/package/snappy/snappy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 snappy-1.1.9.tar.gz +sha256 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90 snappy-1.1.10.tar.gz sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk index d31dcdd5fe13..c96dff35fa01 100644 --- a/package/snappy/snappy.mk +++ b/package/snappy/snappy.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNAPPY_VERSION = 1.1.9 +SNAPPY_VERSION = 1.1.10 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3-Clause SNAPPY_LICENSE_FILES = COPYING From c11478fb2760de4def18bb823d7ee498f7ade198 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 23:10:12 +0200 Subject: [PATCH 2057/2890] package/brotli: bump to version 1.1.0 Drop patches (already in version) https://github.com/google/brotli/releases/tag/v1.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 - ...g-BUILD_SHARED_LIBS-to-choose-static.patch | 130 ------------------ ...time-linker-path-to-pkg-config-files.patch | 51 ------- package/brotli/brotli.hash | 2 +- package/brotli/brotli.mk | 2 +- 5 files changed, 2 insertions(+), 185 deletions(-) delete mode 100644 package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch delete mode 100644 package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch diff --git a/.checkpackageignore b/.checkpackageignore index 2e24f4c27c8a..373b9b1313f7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -221,8 +221,6 @@ package/bridge-utils/0001-fix-build-on-musl.patch Upstream package/brltty/0001-Fix-linking-error-on-mips64el.patch Upstream package/brltty/0002-shell-prologue-runProgramTerminationCommands-used-a-.patch Upstream package/brltty/S10brltty Indent Shellcheck Variables -package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch Upstream -package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch Upstream package/bsdiff/0001-Add-missing-header-for-u_char.patch Upstream package/bustle/0001-Makefile-fix-pcap-config-call.patch Upstream package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch Upstream diff --git a/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch b/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch deleted file mode 100644 index 2a3204fc3460..000000000000 --- a/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 6cb16322decd643fed9de332d9cda77f7738b7af Mon Sep 17 00:00:00 2001 -From: Adrian Perez de Castro -Date: Mon, 7 Sep 2020 12:14:22 +0300 -Subject: [PATCH] CMake: Allow using BUILD_SHARED_LIBS to choose static/shared - libs - -By convention projects using CMake which can build either static or -shared libraries use a BUILD_SHARED_LIBS flag to allow selecting between -both: the add_library() command automatically switches between both using -this variable when the library kind is not passed to add_library(). It -is also usual to expose the BUILD_SHARED_LIBS as an user-facing setting -with the option() command. - -This way, the following will both work as expected: - - % cmake -DBUILD_SHARED_LIBS=OFF ... - % cmake -DBUILS_SHARED_LIBS=ON ... - -This is helpful for distributions which need (or want) to build only -static libraries. - -Signed-off-by: Adrian Perez de Castro -[Upstream status: https://github.com/google/brotli/pull/655] ---- - CMakeLists.txt | 46 ++++++++++++++----------------------------- - c/fuzz/test_fuzzer.sh | 6 +++--- - 2 files changed, 18 insertions(+), 34 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4ff3401..f889311 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ cmake_minimum_required(VERSION 2.8.6) - - project(brotli C) - -+option(BUILD_SHARED_LIBS "Build shared libraries" ON) -+ - if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - message(STATUS "Setting build type to Release as none was specified.") - set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE) -@@ -137,10 +139,6 @@ set(BROTLI_LIBRARIES_CORE brotlienc brotlidec brotlicommon) - set(BROTLI_LIBRARIES ${BROTLI_LIBRARIES_CORE} ${LIBM_LIBRARY}) - mark_as_advanced(BROTLI_LIBRARIES) - --set(BROTLI_LIBRARIES_CORE_STATIC brotlienc-static brotlidec-static brotlicommon-static) --set(BROTLI_LIBRARIES_STATIC ${BROTLI_LIBRARIES_CORE_STATIC} ${LIBM_LIBRARY}) --mark_as_advanced(BROTLI_LIBRARIES_STATIC) -- - if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - add_definitions(-DOS_LINUX) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -@@ -161,29 +159,25 @@ transform_sources_list("scripts/sources.lst" "${CMAKE_CURRENT_BINARY_DIR}/source - include("${CMAKE_CURRENT_BINARY_DIR}/sources.lst.cmake") - - if(BROTLI_EMSCRIPTEN) -- set(BROTLI_SHARED_LIBS "") --else() -- set(BROTLI_SHARED_LIBS brotlicommon brotlidec brotlienc) -- add_library(brotlicommon SHARED ${BROTLI_COMMON_C}) -- add_library(brotlidec SHARED ${BROTLI_DEC_C}) -- add_library(brotlienc SHARED ${BROTLI_ENC_C}) -+ set(BUILD_SHARED_LIBS OFF) - endif() - --set(BROTLI_STATIC_LIBS brotlicommon-static brotlidec-static brotlienc-static) --add_library(brotlicommon-static STATIC ${BROTLI_COMMON_C}) --add_library(brotlidec-static STATIC ${BROTLI_DEC_C}) --add_library(brotlienc-static STATIC ${BROTLI_ENC_C}) -+add_library(brotlicommon ${BROTLI_COMMON_C}) -+add_library(brotlidec ${BROTLI_DEC_C}) -+add_library(brotlienc ${BROTLI_ENC_C}) - - # Older CMake versions does not understand INCLUDE_DIRECTORIES property. - include_directories(${BROTLI_INCLUDE_DIRS}) - --foreach(lib IN LISTS BROTLI_SHARED_LIBS) -- target_compile_definitions(${lib} PUBLIC "BROTLI_SHARED_COMPILATION" ) -- string(TOUPPER "${lib}" LIB) -- set_target_properties (${lib} PROPERTIES DEFINE_SYMBOL "${LIB}_SHARED_COMPILATION") --endforeach() -+if(BUILD_SHARED_LIBS) -+ foreach(lib brotlicommon brotlidec brotlienc) -+ target_compile_definitions(${lib} PUBLIC "BROTLI_SHARED_COMPILATION" ) -+ string(TOUPPER "${lib}" LIB) -+ set_target_properties (${lib} PROPERTIES DEFINE_SYMBOL "${LIB}_SHARED_COMPILATION") -+ endforeach() -+endif() - --foreach(lib IN LISTS BROTLI_SHARED_LIBS BROTLI_STATIC_LIBS) -+foreach(lib brotlicommon brotlidec brotlienc) - target_link_libraries(${lib} ${LIBM_LIBRARY}) - set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS}) - set_target_properties(${lib} PROPERTIES -@@ -200,9 +194,6 @@ target_link_libraries(brotlidec brotlicommon) - target_link_libraries(brotlienc brotlicommon) - endif() - --target_link_libraries(brotlidec-static brotlicommon-static) --target_link_libraries(brotlienc-static brotlicommon-static) -- - # For projects stuck on older versions of CMake, this will set the - # BROTLI_INCLUDE_DIRS and BROTLI_LIBRARIES variables so they still - # have a relatively easy way to use Brotli: -@@ -216,7 +207,7 @@ endif() - - # Build the brotli executable - add_executable(brotli ${BROTLI_CLI_C}) --target_link_libraries(brotli ${BROTLI_LIBRARIES_STATIC}) -+target_link_libraries(brotli ${BROTLI_LIBRARIES}) - - # Installation - if(NOT BROTLI_EMSCRIPTEN) -@@ -233,13 +224,6 @@ if(NOT BROTLI_BUNDLED_MODE) - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ) - -- install( -- TARGETS ${BROTLI_LIBRARIES_CORE_STATIC} -- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -- ) -- - install( - DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" --- -2.28.0 - diff --git a/package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch b/package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch deleted file mode 100644 index 892aa1da15d9..000000000000 --- a/package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 09b0992b6acb7faa6fd3b23f9bc036ea117230fc Mon Sep 17 00:00:00 2001 -From: Eugene Kliuchnikov -Date: Wed, 2 Sep 2020 11:38:26 +0200 -Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)" - (#838) - -This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1. -[Retrieved from: -https://github.com/google/brotli/commit/09b0992b6acb7faa6fd3b23f9bc036ea117230fc] -Signed-off-by: Fabrice Fontaine ---- - scripts/libbrotlicommon.pc.in | 2 +- - scripts/libbrotlidec.pc.in | 2 +- - scripts/libbrotlienc.pc.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in -index 10ca969e..2a8cf7a3 100644 ---- a/scripts/libbrotlicommon.pc.in -+++ b/scripts/libbrotlicommon.pc.in -@@ -7,5 +7,5 @@ Name: libbrotlicommon - URL: https://github.com/google/brotli - Description: Brotli common dictionary library - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -R${libdir} -lbrotlicommon -+Libs: -L${libdir} -lbrotlicommon - Cflags: -I${includedir} -diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in -index e7c3124f..6f8ef2e4 100644 ---- a/scripts/libbrotlidec.pc.in -+++ b/scripts/libbrotlidec.pc.in -@@ -7,6 +7,6 @@ Name: libbrotlidec - URL: https://github.com/google/brotli - Description: Brotli decoder library - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -R${libdir} -lbrotlidec -+Libs: -L${libdir} -lbrotlidec - Requires.private: libbrotlicommon >= 1.0.2 - Cflags: -I${includedir} -diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in -index 4dd0811b..2098afe2 100644 ---- a/scripts/libbrotlienc.pc.in -+++ b/scripts/libbrotlienc.pc.in -@@ -7,6 +7,6 @@ Name: libbrotlienc - URL: https://github.com/google/brotli - Description: Brotli encoder library - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -R${libdir} -lbrotlienc -+Libs: -L${libdir} -lbrotlienc - Requires.private: libbrotlicommon >= 1.0.2 - Cflags: -I${includedir} diff --git a/package/brotli/brotli.hash b/package/brotli/brotli.hash index 22f894c403be..145467c420ac 100644 --- a/package/brotli/brotli.hash +++ b/package/brotli/brotli.hash @@ -1,5 +1,5 @@ # Locally generated: -sha512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5 v1.0.9.tar.gz +sha512 6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9 v1.1.0.tar.gz # Hash for license files: sha512 bae78184c2f50f86d8c727826d3982c469454c42b9af81f4ef007e39036434fa894cf5be3bf5fc65b7de2301f0a72d067a8186e303327db8a96bd14867e0a3a8 LICENSE diff --git a/package/brotli/brotli.mk b/package/brotli/brotli.mk index ac49fe664f7e..80aa2566b51d 100644 --- a/package/brotli/brotli.mk +++ b/package/brotli/brotli.mk @@ -4,7 +4,7 @@ # ################################################################################ -BROTLI_VERSION = 1.0.9 +BROTLI_VERSION = 1.1.0 BROTLI_SOURCE = v$(BROTLI_VERSION).tar.gz BROTLI_SITE = https://github.com/google/brotli/archive BROTLI_LICENSE = MIT From 05fbb29322aa3aa093191c393befe9a03c654b4a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 23:15:24 +0200 Subject: [PATCH 2058/2890] package/unixodbc: bump to version 2.3.12 Drop patch (already in version) https://github.com/lurcher/unixODBC/releases/tag/2.3.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...ivermanager.h-fix-build-without-thre.patch | 34 ------------------- package/unixodbc/unixodbc.hash | 2 +- package/unixodbc/unixodbc.mk | 2 +- 4 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch diff --git a/.checkpackageignore b/.checkpackageignore index 373b9b1313f7..b41ab6918e64 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1423,7 +1423,6 @@ package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch Upstream package/umtprd/0001-Fix-output_dir-make-dependency.patch Upstream package/unbound/S70unbound Shellcheck package/unifdef/0001-Makefile-fix-error-on-install.patch Upstream -package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch Upstream package/unscd/S46unscd Indent Shellcheck Variables package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch Upstream package/upmpdcli/S99upmpdcli Indent Shellcheck Variables diff --git a/package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch b/package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch deleted file mode 100644 index 9d54bbf5efda..000000000000 --- a/package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 119cab666646cd9210439d4696a4bfa18343a2c6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 12 Jul 2022 00:29:28 +0200 -Subject: [PATCH] DriverManager/drivermanager.h: fix build without threads - -Fix the following build failure without threads raised since version -2.3.10 and commit 6df155fb213896b9507b421c58856e4376647ae1: - -/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: ../DriverManager/.libs/libodbc.so: undefined reference to `pool_timedwait' -/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: ../DriverManager/.libs/libodbc.so: undefined reference to `pool_signal' - -Fixes: - - http://autobuild.buildroot.org/results/131eafaddfc956c7d54c81ed72a31baf28ab1ab6 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/lurcher/unixODBC/commit/119cab666646cd9210439d4696a4bfa18343a2c6] ---- - DriverManager/drivermanager.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/DriverManager/drivermanager.h b/DriverManager/drivermanager.h -index 9528fae..abd324b 100644 ---- a/DriverManager/drivermanager.h -+++ b/DriverManager/drivermanager.h -@@ -808,6 +808,8 @@ void pool_signal(); - - #define thread_protect(a,b) - #define thread_release(a,b) -+#define pool_timedwait(a) -+#define pool_signal() - - #endif - diff --git a/package/unixodbc/unixodbc.hash b/package/unixodbc/unixodbc.hash index 9e5401c2b38d..6262dab5aec2 100644 --- a/package/unixodbc/unixodbc.hash +++ b/package/unixodbc/unixodbc.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c unixODBC-2.3.11.tar.gz +sha256 f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec unixODBC-2.3.12.tar.gz sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk index 650e3b3b366d..28f1e5bc94fc 100644 --- a/package/unixodbc/unixodbc.mk +++ b/package/unixodbc/unixodbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNIXODBC_VERSION = 2.3.11 +UNIXODBC_VERSION = 2.3.12 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz UNIXODBC_SITE = http://www.unixodbc.org UNIXODBC_INSTALL_STAGING = YES From 55fbb5519ca8c179e528638cc1b7ba3f166a7b64 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 28 Sep 2023 00:08:42 +0200 Subject: [PATCH 2059/2890] Update for 2023.08.1 Signed-off-by: Peter Korsgaard (cherry picked from commit 9266ab06e0ef1a448ac3f1c848bba59ec9908fbf) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 2d18c32f247b..4164bd81f3d0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,26 @@ +2023.08.1, released September 27th, 2023 + + Important / security related fixes. + + Updated/fixed packages: agentpp, asterisk, bind, binutils, + conmon, cpio, docker-cli, docker-engine, e2fsprogs, erlang, + esp-hosted, expect, fail2ban, fio, freerdp, fstrcmp, gcc, gdb, + ghostscript, go, haproxy, hwloc, icu, irssi, libcoap, libcurl, + libde265, libheif, libiec61850, libjxl, libopenssl, libpjsip, + libqb, libraw, libssh, libuv, lldpd, mdadm, mutt, ne10, + netatalk, nodejs, nut, openblas, opensc, openvpn, petitboot, + php, pound, pppd, python-pytest, python3, qt5, + rtl8812au-aircrack-ng, sngrep, stress-ng, strongswan, sysstat, + tar, tcl, timescaledb, util-linux, vim, webkitgtk, webp, + wireshark, xserver_xorg-server, xterm, zbar, zxing-cpp, + zynaddsubfx + + Issues resolved (http://bugs.uclibc.org): + + #14366: Nodejs fails with "version `GLIBC_2.34' not found".. + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + 2023.08, released September 6th, 2023 Various fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 340d931d1a31..a7e3b7456c70 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.08' +RELEASE='2023.08.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From 28a6c126460b2494395efadc2001e25092ac3b23 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 28 Sep 2023 00:25:28 +0200 Subject: [PATCH 2060/2890] docs/website: Update for 2023.08.1 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 65d048d45018..c1fd38998c83 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

                                buildroot-2023.02.5.tar.xz

                                -

                                Latest stable release: 2023.08

                                +

                                Latest stable release: 2023.08.1

                                - +
                                - +
                                -

                                buildroot-2023.08.tar.gz

                                -

                                PGP signature

                                +

                                buildroot-2023.08.1.tar.gz

                                +

                                PGP signature

                                - +
                                - +
                                -

                                buildroot-2023.08.tar.xz

                                -

                                PGP signature

                                +

                                buildroot-2023.08.1.tar.xz

                                +

                                PGP signature

                                + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
                              diff --git a/docs/website/news.html b/docs/website/news.html index 6ea27cdacd2e..1604f08e2f50 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

                              News

                                +
                              • +
                                +
                                +
                                +

                                2023.11-rc1 released

                                +

                                14 November 2023

                                +
                                +
                                +

                                We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

                                + +

                                Go to the downloads page to pick up the + 2023.11-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

                                +
                                +
                                +
                                • +
                              • From 41978f360ac35361b2680fb4e84fa59003e56a5a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 14 Nov 2023 16:34:39 +0100 Subject: [PATCH 2814/2890] Update for 2023.08.3 Signed-off-by: Peter Korsgaard (cherry picked from commit 8ad64e724c37fbf7624136e95441b6ddb82de982) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 49 ++++++++++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 585f4e9380d2..49b8dba4a99b 100644 --- a/CHANGES +++ b/CHANGES @@ -86,6 +86,55 @@ #15826: nodejs modules with native extensions fail to install #15835: Incompatibility between network-manager and libcurl 8.4 +2023.08.3, released November 14th, 2023 + + Important / security related fixes. + + Per-package builds: Unbreak SDK relocation logic. Only drop + the hard links for the final host / target directory, fixing a + build time / size regression in 2023.08.2. + + Packages where a free-form version/site can be specified + (E.G. Linux, U-Boot, ..) can now have the corresponding + tarballs of these custom downloads checked by the download + infrastructure based on .hash files in the global patch + directory. These hashes are optional unless + BR2_DOWNLOAD_FORCE_CHECK_HASHES is enabled. + + A utils/add-custom-hashes helper script has been added to + assist in managing such hash files. + + Defconfigs: Avenger96: Downgrade to TF-A v2.5 to fix boot + issue since 2023.08, stm32mp157a-dk1, stm32mp157c-dk2: Unbreak + TF-A build, stm32mp157c-odessey: Use a fixed TF-A version for + reproducibility + + Updated/fixed packages: apache, arm-trusted-firmware, aufs, + aufs-util, azure-iot-sdk, casync, cjson, clamav, conmon, + cups-filters, dhcpcd, docker-cli, docker-engine, + freeradius-server, go, inadyn, ksmbd-tools, kvmtool, + libgdiplus, libgeos, libmemcached, libmdbx, libopenssl, + libosmium, libtommath, libupnp, libzlib, lightning, linux-pam, + lxc, mender, minizip-zlib, mpd, mxsldr, nano, nettle, + network-manager, nghttp2, nodejs-src, opencv4, + opencv4-contrib, openjdk-bin, openvpn, opusfile, paho-mqtt-c, + pango, perl-lwp-protocol-https, petitboot, php, pistache, + python-django, python-pycryptodomex, python-urllib3, + python-web2py, rabbitmq-c, redis, reproc, + riscv64-elf-toolchain, sedutil, snort3, suricata, tar, tiff, + tor, traceroute, vim, websocketpp, wireshark, wolfssl, + xdg-dbus-proxy, xen, xlib_libX11, xlib_libXpm, zabbix, zchunk + + Issues resolved (http://bugs.uclibc.org): + + #14741: e2fsck is failing during cronjob build where fail... + #15772: lz4 failed to compile with gcc 10.4.0 + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + #15820: make linux-menuconfig does not modify correct .config.. + #15823: Installing nodejs modules with native extensions ... + #15835: Incompatibility between network-manager and libcurl 8.4 + 2023.08.2, released October 15th, 2023 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 1d42a647ac41..250a8810e52a 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.08.2' +RELEASE='2023.08.3' ### Change here for more memory/cores ### VM_MEMORY=2048 From ef0e5f834503dd934c14978201d8ae0848e7a027 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 14 Nov 2023 19:18:06 +0100 Subject: [PATCH 2815/2890] docs/website: Update for 2023.08.3 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 046674ac7f05..4ba906c95fff 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

                                buildroot-2023.02.6.tar.xz

                                -

                                Latest stable release: 2023.08.2

                                +

                                Latest stable release: 2023.08.3

                                - +
                                - +
                                -

                                buildroot-2023.08.2.tar.gz

                                -

                                PGP signature

                                +

                                buildroot-2023.08.3.tar.gz

                                +

                                PGP signature

                                - +
                                - +
                                -

                                buildroot-2023.08.2.tar.xz

                                -

                                PGP signature

                                +

                                buildroot-2023.08.3.tar.xz

                                +

                                PGP signature

                                diff --git a/docs/website/news.html b/docs/website/news.html index 1604f08e2f50..16630b968088 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

                                News

                                  +
                                • +
                                  +
                                  +
                                  +

                                  2023.08.3 released

                                  +

                                  14 November 2023

                                  +
                                  +
                                  +

                                  The 2023.08.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2023.08.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2023.08.3 release.

                                  +
                                  +
                                  +
                                  • +
                                • From c9e1bbf29a9bb14d4bb294e2c9ca7aac51fb17a2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 14 Nov 2023 20:50:00 +0100 Subject: [PATCH 2816/2890] Update for 2023.02.7 Signed-off-by: Peter Korsgaard (cherry picked from commit 50d5f8974e57b6e72015d877f3bd56d7d84acb22) [Peter: drop Makefile / Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/CHANGES b/CHANGES index 49b8dba4a99b..a045779c3153 100644 --- a/CHANGES +++ b/CHANGES @@ -459,6 +459,51 @@ #15376: Libiconv config #15461: QtVirtualKeyboard segfaults +2023.02.7, released November 14th, 2023 + + Important / security related fixes. + + Per-package builds: Unbreak SDK relocation logic. Only drop + the hard links for the final host / target directory, fixing a + build time / size regression in 2023.02.6. + + Packages where a free-form version/site can be specified + (E.G. Linux, U-Boot, ..) can now have the corresponding + tarballs of these custom downloads checked by the download + infrastructure based on .hash files in the global patch + directory. These hashes are optional unless + BR2_DOWNLOAD_FORCE_CHECK_HASHES is enabled. + + A utils/add-custom-hashes helper script has been added to + assist in managing such hash files. + + Defconfigs: stm32mp157a-dk1, stm32mp157c-dk2: Unbreak TF-A + build, stm32mp157c-odessey: Use a fixed TF-A version for + reproducibility + + Updated/fixed packages: apache, arm-trusted-firmware, aufs, + aufs-util, azure-iot-sdk, cjson, cups-filters, clamav, dhcpcd, + freeradius-server, go, htop, ksmbd-tools, kvmtool, libgdiplus, + libopenssl, libosmium, libtommath, libupnp, libzlib, lxc, + mender, minizip-zlib, mpd, mxsldr, nano, nettle, + network-manager, nghttp2, nodejs, opencv4, opencv4-contrib, + openjdk-bin, openvpn, opusfile, paho-mqtt-c, + perl-lwp-protocol-https, php, python-django, python-urllib3, + python-web2py, rabbitmq-c, redis, riscv64-elf-toolchain, + suricata, tar, tiff, tor, traceroute, vim, websocketpp, + wireshark, wolfssl, xdg-dbus-proxy, xen, xlib_libX11, + xlib_libXpm, zabbix, zchunk + + Issues resolved (http://bugs.uclibc.org): + + #14741: e2fsck is failing during cronjob build where fail... + #15772: lz4 failed to compile with gcc 10.4.0 + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + #15820: make linux-menuconfig does not modify correct .config.. + #15823: Installing nodejs modules with native extensions ... + #15835: Incompatibility between network-manager and libcurl 8.4 + 2023.02.6, released October 16th, 2023 Important / security related fixes. From de3c1390b3189727ee1efbbfab97818bfaf2f182 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 14 Nov 2023 21:34:28 +0100 Subject: [PATCH 2817/2890] docs/website: Update for 2023.02.7 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 4ba906c95fff..23474159a344 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
                                  Download
                                  -

                                  Latest long term support release: 2023.02.6

                                  +

                                  Latest long term support release: 2023.02.7

                                  - +
                                  - +
                                  -

                                  buildroot-2023.02.6.tar.gz

                                  -

                                  PGP signature

                                  +

                                  buildroot-2023.02.7.tar.gz

                                  +

                                  PGP signature

                                  - +
                                  - +
                                  -

                                  buildroot-2023.02.6.tar.xz

                                  -

                                  PGP signature

                                  +

                                  buildroot-2023.02.7.tar.xz

                                  +

                                  PGP signature

                                  diff --git a/docs/website/news.html b/docs/website/news.html index 16630b968088..e8b10e3a6ef8 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

                                  News

                                    +
                                  • +
                                    +
                                    +
                                    +

                                    2023.02.7 released

                                    +

                                    14 November 2023

                                    +
                                    +
                                    +

                                    The 2023.02.7 bugfix release is out, fixing a number of important / + security related issues discovered since the 2023.02.6 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2023.02.7 release.

                                    +
                                    +
                                    +
                                    • +
                                  • From c54407541cfd50c3bd9f4f46337448cd3ed1423d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 15 Nov 2023 12:26:42 +0100 Subject: [PATCH 2818/2890] package/intel-microcode: security bump to version 20231114 Includes fixes for INTEL-SA-00950: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00950.html https://lock.cmpxchg8b.com/reptar.html https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20231114 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/intel-microcode/intel-microcode.hash | 2 +- package/intel-microcode/intel-microcode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 64c50dd6f783..742332d552f3 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fe49bb719441f20335ed6004090ab38cdc374134d36d4f5d30be7ed93b820313 intel-microcode-20230808.tar.gz +sha256 cee26f311f7e2c039dd48cd30f995183bde9b98fb4c3039800e2ddaf5c090e55 intel-microcode-20231114.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 0a89d3a603c9..a159baa93d37 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20230808 +INTEL_MICROCODE_VERSION = 20231114 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license From 751e90e6eba68325e8d84a45539224e12dd27247 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 18 Nov 2023 12:53:14 +0100 Subject: [PATCH 2819/2890] configs/rockpro64_defconfig: add missing depenencies, extend rootfs size U-Boot requires pylibfdt, pyelftools and openssl so let's enable U-Boot corresponding BR2_TARGET_UBOOT_NEEDS_*. Rootfs is not big enough because of Linux modules size so let's extend it to 120MB. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5551322041 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- configs/rockpro64_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/rockpro64_defconfig b/configs/rockpro64_defconfig index 4704ac720656..472b9aded20a 100644 --- a/configs/rockpro64_defconfig +++ b/configs/rockpro64_defconfig @@ -22,6 +22,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rockpro64-rk3399" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y @@ -43,6 +46,7 @@ BR2_TARGET_GENERIC_HOSTNAME="rockpro64" BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPRO64" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From 439c9516e84976741db84f233b9c2816fe1c9b06 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 17 Nov 2023 09:33:49 -0700 Subject: [PATCH 2820/2890] package/flutter-engine: don't pollute user's home directory flutter-engine will forcibly create ~/.dart/ and ~/.flutter/ and store stuff in there. This is however quite dirty and pollutes the user's home, and will also not work when the home is read-only (e.g. shared in a container). Forcibly redirect flutter-engine to the same location where we redirected host-flutter-sdk-bin, using the same trick of redefining HOME as for host-flutter-sdk-bin. Ideally, we'd like to have some way to share this with all flutter-based packages, but we so far have only a few of them, so it is too early to even think about some commonalities (even less so about a shared infra). So we just duplicate the setting for now, this can be revisited later. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/flutter-engine/flutter-engine.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index 32aaa1cccf4f..d31d435d7904 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -185,11 +185,14 @@ define FLUTTER_ENGINE_EXTRACT_CMDS | $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) - endef +# We must set the home directory to the sdk directory or else flutter will +# place .dart, and .flutter in ~/. define FLUTTER_ENGINE_CONFIGURE_CMDS cd $(@D) && \ rm -rf $(FLUTTER_ENGINE_BUILD_DIR) && \ PATH=$(HOST_DIR)/share/depot_tools:$(BR_PATH) \ PUB_CACHE=$(FLUTTER_SDK_BIN_PUB_CACHE) \ + HOME=$(HOST_FLUTTER_SDK_BIN_SDK) \ ./flutter/tools/gn \ $(FLUTTER_ENGINE_CONF_OPTS) endef @@ -198,6 +201,7 @@ define FLUTTER_ENGINE_BUILD_CMDS cd $(@D) && \ PATH=$(HOST_DIR)/share/depot_tools:$(BR_PATH) \ PUB_CACHE=$(FLUTTER_SDK_BIN_PUB_CACHE) \ + HOME=$(HOST_FLUTTER_SDK_BIN_SDK) \ $(HOST_DIR)/bin/ninja \ -j $(PARALLEL_JOBS) \ -C $(FLUTTER_ENGINE_BUILD_DIR) From 38923639b0aff90d8a179234cd9b3bd6d85d8121 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 17 Nov 2023 18:54:51 -0700 Subject: [PATCH 2821/2890] package/flutter-sdk-bin: add target-os as linux We build for Linux. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/flutter-sdk-bin/flutter-sdk-bin.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index 17cd3523a638..e8e71b6ab01d 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -77,6 +77,7 @@ HOST_FLUTTER_SDK_BIN_DART_ARGS = \ -Ddart.vm.product=$(HOST_FLUTTER_SDK_BIN_SDK_PRODUCT) \ --aot \ --tfa \ + --target-os linux \ --packages .dart_tool/package_config.json \ --output-dill .dart_tool/flutter_build/*/app.dill \ --depfile .dart_tool/flutter_build/*/kernel_snapshot.d From d82a063ae981f434d55735bf63a117847f889208 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 16 Nov 2023 07:12:29 +0100 Subject: [PATCH 2822/2890] package/kodi-pvr-hts: bump version to 20.6.5-Nexus Changelog of this bugfix release: https://github.com/kodi-pvr/pvr.hts/blob/Nexus/pvr.hts/changelog.txt Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 4a0ccb24676e..046d234d71ea 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bce8fe803665121ab7cb20d13e76515a96cf9ef342ef109611e2df2ab144d3b5 kodi-pvr-hts-20.6.4-Nexus.tar.gz +sha256 bd58fc85543447f918ee567192c87a3beb3f6e2c3fc116abe1f584514d202ada kodi-pvr-hts-20.6.5-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index d9bf682b3850..7e667ae1aa94 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 20.6.4-Nexus +KODI_PVR_HTS_VERSION = 20.6.5-Nexus KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md From d6d0f73a2eaa4904ee0842a01941b01306d97be6 Mon Sep 17 00:00:00 2001 From: Antoine Coutant Date: Fri, 17 Nov 2023 16:50:33 +0100 Subject: [PATCH 2823/2890] board/khadas/vim3: add the path of the devicetree in extlinux.conf Without this patch, the devicetree used by linux at runtime is the u_boot devicetree. While using rusticl on the khadas vim3 board with the default extlinux.conf, mesa's panfrost driver return "gpu shed timeout" errors. Adding "devicetree /meson-g12b-khadas-vim3.dtb" to the extlinux.conf file solve the problem. Linux successfully boot with and without the change but without this patch the devicetree used by linux at runtime is the u-boot devicetree. The differences between the u-boot devicetree and the linux devicetree are: -The u-boot devicetree contains two more nodes than the linux devicetree. Those nodes are: - smbios : compatible option is set to "u-boot,sysinfo-smbios". - __symbols__ : present if -@ or --symbols is used during the devicetree compilation. -Most of u-boot devicetree nodes have a "phandle" property. -SoC and vpu have a "u-boot,dm-pre-reloc;" property. -Some aliases are different. -The u-boot operating points tables contains more nodes. The size difference between the u-boot devicetree and the linux devicetree is approximately 3.5kB. During runtime, the linux devicetree have the "phandle" and "u-boot,dm-pre-reloc;" properties and the smbios node. So, The runtime devicetree is the one from u-boot. Signed-off-by: Antoine Coutant Signed-off-by: Yann E. MORIN --- board/khadas/vim3/extlinux.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/board/khadas/vim3/extlinux.conf b/board/khadas/vim3/extlinux.conf index fede99b502ff..2b1544a5cc67 100644 --- a/board/khadas/vim3/extlinux.conf +++ b/board/khadas/vim3/extlinux.conf @@ -1,4 +1,5 @@ default buildroot label buildroot kernel /Image + devicetree /meson-g12b-a311d-khadas-vim3.dtb append root=/dev/mmcblk0p2 rootwait console=ttyAML0,115200 From dfe68fc8d5da75516d728d0977ce9265c2f79838 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 18 Nov 2023 12:45:26 -0700 Subject: [PATCH 2824/2890] package/nodejs: downgrade GCC version requirements to 10 NodeJS requires GCC 10.1. However, GCC 10.1 is the first release of the GCC 10.x series. As such, we can safely downgrade the GCC version requirements to 10. Tested with: run-tests tests.package.test_nodejs using Debian 11 and gcc 10.2.1. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/nodejs/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 72770095d068..50d1360715e5 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -7,19 +7,19 @@ config BR2_PACKAGE_NODEJS_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS -comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 11, wchar, host gcc >= 11" +comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 10, wchar, host gcc >= 10" depends on BR2_USE_MMU depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_HOST_GCC_AT_LEAST_11 || !BR2_TOOLCHAIN_GCC_AT_LEAST_11 || !BR2_USE_WCHAR + !BR2_HOST_GCC_AT_LEAST_10 || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || !BR2_USE_WCHAR config BR2_PACKAGE_NODEJS bool "nodejs" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_11 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_11 + depends on BR2_HOST_GCC_AT_LEAST_10 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # uses fork() depends on BR2_USE_MMU From d59f3d10e84379bea8ac0b77f6946fa6c8176663 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 24 Nov 2023 13:14:36 -0700 Subject: [PATCH 2825/2890] package/flutter-sdk-bin/Config.in.host: remove comment flutter-sdk-bin isn't a rust package. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/flutter-sdk-bin/Config.in.host | 1 - 1 file changed, 1 deletion(-) diff --git a/package/flutter-sdk-bin/Config.in.host b/package/flutter-sdk-bin/Config.in.host index a48714ea7f11..181a2ee6e5e9 100644 --- a/package/flutter-sdk-bin/Config.in.host +++ b/package/flutter-sdk-bin/Config.in.host @@ -1,4 +1,3 @@ -# All host rust packages should depend on this option config BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS bool default y if BR2_HOSTARCH = "x86_64" From 6a94b0b763555f865046bd1dd0be0253cb7e5957 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Nov 2023 22:52:50 +0100 Subject: [PATCH 2826/2890] package/oatpp: fix uclibc build Fix the following uclibc build failure raised since the addition of the package in commit d5bba26801b352f591451cf73e0b7509de0e6850: In file included from /home/autobuild/autobuild/instance-4/output-1/build/oatpp-1.3.0/src/oatpp/algorithm/CRC.hpp:28, from /home/autobuild/autobuild/instance-4/output-1/build/oatpp-1.3.0/src/oatpp/algorithm/CRC.cpp:25: /home/autobuild/autobuild/instance-4/output-1/build/oatpp-1.3.0/src/oatpp/core/base/Environment.hpp:359:93: error: 'va_list' has not been declared 359 | static void vlogFormatted(v_uint32 priority, const std::string& tag, const char* message, va_list args); | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/bcdf7548ff752f936defd111d13c63245ea70cbe Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...base-Environment.hpp-include-cstdarg.patch | 37 +++++++++++++++++++ package/oatpp/oatpp.mk | 6 +++ 2 files changed, 43 insertions(+) create mode 100644 package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch diff --git a/package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch b/package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch new file mode 100644 index 000000000000..e9b78328375f --- /dev/null +++ b/package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch @@ -0,0 +1,37 @@ +From b3e8930ccbaeeb77a4cd8b0fffbe52a208aa9a29 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Nov 2023 22:45:56 +0100 +Subject: [PATCH] src/oatpp/core/base/Environment.hpp: include cstdarg + +Include cstdarg to fix the following build failure with uclibc-ng: + +In file included from /home/autobuild/autobuild/instance-4/output-1/build/oatpp-1.3.0/src/oatpp/algorithm/CRC.hpp:28, + from /home/autobuild/autobuild/instance-4/output-1/build/oatpp-1.3.0/src/oatpp/algorithm/CRC.cpp:25: +/home/autobuild/autobuild/instance-4/output-1/build/oatpp-1.3.0/src/oatpp/core/base/Environment.hpp:359:93: error: 'va_list' has not been declared + 359 | static void vlogFormatted(v_uint32 priority, const std::string& tag, const char* message, va_list args); + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/bcdf7548ff752f936defd111d13c63245ea70cbe + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/oatpp/oatpp/commit/1d11558e2cbbabc0db02a233bf00d651ce5ea758 +--- + src/oatpp/core/base/Environment.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/oatpp/core/base/Environment.hpp b/src/oatpp/core/base/Environment.hpp +index fd77a5c6..05d5c949 100644 +--- a/src/oatpp/core/base/Environment.hpp ++++ b/src/oatpp/core/base/Environment.hpp +@@ -29,6 +29,7 @@ + #include "./Compiler.hpp" + #include "./Config.hpp" + ++#include + #include + #include + #include +-- +2.42.0 + diff --git a/package/oatpp/oatpp.mk b/package/oatpp/oatpp.mk index 621a549023ef..c8b0c9694ab2 100644 --- a/package/oatpp/oatpp.mk +++ b/package/oatpp/oatpp.mk @@ -13,4 +13,10 @@ OATPP_INSTALL_STAGING = YES # Only builds a static lib and headers OATPP_INSTALL_TARGET = NO +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) +OATPP_CONF_OPTS += -DOATPP_COMPAT_BUILD_NO_SET_AFFINITY=OFF +else +OATPP_CONF_OPTS += -DOATPP_COMPAT_BUILD_NO_SET_AFFINITY=ON +endif + $(eval $(cmake-package)) From f7b9d3ad2b4acccad5252737003e8a0db4f43340 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 22 Nov 2023 16:47:36 +0100 Subject: [PATCH 2827/2890] package/gcc: fix disabling the documentation gcc.mk attempts to disable building the documentation by setting MAKEINFO=missing, but it is not working. If makeinfo is installed and recent enough, gcc still uses it. This can be checked easily: grep BUILD_INFO='info' host-gcc-initial-*/build/gcc/config.log It happens because the root ./configure script will check $MAKEINFO --version (aka 'missing --version') and will overwrite it with MAKEINFO='missing makeinfo' because the version does not match. Having MAKEINFO='missing makeinfo' is a problem because 'missing makeinfo' will actually attempt to run 'makeinfo' before failing with an error message. If makeinfo is installed on the host, then 'missing makeinfo' will successfully run makeinfo anyway. Many gcc subprojects will check $MAKEINFO --version and enable building the documentation if it is recent enough. This patch overrides these checks by forcing gcc_cv_prog_makeinfo_modern=no. Building the GCC documentation can fail with the wrong makeinfo version. It happened at least when building GCC 11.3.0 with makeinfo 7.1. Signed-off-by: Nicolas Cavallari Signed-off-by: Yann E. MORIN --- package/gcc/gcc.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 9a164c8374ae..93bc46643cb4 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -91,9 +91,12 @@ HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot endif # Don't build documentation. It takes up extra space / build time, -# and sometimes needs specific makeinfo versions to work +# and sometimes needs specific makeinfo versions to work. Override the check +# for a modern makeinfo otherwise the configure scripts will still enable it. HOST_GCC_COMMON_CONF_ENV = \ MAKEINFO=missing +HOST_GCC_COMMON_MAKE_OPTS = \ + gcc_cv_prog_makeinfo_modern=no GCC_COMMON_TARGET_CFLAGS = $(TARGET_CFLAGS) GCC_COMMON_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) @@ -298,7 +301,7 @@ HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"' # For gcc-final, the gcc logic to detect whether SSP support is # available or not in the C library is not working properly for # uClibc, so let's be explicit as well. -HOST_GCC_COMMON_MAKE_OPTS = \ +HOST_GCC_COMMON_MAKE_OPTS += \ gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) ifeq ($(BR2_CCACHE),y) From 2c3946fcb45b07db5cc88cdc944745aa1ef8fa04 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 26 Nov 2023 17:11:18 +0100 Subject: [PATCH 2828/2890] package/zfs: don't download patch generated from github MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Git-generated patches embed the short-hash of the objects in the repository. The length of those short hashes are subject to change in at least three cases: - the number of objects in the repository increases, so git increases the length of short hashes to get a good change there is no collision; - the git configuration changes, see core.abbrev in git-config; - the heuristic to compute the length changes in a newer git version. Since the bump to zfs 2.1.4 in commit 68dfd09708c6, the patch generated by github has changed, causing download failures: wget --passive-ftp -nd -t 3 -O '/home/ymorin/dev/buildroot/O/master/build/.bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch.uoFq9e/output' 'https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch' --2023-11-26 16:53:25-- https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch Resolving github.com (github.com)... 140.82.121.3 Connecting to github.com (github.com)|140.82.121.3|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2976 (2.9K) [text/plain] Saving to: ‘/home/ymorin/dev/buildroot/O/master/build/.bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch.uoFq9e/output’ /home/ymorin/dev/buildroot/O/ 100%[================================================>] 2.91K --.-KB/s in 0s 2023-11-26 16:53:25 (15.0 MB/s) - ‘/home/ymorin/dev/buildroot/O/master/build/.bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch.uoFq9e/output’ saved [2976/2976] ERROR: while checking hashes from package/zfs//zfs.hash ERROR: bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch has wrong sha256 hash: ERROR: expected: 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a ERROR: got : 246c80f66abca5a7e0c41cc7c56eec0b4cb7f16b142262480401142bbc2f999f ERROR: Incomplete download, or man-in-the-middle (MITM) attack And indeed, the length of short hashes has increased by one since then. Fix that by bundling the patch, with the short hashes that were known then, so that it matches the sha256 we had for it. Signed-off-by: Yann E. MORIN --- .../0001-config-user-check-for-aio.h.patch | 94 +++++++++++++++++++ package/zfs/zfs.hash | 1 - package/zfs/zfs.mk | 3 +- 3 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 package/zfs/0001-config-user-check-for-aio.h.patch diff --git a/package/zfs/0001-config-user-check-for-aio.h.patch b/package/zfs/0001-config-user-check-for-aio.h.patch new file mode 100644 index 000000000000..55321ee2fca8 --- /dev/null +++ b/package/zfs/0001-config-user-check-for-aio.h.patch @@ -0,0 +1,94 @@ +From bc3f12bfac152a0c28951cec92340ba14f9ccee9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= +Date: Mon, 28 Mar 2022 19:24:22 +0200 +Subject: [PATCH] config: user: check for +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +And always zpool_read_label_slow() on non-conformant libcs + +Reviewed-by: Brian Behlendorf +Co-authored-by: José Luis Salvador Rufo +Signed-off-by: Ahelenia Ziemiańska +Closes #13207 +Closes #13254 +Upstream: https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9 +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: Yann E. MORIN +--- + config/user-aio.h.m4 | 7 +++++++ + config/user-libaio.m4 | 2 +- + config/user.m4 | 1 + + lib/libzutil/zutil_import.c | 6 ++++++ + 4 files changed, 15 insertions(+), 1 deletion(-) + create mode 100644 config/user-aio.h.m4 + +diff --git a/config/user-aio.h.m4 b/config/user-aio.h.m4 +new file mode 100644 +index 00000000000..152c0946722 +--- /dev/null ++++ b/config/user-aio.h.m4 +@@ -0,0 +1,7 @@ ++dnl # ++dnl # POSIX specifies as part of realtime extensions, ++dnl # and is missing from at least uClibc – force fallbacks there ++dnl # ++AC_DEFUN([ZFS_AC_CONFIG_USER_AIO_H], [ ++ ZFS_AC_FIND_SYSTEM_LIBRARY(AIO_H, [], [aio.h], [], [rt], [lio_listio]) ++]) +diff --git a/config/user-libaio.m4 b/config/user-libaio.m4 +index 95c144d76b4..8009bd11b3e 100644 +--- a/config/user-libaio.m4 ++++ b/config/user-libaio.m4 +@@ -1,5 +1,5 @@ + dnl # +-dnl # Check for libaio - only used for libaiot test cases. ++dnl # Check for libaio - only used for mmap_libaio test cases. + dnl # + AC_DEFUN([ZFS_AC_CONFIG_USER_LIBAIO], [ + ZFS_AC_FIND_SYSTEM_LIBRARY(LIBAIO, [], [libaio.h], [], [aio], [], [user_libaio=yes], [user_libaio=no]) +diff --git a/config/user.m4 b/config/user.m4 +index 670820b3771..f450af47e04 100644 +--- a/config/user.m4 ++++ b/config/user.m4 +@@ -23,6 +23,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ + ZFS_AC_CONFIG_USER_LIBAIO + ZFS_AC_CONFIG_USER_LIBATOMIC + ZFS_AC_CONFIG_USER_LIBFETCH ++ ZFS_AC_CONFIG_USER_AIO_H + ZFS_AC_CONFIG_USER_CLOCK_GETTIME + ZFS_AC_CONFIG_USER_PAM + ZFS_AC_CONFIG_USER_RUNSTATEDIR +diff --git a/lib/libzutil/zutil_import.c b/lib/libzutil/zutil_import.c +index d7547c4249e..3744a1c3474 100644 +--- a/lib/libzutil/zutil_import.c ++++ b/lib/libzutil/zutil_import.c +@@ -47,7 +47,9 @@ + * using our derived config, and record the results. + */ + ++#ifdef HAVE_AIO_H + #include ++#endif + #include + #include + #include +@@ -982,6 +984,9 @@ zpool_read_label_slow(int fd, nvlist_t **config, int *num_labels) + int + zpool_read_label(int fd, nvlist_t **config, int *num_labels) + { ++#ifndef HAVE_AIO_H ++ return (zpool_read_label_slow(fd, config, num_labels)); ++#else + struct stat64 statbuf; + struct aiocb aiocbs[VDEV_LABELS]; + struct aiocb *aiocbps[VDEV_LABELS]; +@@ -1104,6 +1109,7 @@ zpool_read_label(int fd, nvlist_t **config, int *num_labels) + *config = expected_config; + + return (0); ++#endif + } + + /* diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 3a73e5e94f11..f0327ce8ccc3 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,6 +1,5 @@ # From https://github.com/openzfs/zfs/releases/download/zfs-2.1.12/zfs-2.1.12.sha256.asc sha256 64daa26aed3e12c931f6f4413d7527c4ebdb8da35416b356152b5f9fdd4c6e6d zfs-2.1.12.tar.gz -sha256 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index f0461ea9eceb..6ea3d22ba5fb 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -6,14 +6,13 @@ ZFS_VERSION = 2.1.12 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) -ZFS_PATCH = https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs -# 0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch +# 0001-config-user-check-for-aio.h.patch ZFS_AUTORECONF = YES ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl linux From 7fe685c510578435b8b7c0448478e71a3db4d9e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Sun, 12 Nov 2023 23:11:17 +0100 Subject: [PATCH 2829/2890] package/zfs: fix zfs autotools cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit addresses a long-standing bug encountered during ZFS compilation in cross-platform environments. The issue arises because ZFS autoconf triggers a `make modules` to detect if the kernel can compile modules [1]. The problem occurs when autoconf uses the host environment instead of the cross-platform environment. To fix this, we export necessary environment variables to ensure that ZFS autoconf utilizes the cross-platform environment correctly. This patch resolves ZFS cross-platform compilations: - http://autobuild.buildroot.net/results/ebeab256101bcba38c35fd55075c414e62f92caa/ - http://autobuild.buildroot.net/results/03b9f12a106bf100eec695a92b83bf09b22c68b0/ - http://autobuild.buildroot.net/results/c2da90337463607c2fadfeac7ad72e5c3899a61f/ - http://autobuild.buildroot.net/results/465a249f92d2f5db7ac4b61b4111e6cbaaa15688/ - http://autobuild.buildroot.net/results/7e2d3277e26fa5b0c8073a0e8b9e82f47ade9697/ - http://autobuild.buildroot.net/results/a8fb87336b09fef8787a7889dfcccf14fe1215b9/ - https://gitlab.com/kubu93/buildroot/-/jobs/1522848483 And fix a few emails: - alpine.DEB.2.22.394.2108181630280.2028262@ridzo [build zfs into buildroot for raspberry pi 4] - https://lists.buildroot.org/pipermail/buildroot/2021-August/621696.html - https://lists.buildroot.org/pipermail/buildroot/2021-August/621345.html - https://lists.buildroot.org/pipermail/buildroot/2022-July/646379.html - https://lists.buildroot.org/pipermail/buildroot/2023-June/668467.html [1] This is the full callback, you can just check the last link: - https://github.com/openzfs/zfs/blob/zfs-2.1.12/config/kernel-declare-event-class.m4#L7C11-L7C11 - https://github.com/openzfs/zfs/blob/zfs-2.1.12/config/kernel.m4#L883 - https://github.com/openzfs/zfs/blob/zfs-2.1.12/config/kernel.m4#L868 - https://github.com/openzfs/zfs/blob/zfs-2.1.12/config/kernel.m4#L668 Signed-off-by: José Luis Salvador Rufo Signed-off-by: Yann E. MORIN --- package/zfs/zfs.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 6ea3d22ba5fb..c7b0ed040715 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -58,6 +58,14 @@ else ZFS_CONF_OPTS += --disable-pam endif +# Sets the environment for the `make` that will be run ZFS autotools checks. +ZFS_CONF_ENV += \ + ARCH=$(KERNEL_ARCH) \ + CROSS_COMPILE="$(TARGET_CROSS)" +ZFS_MAKE_ENV += \ + ARCH=$(KERNEL_ARCH) \ + CROSS_COMPILE="$(TARGET_CROSS)" + # ZFS userland tools are unfunctional without the Linux kernel modules. ZFS_MODULE_SUBDIRS = \ module/avl \ From acd833c8c712268ecfec1080721c6f39192bbdb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 22 Nov 2023 02:04:08 +0100 Subject: [PATCH 2830/2890] board/raspberrypi/readme.txt: fix typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaël PORTAY Signed-off-by: Yann E. MORIN --- board/raspberrypi/readme.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index c81fd801aede..21a136eb8326 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -17,8 +17,8 @@ How to build it Configure Buildroot ------------------- -There are two RaspberryPi defconfig files in Buildroot, one for each -major variant, which you should base your work on: +There are several Raspberry Pi defconfig files in Buildroot, one for +each major variant, which you should base your work on: For models A, B, A+ or B+: @@ -133,7 +133,7 @@ How to write to CM4 eMMC memory =============================== For CM4 modules without eMMC memory see above for booting from SD card, -for CM4 moduels with eMMC memory proceed as following: +for CM4 modules with eMMC memory proceed as following: - fit jumper on IO Board header J2 to disable eMMC boot - connect IO Board micro USB port (J11 USB slave) to your host linux system From 44243b4c80c3c6fd4364fa1582f6a8e8c8b928da Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 16 Nov 2023 14:51:35 +0100 Subject: [PATCH 2831/2890] package/netsnmp: revert back to 5.9.3, backport security fix In commit 13fc9dcb34926e9b6310b23662920c55c96d83a1, netsnmp was bumped from 5.9.3 to 5.9.4 to fix two CVEs. However, even though it's a minor version bump, there are actually 163 commits upstream between those two minor releases, and some of them are breaking existing use-cases. In particular upstream a2cb167514ac0c7e1b04e8f151e0b015501362e0 now requires that config_() macros in MIB files are terminated with a semicolon, causing a build breakage with existing MIB files that were totally valid with 5.9.3. This commit therefore proposes to revert back to 5.9.3, by reverting those two commits: 56caafceab3ec12669ccb7aa6fc8b653778064e1 package/netsnmp: fix musl build 13fc9dcb34926e9b6310b23662920c55c96d83a1 package/netsnmp: security bump to version 5.9.4 and instead backport the one upstream commit that fixes both CVEs. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: fix typo as reported by Baruch] Signed-off-by: Yann E. MORIN --- ...onfiguration-of-NETSNMP_FD_MASK_TYPE.patch | 38 ---------- ...agent-disallow-SET-with-NULL-varbind.patch | 72 +++++++++++++++++++ package/netsnmp/netsnmp.hash | 6 +- package/netsnmp/netsnmp.mk | 6 +- 4 files changed, 80 insertions(+), 42 deletions(-) delete mode 100644 package/netsnmp/0001-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch create mode 100644 package/netsnmp/0001-snmp_agent-disallow-SET-with-NULL-varbind.patch diff --git a/package/netsnmp/0001-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch b/package/netsnmp/0001-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch deleted file mode 100644 index 91a00aec2707..000000000000 --- a/package/netsnmp/0001-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a62169f1fa358be8f330ea8519ade0610fac525b Mon Sep 17 00:00:00 2001 -From: Adam Gajda -Date: Mon, 2 Oct 2023 16:40:31 +0200 -Subject: [PATCH] Fix configuration of NETSNMP_FD_MASK_TYPE - -Upstream: https://github.com/net-snmp/net-snmp/commit/a62169f1fa358be8f330ea8519ade0610fac525b -Signed-off-by: Fabrice Fontaine ---- - configure | 2 +- - configure.d/config_project_types | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 9f0a173d8a..945a27c663 100755 ---- a/configure -+++ b/configure -@@ -30871,7 +30871,7 @@ CFLAGS="$CFLAGS -Werror" - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the type of fd_set::fds_bits" >&5 - printf %s "checking for the type of fd_set::fds_bits... " >&6; } --for type in __fd_mask __int32_t unknown; do -+for type in __fd_mask __int32_t long\ int unknown; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -diff --git a/configure.d/config_project_types b/configure.d/config_project_types -index 1b4c66b95e..a78e8ebb06 100644 ---- a/configure.d/config_project_types -+++ b/configure.d/config_project_types -@@ -66,7 +66,7 @@ netsnmp_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -Werror" - - AC_MSG_CHECKING([for the type of fd_set::fds_bits]) --for type in __fd_mask __int32_t unknown; do -+for type in __fd_mask __int32_t long\ int unknown; do - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ - #include - #include diff --git a/package/netsnmp/0001-snmp_agent-disallow-SET-with-NULL-varbind.patch b/package/netsnmp/0001-snmp_agent-disallow-SET-with-NULL-varbind.patch new file mode 100644 index 000000000000..3a6321d7a7b3 --- /dev/null +++ b/package/netsnmp/0001-snmp_agent-disallow-SET-with-NULL-varbind.patch @@ -0,0 +1,72 @@ +From b07627fa67c686b07d1eab123cf3e4887a2a93aa Mon Sep 17 00:00:00 2001 +From: Bill Fenner +Date: Fri, 25 Nov 2022 08:41:24 -0800 +Subject: [PATCH] snmp_agent: disallow SET with NULL varbind + +Upstream: https://github.com/net-snmp/net-snmp/commit/4589352dac3ae111c7621298cf231742209efd9b + +[Thomas: this commit was merged as part of +https://github.com/net-snmp/net-snmp/pull/490/commits, which fixes +https://github.com/net-snmp/net-snmp/issues/474 (CVE-2022-44792) and +https://github.com/net-snmp/net-snmp/issues/475 (CVE-2022-44793). The +other two commits merged as part of this pull request are related to +adding a non-regression test for this, which is not relevant for the +security fix itself.] + +Signed-off-by: Thomas Petazzoni +--- + agent/snmp_agent.c | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +diff --git a/agent/snmp_agent.c b/agent/snmp_agent.c +index 867d0c166f..3f678fe2df 100644 +--- a/agent/snmp_agent.c ++++ b/agent/snmp_agent.c +@@ -3719,12 +3719,44 @@ netsnmp_handle_request(netsnmp_agent_session *asp, int status) + return 1; + } + ++static int ++check_set_pdu_for_null_varbind(netsnmp_agent_session *asp) ++{ ++ int i; ++ netsnmp_variable_list *v = NULL; ++ ++ for (i = 1, v = asp->pdu->variables; v != NULL; i++, v = v->next_variable) { ++ if (v->type == ASN_NULL) { ++ /* ++ * Protect SET implementations that do not protect themselves ++ * against wrong type. ++ */ ++ DEBUGMSGTL(("snmp_agent", "disallowing SET with NULL var for varbind %d\n", i)); ++ asp->index = i; ++ return SNMP_ERR_WRONGTYPE; ++ } ++ } ++ return SNMP_ERR_NOERROR; ++} ++ + int + handle_pdu(netsnmp_agent_session *asp) + { + int status, inclusives = 0; + netsnmp_variable_list *v = NULL; + ++#ifndef NETSNMP_NO_WRITE_SUPPORT ++ /* ++ * Check for ASN_NULL in SET request ++ */ ++ if (asp->pdu->command == SNMP_MSG_SET) { ++ status = check_set_pdu_for_null_varbind(asp); ++ if (status != SNMP_ERR_NOERROR) { ++ return status; ++ } ++ } ++#endif /* NETSNMP_NO_WRITE_SUPPORT */ ++ + /* + * for illegal requests, mark all nodes as ASN_NULL + */ +-- +2.41.0 + diff --git a/package/netsnmp/netsnmp.hash b/package/netsnmp/netsnmp.hash index 789894127138..e1e9d10898c3 100644 --- a/package/netsnmp/netsnmp.hash +++ b/package/netsnmp/netsnmp.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature at -# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.4/net-snmp-5.9.4.tar.gz.asc -# using key 6E6718AEF1EB5C65C32D1B2A356BC0B552D53CAB -sha256 8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544 net-snmp-5.9.4.tar.gz +# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.3/net-snmp-5.9.3.tar.gz.asc +# using key D0F8F495DA6160C44EFFBF10F07B9D2DACB19FD6 +sha256 2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a net-snmp-5.9.3.tar.gz # Hash for license file sha256 ed869ea395a1f125819a56676385ab0557a21507764bf56f2943302011381e59 COPYING diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index a79c13c611f6..6575ff1afa7f 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -4,13 +4,17 @@ # ################################################################################ -NETSNMP_VERSION = 5.9.4 +NETSNMP_VERSION = 5.9.3 NETSNMP_SITE = https://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION) NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz NETSNMP_LICENSE = Various BSD-like NETSNMP_LICENSE_FILES = COPYING NETSNMP_CPE_ID_VENDOR = net-snmp NETSNMP_CPE_ID_PRODUCT = $(NETSNMP_CPE_ID_VENDOR) +# 0001-snmp_agent-disallow-SET-with-NULL-varbind.patch +NETSNMP_IGNORE_CVES = \ + CVE-2022-44792 \ + CVE-2022-44793 NETSNMP_SELINUX_MODULES = snmp NETSNMP_INSTALL_STAGING = YES NETSNMP_CONF_ENV = \ From 1185c0256bb43bd451e73249d53915db42409476 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 26 Nov 2023 13:33:41 -0700 Subject: [PATCH 2832/2890] package/python-msgpack: fix build without cpp toolchain Prior to being updated to version 1.0.7 in 014a66fcde68bd0b612b62ec722ccc93bdc0d7f9 python-msgpack would automatically fall back to the pure python version if the cpp based optimized extension would fail to build for any reason. This however is no longer the case after updating to 1.0.7 where it is now required that we explicitely set the MSGPACK_PUREPYTHON=1 if we do not have cpp support enabled in the toolchain. Fixes: - http://autobuild.buildroot.net/results/361/36185a19bed4bd57421a4d909bce1976c89d130f - http://autobuild.buildroot.net/results/477/477f822cb196ebc2246bcbdc1b6eaf940fc018cd Signed-off-by: James Hilliard [yann.morin.1998@free.fr: add the comment] Signed-off-by: Yann E. MORIN --- package/python-msgpack/python-msgpack.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index 061ff5a76148..3ee7c54ce118 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -11,4 +11,11 @@ PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools +# When set in the environment, whatever the value, MSGPACK_PUREPYTHON drives +# using the pure python implementation rather than rely on the C++ native code. +# So we can't force it to use C++; we can only force it to use pure python. +ifeq ($(BR2_INSTALL_LIBSTDCPP),) +PYTHON_MSGPACK_ENV = MSGPACK_PUREPYTHON=1 +endif + $(eval $(python-package)) From 71bdba661e51a7c43163717ecb89500ec36d6ecf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Nov 2023 19:29:12 +0100 Subject: [PATCH 2833/2890] package/libpam-tacplus: fix build without SSP The following build failure without stack-protector occurs since commit 160f0e4b5f16 (package/libpam-tacplus: bump to version 1.7.0): cc1: warning: '-fstack-protector' not supported for this target In file included from libtac/lib/xstrncpy.c:36: libtac/lib/xstrncpy.c: In function 'xstrncpy': ./libtac/include/libtac.h:71:15: error: called object is not a function or function pointer 71 | #define abort exit(EXIT_FAILURE) | ^~~~ Since we are passing the appropriate SSP and fortify flags via our toolchain wrapper, we need to tell the package not to add its own. Upstream commit b1054ad8bb33 (Add '--disable-am-ldcflags' configure option), available since version 1.4.1, has been added for "a distribution to select its own C/LD flags" which is exactly our situation. So that's what we do: replace the ax cache variable by this new configure flag. Fixes: - http://autobuild.buildroot.org/results/cc8a7c5cca65e002d40a775f09e3c4577fbab5b7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libpam-tacplus/libpam-tacplus.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/libpam-tacplus/libpam-tacplus.mk b/package/libpam-tacplus/libpam-tacplus.mk index 044b7207f9fb..df4d62a0b867 100644 --- a/package/libpam-tacplus/libpam-tacplus.mk +++ b/package/libpam-tacplus/libpam-tacplus.mk @@ -17,8 +17,6 @@ LIBPAM_TACPLUS_DEPENDENCIES = \ # We're patching Makefile.am LIBPAM_TACPLUS_AUTORECONF = YES LIBPAM_TACPLUS_INSTALL_STAGING = YES -LIBPAM_TACPLUS_CONF_ENV = \ - ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) -LIBPAM_TACPLUS_CONF_OPTS = --disable-werror +LIBPAM_TACPLUS_CONF_OPTS = --disable-am-ldcflags --disable-werror $(eval $(autotools-package)) From e8ca87083b9ff7d6d196520b85533cd927369ca9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Nov 2023 18:45:58 +0100 Subject: [PATCH 2834/2890] package/opensc: fix libressl build Fix the following build failure with libressl >= 3.8 raised since bump of libressl to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: In file included from card-westcos.c:37: /home/autobuild/autobuild/instance-11/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/openssl/evp.h:627:32: error: macro "EVP_sha3_224" passed 1 arguments, but takes just 0 627 | const EVP_MD *EVP_sha3_224(void); | ^ Fixes: - http://autobuild.buildroot.org/results/cecee659371f370bf4bd2b27a4752bf20ceff326 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...L-does-provide-EVP_sha3_-after-3-7-3.patch | 32 +++++++++++++++++++ ...ixed-detection-of-SHA3-compatibility.patch | 27 ++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 package/opensc/0005-LibreSSL-does-provide-EVP_sha3_-after-3-7-3.patch create mode 100644 package/opensc/0006-fixed-detection-of-SHA3-compatibility.patch diff --git a/package/opensc/0005-LibreSSL-does-provide-EVP_sha3_-after-3-7-3.patch b/package/opensc/0005-LibreSSL-does-provide-EVP_sha3_-after-3-7-3.patch new file mode 100644 index 000000000000..80c19a3f5fa9 --- /dev/null +++ b/package/opensc/0005-LibreSSL-does-provide-EVP_sha3_-after-3-7-3.patch @@ -0,0 +1,32 @@ +From e015242590ad9131e124232cc5a2fd02d525ef2c Mon Sep 17 00:00:00 2001 +From: Klemens Nanni +Date: Thu, 29 Jun 2023 02:41:43 +0300 +Subject: [PATCH] LibreSSL does provide EVP_sha3_*() after 3.7.3 + +Support was added in 16.04.2023. + +Compile- and run-tested on OpenBSD/amd64 7.3-current. + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/OpenSC/OpenSC/commit/e015242590ad9131e124232cc5a2fd02d525ef2c +--- + src/libopensc/sc-ossl-compat.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h +index df0cebbce2..8012cd4c0f 100644 +--- a/src/libopensc/sc-ossl-compat.h ++++ b/src/libopensc/sc-ossl-compat.h +@@ -50,10 +50,12 @@ extern "C" { + #if LIBRESSL_VERSION_NUMBER < 0x30500000L + #define FIPS_mode() (0) + #endif ++#ifndef EVP_sha3_224 + #define EVP_sha3_224() (NULL) + #define EVP_sha3_256() (NULL) + #define EVP_sha3_384() (NULL) + #define EVP_sha3_512() (NULL) ++#endif + #if LIBRESSL_VERSION_NUMBER < 0x3070000fL + #define EVP_PKEY_new_raw_public_key(t, e, p, l) (NULL) + #define EVP_PKEY_get_raw_public_key(p, pu, l) (0) diff --git a/package/opensc/0006-fixed-detection-of-SHA3-compatibility.patch b/package/opensc/0006-fixed-detection-of-SHA3-compatibility.patch new file mode 100644 index 000000000000..3d8aa7e4ef47 --- /dev/null +++ b/package/opensc/0006-fixed-detection-of-SHA3-compatibility.patch @@ -0,0 +1,27 @@ +From 33351d91aa22fa8077847ba3f19abb5a00b04600 Mon Sep 17 00:00:00 2001 +From: Frank Morgner +Date: Tue, 15 Aug 2023 17:58:21 +0200 +Subject: [PATCH] fixed detection of SHA3 compatibility + +fixes https://github.com/OpenSC/OpenSC/issues/2836 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/OpenSC/OpenSC/commit/33351d91aa22fa8077847ba3f19abb5a00b04600 +--- + src/libopensc/sc-ossl-compat.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h +index 8012cd4c0f..96ec4bd736 100644 +--- a/src/libopensc/sc-ossl-compat.h ++++ b/src/libopensc/sc-ossl-compat.h +@@ -50,7 +50,8 @@ extern "C" { + #if LIBRESSL_VERSION_NUMBER < 0x30500000L + #define FIPS_mode() (0) + #endif +-#ifndef EVP_sha3_224 ++/* OpenSSL 1.1.1 has EVP_sha3_* */ ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30800000L + #define EVP_sha3_224() (NULL) + #define EVP_sha3_256() (NULL) + #define EVP_sha3_384() (NULL) From 3e76df02b324b0442eec7bfd2451ee2fbb3709e9 Mon Sep 17 00:00:00 2001 From: Michel Alex Date: Thu, 23 Nov 2023 07:10:59 +0000 Subject: [PATCH 2835/2890] package/libzenoh-pico: needs threads Fixes: http://autobuild.buildroot.net/results/c9138c32157042aa5bb1bfd3a8446e4c9361d0f5/ Signed-off-by: Alex Michel Signed-off-by: Yann E. MORIN --- package/libzenoh-pico/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libzenoh-pico/Config.in b/package/libzenoh-pico/Config.in index 093c6d4f7532..cb61b0de5593 100644 --- a/package/libzenoh-pico/Config.in +++ b/package/libzenoh-pico/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBZENOH_PICO bool "libzenoh-pico" + depends on BR2_TOOLCHAIN_HAS_THREADS help zenoh-pico is the Eclipse zenoh implementation that targets constrained devices and offers a native C API. It is fully From 4d549c071dcc7ede701ee91cb39bc4a9a2be7baf Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 23 Nov 2023 09:15:00 +0300 Subject: [PATCH 2836/2890] package/postgresql: security bump version to 15.5 Release notes: https://www.postgresql.org/about/news/postgresql-161-155-1410-1313-1217-and-1122-released-2749/ Fixes CVE-2023-5868, CVE-2023-5869, CVE-2023-5870. Signed-off-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 0640f883a753..4fc3bfcff04a 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v15.4/postgresql-15.4.tar.bz2.sha256 -sha256 baec5a4bdc4437336653b6cb5d9ed89be5bd5c0c58b94e0becee0a999e63c8f9 postgresql-15.4.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v15.4/postgresql-15.5.tar.bz2.sha256 +sha256 8f53aa95d78eb8e82536ea46b68187793b42bba3b4f65aa342f540b23c9b10a6 postgresql-15.5.tar.bz2 # License file, Locally calculated sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index b951b14aa090..3108fe65e17f 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.4 +POSTGRESQL_VERSION = 15.5 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 2c055121e7a5bb2a32b6891ef40acbd7b3e35ec3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Nov 2023 23:53:41 +0100 Subject: [PATCH 2837/2890] package/x11r7/xwayland: add XWAYLAND_CPE_ID_VENDOR cpe:2.3:a:x.org:xwayland is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6F35318F-48A3-45B0-B70A-F953B7B0A0E8 Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: s/VEBDOR/VENDOR/] Signed-off-by: Yann E. MORIN --- package/x11r7/xwayland/xwayland.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 1b626327ad4f..8550b61389a8 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -9,6 +9,7 @@ XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver XWAYLAND_LICENSE = MIT XWAYLAND_LICENSE_FILES = COPYING +XWAYLAND_CPE_ID_VENDOR = x.org XWAYLAND_INSTALL_STAGING = YES XWAYLAND_DEPENDENCIES = \ pixman \ From 3da62675d730eec9b402f8edd1de5e046e94d71d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Nov 2023 23:57:17 +0100 Subject: [PATCH 2838/2890] package/exfatprogs: add EXFATPROGS_CPE_ID_VENDOR cpe:2.3:a:namjaejeon:exfatprogs is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/F174A846-F275-4AD8-A0E3-6D0CEFDFF308 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/exfatprogs/exfatprogs.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/exfatprogs/exfatprogs.mk b/package/exfatprogs/exfatprogs.mk index d755c7a21455..fcc9ff0788bd 100644 --- a/package/exfatprogs/exfatprogs.mk +++ b/package/exfatprogs/exfatprogs.mk @@ -9,6 +9,7 @@ EXFATPROGS_SOURCE = exfatprogs-$(EXFATPROGS_VERSION).tar.xz EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION) EXFATPROGS_LICENSE = GPL-2.0+ EXFATPROGS_LICENSE_FILES = COPYING +EXFATPROGS_CPE_ID_VENDOR = namjaejeon $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 5be42d8da3370e74b32190b97c4399749b4fa761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 20 Nov 2023 22:41:50 +0100 Subject: [PATCH 2839/2890] board/raspberrypi: fix autoprobing of bluetooth driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The commit 689b9ac439 (package/rpi-firmware: rework boot/config file handling) has split in two the property: dtoverlay=miniuart-bt,krnbt=on Into: dtoverlay=miniuart-bt dtoverlay=krnbt=on The initial property contained the dtbo file miniuart-bt[1] and its parameter krnbt=on[2][3]. The first syntax is correct while the second is not. The krnbt=on is not a dtoverlay[4] but a dtparam[5]. Therefore the property dtparam must be used instead. This fixes: # cat /sys/firmware/devicetree/base/chosen/user-warnings Failed to load overlay 'krnbt=on' [1]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts [2]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts#L91 [3]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/README#L213-L215 [4]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtoverlay [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtparam Signed-off-by: Gaël PORTAY Signed-off-by: Yann E. MORIN --- board/raspberrypi/config_0w.txt | 2 +- board/raspberrypi/config_3.txt | 2 +- board/raspberrypi/config_3_64bit.txt | 2 +- board/raspberrypi/config_4.txt | 2 +- board/raspberrypi/config_4_64bit.txt | 2 +- board/raspberrypi/config_zero2w.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/raspberrypi/config_0w.txt b/board/raspberrypi/config_0w.txt index 195bad449e8b..bc59d5fad2ef 100644 --- a/board/raspberrypi/config_0w.txt +++ b/board/raspberrypi/config_0w.txt @@ -26,4 +26,4 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on diff --git a/board/raspberrypi/config_3.txt b/board/raspberrypi/config_3.txt index 195bad449e8b..bc59d5fad2ef 100644 --- a/board/raspberrypi/config_3.txt +++ b/board/raspberrypi/config_3.txt @@ -26,4 +26,4 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on diff --git a/board/raspberrypi/config_3_64bit.txt b/board/raspberrypi/config_3_64bit.txt index 34412fa9e82b..667287112573 100644 --- a/board/raspberrypi/config_3_64bit.txt +++ b/board/raspberrypi/config_3_64bit.txt @@ -26,7 +26,7 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on # enable 64bits support arm_64bit=1 diff --git a/board/raspberrypi/config_4.txt b/board/raspberrypi/config_4.txt index ea02d3f07130..74a7b270cdf5 100644 --- a/board/raspberrypi/config_4.txt +++ b/board/raspberrypi/config_4.txt @@ -26,4 +26,4 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on diff --git a/board/raspberrypi/config_4_64bit.txt b/board/raspberrypi/config_4_64bit.txt index 41c7e97e99b2..2a9814274fdf 100644 --- a/board/raspberrypi/config_4_64bit.txt +++ b/board/raspberrypi/config_4_64bit.txt @@ -26,7 +26,7 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on dtoverlay=vc4-kms-v3d-pi4 dtoverlay=imx219 diff --git a/board/raspberrypi/config_zero2w.txt b/board/raspberrypi/config_zero2w.txt index 9e6b7f5ccfd7..55095f64a7df 100644 --- a/board/raspberrypi/config_zero2w.txt +++ b/board/raspberrypi/config_zero2w.txt @@ -26,4 +26,4 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on From fbf0a6ea427c7c1c837f79c74d591ec35eab3ba6 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 8 Aug 2023 20:09:58 +0200 Subject: [PATCH 2840/2890] board/raspberrypi/config_4_64bit.txt: remove testing dtoverlay entries (vc4-kms-v3d-pi4, imx219) Remove private/testing dtoverlay entries (vc4-kms-v3d-pi4, imx219 and commented out ov5647) wrongly introduced by commit 689b9ac439 ("package/rpi-firmware: rework boot/config file handling") [1]. [1] https://git.buildroot.net/buildroot/commit/?id=689b9ac439ab7b507c8982b6102bddf59d03efbf Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- board/raspberrypi/config_4_64bit.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/board/raspberrypi/config_4_64bit.txt b/board/raspberrypi/config_4_64bit.txt index 2a9814274fdf..a4ae327d2a2d 100644 --- a/board/raspberrypi/config_4_64bit.txt +++ b/board/raspberrypi/config_4_64bit.txt @@ -28,9 +28,5 @@ dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach dtparam=krnbt=on -dtoverlay=vc4-kms-v3d-pi4 -dtoverlay=imx219 -#dtoverlay=ov5647 - # enable 64bits support arm_64bit=1 From 07dad085fa4663deeee95fc4e037324b7c3eb37c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 27 Nov 2023 22:25:58 +0100 Subject: [PATCH 2841/2890] package/exfatprogs: security bump to version 1.2.2 Fix CVE-2023-45897: exfatprogs before 1.2.2 allows out-of-bounds memory access, such as in read_file_dentry_set. https://github.com/exfatprogs/exfatprogs/blob/1.2.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/exfatprogs/exfatprogs.hash | 4 ++-- package/exfatprogs/exfatprogs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/exfatprogs/exfatprogs.hash b/package/exfatprogs/exfatprogs.hash index 49135b1da7e2..9f3100db7f75 100644 --- a/package/exfatprogs/exfatprogs.hash +++ b/package/exfatprogs/exfatprogs.hash @@ -1,5 +1,5 @@ -# From https://github.com/exfatprogs/exfatprogs/releases/download/1.2.0/exfatprogs-1.2.0.tar.xz.sha256 -sha256 56d9a49465deafc367d428afc71c8098705a30ee19a3cdf3c5320650b8880742 exfatprogs-1.2.0.tar.xz +# From https://github.com/exfatprogs/exfatprogs/releases/download/1.2.2/exfatprogs-1.2.2.tar.xz.sha256 +sha256 61d517231f8ec177eeb5955fd6edb89748d3f88ba412c48bcb32741b430e359a exfatprogs-1.2.2.tar.xz # Hash for license file sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfatprogs/exfatprogs.mk b/package/exfatprogs/exfatprogs.mk index fcc9ff0788bd..40d907257173 100644 --- a/package/exfatprogs/exfatprogs.mk +++ b/package/exfatprogs/exfatprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXFATPROGS_VERSION = 1.2.0 +EXFATPROGS_VERSION = 1.2.2 EXFATPROGS_SOURCE = exfatprogs-$(EXFATPROGS_VERSION).tar.xz EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION) EXFATPROGS_LICENSE = GPL-2.0+ From 1267a234fff8c5270d8ead5541167053771636b1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 27 Nov 2023 22:27:12 +0100 Subject: [PATCH 2842/2890] package/motion: fix webp build Fix the following build failure raised since bump of webp to version 1.3.2 in commit c88c1d3319dd24fa833455a2e7d96bc4585bab7f: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/aarch64_be-buildroot-linux-uclibc/13.2.0/../../../../aarch64_be-buildroot-linux-uclibc/bin/ld: picture.o: undefined reference to symbol 'WebPMemoryWriterClear' /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/aarch64_be-buildroot-linux-uclibc/13.2.0/../../../../aarch64_be-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-9/output-1/host/aarch64_be-buildroot-linux-uclibc/sysroot/usr/lib64/libwebp.so.7: error adding symbols: DSO missing from command line Fixes: - http://autobuild.buildroot.org/results/9b859a701debeaddf1f9909e16adc6811a620576 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...Include-libwebp-when-WEBP-is-enabled.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/motion/0002-Include-libwebp-when-WEBP-is-enabled.patch diff --git a/package/motion/0002-Include-libwebp-when-WEBP-is-enabled.patch b/package/motion/0002-Include-libwebp-when-WEBP-is-enabled.patch new file mode 100644 index 000000000000..a1536a7d2f93 --- /dev/null +++ b/package/motion/0002-Include-libwebp-when-WEBP-is-enabled.patch @@ -0,0 +1,26 @@ +From 40ecd71ff361442f1579089481619dd7cae90ffd Mon Sep 17 00:00:00 2001 +From: Piotr Mionskowski +Date: Sun, 9 Jul 2023 01:44:49 +0200 +Subject: [PATCH] Include libwebp when WEBP is enabled + +Upstream: https://github.com/Motion-Project/motion/commit/40ecd71ff361442f1579089481619dd7cae90ffd +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ce588f65..ee45ac37 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -191,8 +191,8 @@ AS_IF([test "${WEBP}" = "yes" ], [ + AS_IF([pkg-config libwebpmux ], [ + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_WEBP], [1], [Define to 1 if WEBP is around]) +- TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux` +- TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux` ++ TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux libwebp` ++ TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux libwebp` + ],[ + AC_MSG_RESULT(no) + ] From aa0f115bf7d1d6c63670115582b77af54a4a9653 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 27 Nov 2023 22:28:22 +0100 Subject: [PATCH 2843/2890] package/janet: needs MMU janet unconditionally uses fork since version 1.32.0 and https://github.com/janet-lang/janet/commit/4b8c1ac2d2d5c13d7c8592fd6d94b34a6a8b3549 resulting in the following build failure since bump to version 1.32.1 in commit c87abf01a9153a2b2fe6c046fa83c86db92d79a7: janet.c:(.text+0x19bbc): undefined reference to `fork' Fixes: - http://autobuild.buildroot.org/results/f0771fc6c9905d3a6d60ce245df585b3c6096f7f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/janet/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/janet/Config.in b/package/janet/Config.in index 7b78c14bf4ed..bb4bf462aa75 100644 --- a/package/janet/Config.in +++ b/package/janet/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_JANET bool "janet" + depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h help Janet is a functional and imperative programming language. @@ -11,4 +12,5 @@ config BR2_PACKAGE_JANET https://janet-lang.org/ comment "janet needs a toolchain w/ gcc >= 4.9" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From 8ad1a2eaa5fa6c5eaa6614b007b968223e49448e Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 28 Nov 2023 19:55:07 +0000 Subject: [PATCH 2844/2890] docs/website: fix favicon When the favicon image was added in f26e61319f3f (docs/website: add favicon.png), it was added to a different directory then where the header's icon link points. This causes the favicon to fail to load with 404. While we are here, remove the "shortcut" rel attribute as it is non-standard and it's recommended not to use it[1]. [1] https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/rel#sect4 Signed-off-by: Brandon Maier Signed-off-by: Peter Korsgaard --- docs/website/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/website/header.html b/docs/website/header.html index e1909291f68f..548ed7ad5329 100644 --- a/docs/website/header.html +++ b/docs/website/header.html @@ -6,7 +6,7 @@ - + Buildroot - Making Embedded Linux Easy From d675873f4fe9b601719b08cdd8a901d73ec7f731 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Nov 2023 21:12:50 +0100 Subject: [PATCH 2845/2890] package/vlc: security bump to version 3.0.20 Fix CVE-2023-47359: Videolan VLC prior to version 3.0.20 contains an incorrect offset read that leads to a Heap-Based Buffer Overflow in function GetPacket() and results in a memory corruption. Fix CVE-2023-47360: Videolan VLC prior to version 3.0.20 contains an Integer underflow that leads to an incorrect packet length. https://code.videolan.org/videolan/vlc/-/blob/3.0.20/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/vlc/vlc.hash | 8 ++++---- package/vlc/vlc.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/vlc/vlc.hash b/package/vlc/vlc.hash index ef381e5934c4..40529bd6648d 100644 --- a/package/vlc/vlc.hash +++ b/package/vlc/vlc.hash @@ -1,7 +1,7 @@ -# From https://get.videolan.org/vlc/3.0.19/vlc-3.0.19.tar.xz.sha256 -sha256 643e3294bafe922324663ca499515b7564f2794575fd7d2b7992d20896381745 vlc-3.0.19.tar.xz -# From https://get.videolan.org/vlc/3.0.19/vlc-3.0.19.tar.xz.sha1 -sha1 6d162248a26fdd76a9d4e7e3d52f40d4326f72c1 vlc-3.0.19.tar.xz +# From https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.sha256 +sha256 adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5 vlc-3.0.20.tar.xz +# From https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.sha1 +sha1 b834516ab701bf6311980ed5d67b77c834fdebe7 vlc-3.0.20.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 729e928b4d8a..d0fc1744c018 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 3.0.19 +VLC_VERSION = 3.0.20 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ From bc96e9da0d8010482dcc50c055567d4625498088 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Nov 2023 21:14:33 +0100 Subject: [PATCH 2846/2890] package/memcached: security bump to version 1.6.22 Fix CVE-2023-46852: In Memcached before 1.6.22, a buffer overflow exists when processing multiget requests in proxy mode, if there are many spaces after the "get" substring. Fix CVE-2023-46853: In Memcached before 1.6.22, an off-by-one error exists when processing proxy requests in proxy mode, if \n is used instead of \r\n. https://github.com/memcached/memcached/wiki/ReleaseNotes1622 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/memcached/memcached.hash | 6 +++--- package/memcached/memcached.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index c223a14bacf2..bd2072df0b87 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.6.21.tar.gz.sha1 -sha1 6d899680b4ba4b76b6c92120143cf87630ee984a memcached-1.6.21.tar.gz +# From http://www.memcached.org/files/memcached-1.6.22.tar.gz.sha1 +sha1 7a691f390d59616dbebfc9e2e4942d499c39a338 memcached-1.6.22.tar.gz # Locally computed -sha256 c788980efc417dd5d93c442b1c8b8769fb2018896c29de3887d22a2f143da2ee memcached-1.6.21.tar.gz +sha256 34783a90a4ccf74c4107085fd92b688749d23b276cfdad9f04e4f725a05d1ca7 memcached-1.6.22.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index a1a5eac04988..05ae69eb3294 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.6.21 +MEMCACHED_VERSION = 1.6.22 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From 7fb3c96a7b4bfab1272991a997d6b507b38d19c5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Nov 2023 21:21:13 +0100 Subject: [PATCH 2847/2890] package/squid: security bump to version 6.5 Fix CVE-2023-5824, CVE-2023-46724, CVE-2023-46846, CVE-2023-46847 and CVE-2023-46848 https://github.com/squid-cache/squid/security/advisories/GHSA-543m-w2m2-g255 https://github.com/squid-cache/squid/security/advisories/GHSA-j83v-w3p4-5cqh https://github.com/squid-cache/squid/security/advisories/GHSA-73m6-jm96-c6r3 https://github.com/squid-cache/squid/security/advisories/GHSA-phqj-m8gv-cq4g https://github.com/squid-cache/squid/security/advisories/GHSA-2g3c-pg7q-g59w https://github.com/squid-cache/squid/blob/SQUID_6_5/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/squid/squid.hash | 8 ++++---- package/squid/squid.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/squid/squid.hash b/package/squid/squid.hash index a6d4c5d0569b..a163bd9ad3d2 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v6/squid-6.3.tar.xz.asc -md5 2512b5d27856e6f91a97719784506893 squid-6.3.tar.xz -sha1 7bd74034015c6a4d345a4d277a431908bed2ec4a squid-6.3.tar.xz +# From http://www.squid-cache.org/Versions/v6/squid-6.5.tar.xz.asc +md5 da2797d899cf538fab7f504fdf3c18bf squid-6.5.tar.xz +sha1 07a08394625948750264778c82e19cf24ea7cb1f squid-6.5.tar.xz # Locally calculated -sha256 74a0f5586a7a5d89573d502708d5e1d66ddf0430cf4802cc7261b765653248fa squid-6.3.tar.xz +sha256 5070f8a3ae6666870c8fc716326befb0a1abe8b5ff3a6f3932cbc5543d7c8549 squid-6.5.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 019a2029528e..c1477b1adff6 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUID_VERSION = 6.3 +SQUID_VERSION = 6.5 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v6 SQUID_LICENSE = GPL-2.0+ From 6bd302c631f88698763a3cf3fd6d0a9b3f0a17c8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Nov 2023 21:23:52 +0100 Subject: [PATCH 2848/2890] package/vim: security bump to version 9.0.2136 Fix CVE-2023-46246, CVE-2023-48231, CVE-2023-48232, CVE-2023-48233, CVE-2023-48234, CVE-2023-48235, CVE-2023-48236 and CVE-2023-48237 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 8fdb6998c930..4ff64bada2ec 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 29d0e5212daedbff1b781edba1b66f549b1a226020271f20aa9884abfdf39fc7 vim-9.0.2053.tar.gz +sha256 d826682fb839c0b99f80b9189af549d46dc087ef2cfc617ce161609ba5da4dc7 vim-9.0.2136.tar.gz sha256 0b3f1f330cb1b179bb17c7c687d4cec601e0aa3462bc7f890ad4c3888d37d720 LICENSE sha256 b475d5d3f8c855dc1a84813bbe45c44054d7f7aee20c800950bf89d5958873de README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 37684e0aa3f0..b0b4ffe344db 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.2053 +VIM_VERSION = 9.0.2136 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From e5af07dce9eb2333a863b09ac1c06eb35f3adb70 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Nov 2023 21:30:59 +0100 Subject: [PATCH 2849/2890] package/libxml2: security bump to version 2.11.6 Fix CVE-2023-45322: libxml2 through 2.11.5 has a use-after-free that can only occur after a certain memory allocation fails. This occurs in xmlUnlinkNode in tree.c. NOTE: the vendor's position is "I don't think these issues are critical enough to warrant a CVE ID ... because an attacker typically can't control when memory allocations fail." https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.11.6/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index cad19f930f5d..78c1ddc6a230 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.5.sha256sum -sha256 3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6 libxml2-2.11.5.tar.xz +# From https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.6.sha256sum +sha256 c90eee7506764abbe07bb616b82da452529609815aefef423d66ef080eb0c300 libxml2-2.11.6.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index fb7767297ba3..c93a4aacc535 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.11 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).5 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).6 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From ca169d1d0a5df92e6a1f0850e6969cc525849e6f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Nov 2023 20:46:47 +0100 Subject: [PATCH 2850/2890] system/Config.in: disable openrc with uclibc openrc raises the following uclibc build failures since bump to version 0.51 in commit 730c90faa3ec13ee1ead47113c9c5c7d3a8dac55: ../src/rc-abort/rc-abort.c: In function 'main': ../src/rc-abort/rc-abort.c:27:21: error: implicit declaration of function 'kill'; did you mean 'killpg'? [-Werror=implicit-function-declaration] 27 | if (kill(pid, SIGUSR1) != 0) | ^~~~ | killpg ../src/libeinfo/libeinfo.c: In function 'colour_terminal': ../src/libeinfo/libeinfo.c:319:26: error: implicit declaration of function 'fileno' [-Werror=implicit-function-declaration] 319 | if (f && !isatty(fileno(f))) | ^~~~~~ ../src/librc/librc-misc.c: In function 'rc_getfile': ../src/librc/librc-misc.c:79:14: error: implicit declaration of function 'fileno'; did you mean 'd_fileno'? [-Werror=implicit-function-declaration] 79 | fd = fileno(fp); | ^~~~~~ | d_fileno ../src/librc/librc-daemon.c: In function 'rc_service_daemons_crashed': ../src/librc/librc-daemon.c:633:37: error: implicit declaration of function 'kill'; did you mean 'killpg'? [-Werror=implicit-function-declaration] 633 | if (kill(pid, 0) == -1 && errno == ESRCH) | ^~~~ | killpg These build failures could be fixed by patching openrc but upstream is not happy with this patch: https://github.com/OpenRC/openrc/pull/674. So, as advised by Yann E. Morin, openrc is hidden away for uClibc, until upstream has a proper fix. Fixes: - http://autobuild.buildroot.org/results/494ef392a971ddb3c5c7b01e0149c6439018dbe7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- system/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/Config.in b/system/Config.in index 0b4dc9543ea5..b90e40e415f2 100644 --- a/system/Config.in +++ b/system/Config.in @@ -105,12 +105,13 @@ config BR2_INIT_OPENRC bool "OpenRC" depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_BUILDROOT_UCLIBC select BR2_PACKAGE_OPENRC select BR2_PACKAGE_SKELETON_INIT_OPENRC if BR2_ROOTFS_SKELETON_DEFAULT -comment "openrc needs a toolchain w/ dynamic library" +comment "openrc needs a glibc or musl toolchain w/ dynamic library" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS && BR2_TOOLCHAIN_BUILDROOT_UCLIBC # In Buildroot, we decided not to support a split-usr when systemd is # used as an init system. This is a design decision, not a systemd From c9222fe0fc73aadf42ea8ed2c3514b19e15e9a62 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 28 Nov 2023 18:51:25 +0100 Subject: [PATCH 2851/2890] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 5, 6}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 16 ++++++++-------- package/linux-headers/Config.in.host | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index d6e563212be8..ae734c49a048 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.3" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index aa94a4ca9195..ed9c6143dbf1 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 da1ed7d47c97ed72c9354091628740aa3c40a3c9cd7382871f3cedbd60588234 linux-6.6.1.tar.xz -sha256 2ee24af9282b80923b2da56b70aad7df2e8ee4e3f076452e05ba66be2059b519 linux-6.5.11.tar.xz -sha256 b9fd616facd6becfceef88b9be718d0f16625cab3fe81d11384802a7091e85ec linux-6.1.62.tar.xz +sha256 28edfc3d4f90cd738f2a20f5a2d68510268176d6111f6278d8f495edfd9495a7 linux-6.6.3.tar.xz +sha256 78fbd43822f4c56bc16e89e8874767f592532e1a0ffcd1af4dd279559b5fcbb5 linux-6.5.13.tar.xz +sha256 629daa38f3ea67f29610bfbd53f9f38f46834d3654451e9474100490c66dc7e7 linux-6.1.64.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 af84e54164e1c01f59764ba528448ed36b377d22aafbd81b4b0cf47792ef4aaa linux-5.15.138.tar.xz -sha256 9d2d961fbf87486e48b0087326ee35cb0af4dec03c770737b098652457205104 linux-5.10.200.tar.xz -sha256 9830820714c8f5985c50071cc9e1b40533ee81a4f6c704916c7148d16e54ebfe linux-5.4.260.tar.xz +sha256 be2bee8b346f3ccb35879f16c80a323edda571e36190403805c14a9ea24e4a47 linux-5.15.140.tar.xz +sha256 3212e0299d699dd6089505b1428bcb00643fbf19af69806e37fad22bfe12fa8b linux-5.10.202.tar.xz +sha256 7d3eaa0744456ab4b062e6da8764f776b6939b89a1dfccbe11fbeef9c6e864dc linux-5.4.262.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 9da816bce896024c96b6c846be8f3e6315dd6ae82925698f534153d6a0c10f56 linux-4.19.298.tar.xz -sha256 de36689d713ed17f8bc1286fe4b9afcdb9a3de3b6f1d6aff52569f055c276bb7 linux-4.14.329.tar.xz +sha256 a8419582886120407f57d39280ef8a9b22aab9725c83c4fe25ecca4712d59346 linux-4.19.300.tar.xz +sha256 39dcdceecad2ca7347e2b2e7e30a189558c0a1700f793822389bb1fd9a40530f linux-4.14.331.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 81bd9f9380d1..344acc9cde98 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -412,14 +412,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.329" if BR2_KERNEL_HEADERS_4_14 - default "4.19.298" if BR2_KERNEL_HEADERS_4_19 - default "5.4.260" if BR2_KERNEL_HEADERS_5_4 - default "5.10.200" if BR2_KERNEL_HEADERS_5_10 - default "5.15.138" if BR2_KERNEL_HEADERS_5_15 - default "6.1.62" if BR2_KERNEL_HEADERS_6_1 - default "6.5.11" if BR2_KERNEL_HEADERS_6_5 - default "6.6.1" if BR2_KERNEL_HEADERS_6_6 + default "4.14.331" if BR2_KERNEL_HEADERS_4_14 + default "4.19.300" if BR2_KERNEL_HEADERS_4_19 + default "5.4.262" if BR2_KERNEL_HEADERS_5_4 + default "5.10.202" if BR2_KERNEL_HEADERS_5_10 + default "5.15.140" if BR2_KERNEL_HEADERS_5_15 + default "6.1.64" if BR2_KERNEL_HEADERS_6_1 + default "6.5.13" if BR2_KERNEL_HEADERS_6_5 + default "6.6.3" if BR2_KERNEL_HEADERS_6_6 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 127986f3eda6cc8396f8f83269d525fe13dbde1a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 27 Nov 2023 04:26:39 +0100 Subject: [PATCH 2852/2890] package/perl: security bump to 5.36.2 fix CVE-2023-47038 - Write past buffer end via illegal user-defined Unicode property Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/perl/perl.hash | 12 ++++++------ package/perl/perl.mk | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 2165c8c60180..667b09221d7c 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,10 +1,10 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.36.1.tar.xz.{md5,sha1,sha256}.txt -md5 825f6b1d7e03b22522e0bdb992fbb728 perl-5.36.1.tar.xz -sha1 7b766266af08a6cef0487308e80b40d5d8069df7 perl-5.36.1.tar.xz -sha256 bd91217ea8a8c8b81f21ebbb6cefdf0d13ae532013f944cdece2cd51aef4b6a7 perl-5.36.1.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.36.2.tar.xz.{md5,sha1,sha256}.txt +md5 698ae4946b28e38a729916f04cc389a3 perl-5.36.2.tar.xz +sha1 9bd6e3f7c333e2e5f14c8650333fc29da3df2d90 perl-5.36.2.tar.xz +sha256 19445f09ea9f6ada33297010d5b76ac46be565568d1a4377a6bc736cd795a128 perl-5.36.2.tar.xz -# Hash from: https://github.com/arsv/perl-cross/releases/download/1.4.1/perl-cross-1.4.1.hash -sha256 3e14bb4f28c83586c668c5f9f6b4e57b138b4ec2fae0271086e29d4e352670ca perl-cross-1.4.1.tar.gz +# Hash from: https://github.com/arsv/perl-cross/releases/download/1.5.1/perl-cross-1.5.1.hash +sha256 35d859b49bab274021d8a61511fd39a70a58cb727223de5b54342898155cf5e0 perl-cross-1.5.1.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 734e8efec6d8..735adea01a5a 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -6,7 +6,7 @@ # When updating the version here, also update utils/scancpan PERL_VERSION_MAJOR = 36 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.4.1 +PERL_CROSS_VERSION = 1.5.1 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz From fb72418160417e9e872f626c356f898bff49cf48 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 27 Nov 2023 10:40:44 +0100 Subject: [PATCH 2853/2890] package/erlang: disable for uclibc, fix glibc-build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 2cfa86a54882(package/erlang: bump version to 26.0.2) added a patch to restore building on uClibc. However, that patch is not upstream, and has been rejected: https://github.com/erlang/otp/pull/7500 Please open a PR to https://github.com/asmjit/asmjit instead and we will get the fix next time we sync with upstream. We do not want theirs and our implementation to diverge. Furthermore, it happens to work on uClibc, because uClibc does not expose sys/auxv.h, but it fails to work on glibc, because the define is not propagated to "sub-trees", and thus is never defined where it is checked for, even when sys/auxv.h is available. This causes build failures such as: asmjit/core/cpuinfo.cpp: In function ‘void asmjit::_abi_1_10::detectHWCaps(CpuInfo&, long unsigned int, const LinuxHWCapMapping*, size_t)’: asmjit/core/cpuinfo.cpp:840:24: error: ‘getauxval’ was not declared in this scope 840 | unsigned long mask = getauxval(type); | ^~~~~~~~~ asmjit/core/cpuinfo.cpp: In function ‘void asmjit::_abi_1_10::detectARMCpu(CpuInfo&)’: asmjit/core/cpuinfo.cpp:972:21: error: ‘AT_HWCAP’ was not declared in this scope 972 | detectHWCaps(cpu, AT_HWCAP, hwCapMapping, ASMJIT_ARRAY_SIZE(hwCapMapping)); | ^~~~~~~~ asmjit/core/cpuinfo.cpp:973:21: error: ‘AT_HWCAP2’ was not declared in this scope 973 | detectHWCaps(cpu, AT_HWCAP2, hwCapMapping2, ASMJIT_ARRAY_SIZE(hwCapMapping2)); | ^~~~~~~~~ Yet, sys/auxv.h was detected at configure time: checking for sys/auxv.h... yes This defconfig is enough to reproduce the error: BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_ERLANG=y Since upstream refused the patch, and there is no fix that was submitted to the actual upstream (asmjit), drop the rejectred patch, and disable for uClibc: the patch is incorrect, and we can't fix a build issue on uClibc by introducing another on glibc. Fixes: http://autobuild.buildroot.org/results/fc1/fc19bad2263bdfacea594217d5ddfde0e27895b1/ http://autobuild.buildroot.org/results/114/11416d81d5b27fc0627b335a971154c088d5754a/ Signed-off-by: Yann E. MORIN Cc: Bernd Kuhls Cc: Maxim Kochetkov Changes v1 -> v2: - update comment when unavailable Signed-off-by: Peter Korsgaard --- .../0001-erts-check-for-sys-auxv.h.patch | 44 ------------------- package/erlang/Config.in | 5 ++- 2 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 package/erlang/0001-erts-check-for-sys-auxv.h.patch diff --git a/package/erlang/0001-erts-check-for-sys-auxv.h.patch b/package/erlang/0001-erts-check-for-sys-auxv.h.patch deleted file mode 100644 index af4b66d05d05..000000000000 --- a/package/erlang/0001-erts-check-for-sys-auxv.h.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ede1e17794c2caf091e810bdfa49040c75f513eb Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 15 Jul 2023 18:36:48 +0200 -Subject: [PATCH] erts: check for sys/auxv.h - -Upstream: https://github.com/erlang/otp/pull/7500 - -Signed-off-by: Bernd Kuhls ---- - erts/configure.ac | 2 +- - erts/emulator/asmjit/core/cpuinfo.cpp | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/erts/configure.ac b/erts/configure.ac -index a63d391fb3..9d3e338633 100644 ---- a/erts/configure.ac -+++ b/erts/configure.ac -@@ -1655,7 +1655,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h unistd.h syslog.h dlfcn.h ieeefp.h \ - sys/socket.h sys/sockio.h sys/socketio.h \ - net/errno.h malloc.h arpa/nameser.h libdlpi.h \ - pty.h util.h libutil.h utmp.h langinfo.h poll.h sdkddkver.h \ -- elf.h) -+ elf.h sys/auxv.h) - - AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr], [], [], - [#ifdef __WIN32__ -diff --git a/erts/emulator/asmjit/core/cpuinfo.cpp b/erts/emulator/asmjit/core/cpuinfo.cpp -index fb2acfc09b..d8b72697ab 100644 ---- a/erts/emulator/asmjit/core/cpuinfo.cpp -+++ b/erts/emulator/asmjit/core/cpuinfo.cpp -@@ -15,8 +15,10 @@ - - // Required by `getauxval()` on Linux. - #if defined(__linux__) -+#if defined(HAVE_SYS_AUXV_H) - #include - #endif -+#endif - - //! Required to detect CPU and features on Apple platforms. - #if defined(__APPLE__) --- -2.39.2 - diff --git a/package/erlang/Config.in b/package/erlang/Config.in index d3fe0dbec10f..724f91123b14 100644 --- a/package/erlang/Config.in +++ b/package/erlang/Config.in @@ -15,11 +15,11 @@ config BR2_PACKAGE_ERLANG_ARCH_SUPPORTS # erlang needs host-erlang depends on BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS -comment "erlang needs a toolchain w/ dynamic library, threads, wchar" +comment "erlang needs a glibc or musl toolchain w/ dynamic library, threads, wchar" depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_ERLANG_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_USE_WCHAR + || !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_UCLIBC config BR2_PACKAGE_ERLANG bool "erlang" @@ -27,6 +27,7 @@ config BR2_PACKAGE_ERLANG depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_PACKAGE_ERLANG_ARCH_SUPPORTS select BR2_PACKAGE_ZLIB help From a82ff22698e4e4ffecfd2b07ba0e00cd8a0d4a85 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Nov 2023 22:18:59 +0100 Subject: [PATCH 2854/2890] package/qemu: fix selinux module Fix the following refpolicy build failure raised since commit aa8e38a51658723dafb8f05275d3a318058f0d6e: policy.conf:2509:ERROR 'attribute virt_ptynode is not declared' at token ';' on line 2509: type qemu_device_t; type qemu_devpts_t, virt_ptynode; Fixes: - http://autobuild.buildroot.org/results/210db01ac72cabd42e1478900cdbfa4cf4b19bcb Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/qemu/qemu.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index afe0d8a19612..ef406dc8e9b5 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -9,7 +9,7 @@ QEMU_VERSION = 8.1.1 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org -QEMU_SELINUX_MODULES = qemu +QEMU_SELINUX_MODULES = qemu virt QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c QEMU_LICENSE_FILES = COPYING COPYING.LIB # NOTE: there is no top-level license file for non-(L)GPL licenses; From e88823d667cf0a459242da7cdb7f71269b69e536 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Nov 2023 22:48:41 +0100 Subject: [PATCH 2855/2890] package/refpolicy: fix build with smartmontools Fix the following build failure with smartmontools raised since bump to version 2.20231002 in commit 68de45491ba7d4b7aeff6f869934745440f88c00: Compiling targeted policy.33 env LD_LIBRARY_PATH="/home/thomas/autobuild/instance-2/output-1/host/lib:/home/thomas/autobuild/instance-2/output-1/host/usr/lib" /home/thomas/autobuild/instance-2/output-1/host/usr/bin/checkpolicy -c 33 -U deny -S -O -E policy.conf -o policy.33 policy/modules/services/smartmon.te:146:ERROR 'type fsadm_exec_t is not within scope' at token ';' on line 237472: allow smartmon_update_drivedb_t fsadm_exec_t:file { { getattr open map read execute ioctl } ioctl lock execute_no_trans }; #line 146 checkpolicy: error(s) encountered while parsing configuration make[1]: *** [Rules.monolithic:80: policy.33] Error 1 Fixes: - http://autobuild.buildroot.org/results/a01123de9a8c1927060e7e4748666bebfc82ea44 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ervices-smartmon.te-make-fstools-opt.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/refpolicy/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch diff --git a/package/refpolicy/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch b/package/refpolicy/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch new file mode 100644 index 000000000000..ddf2943bfa72 --- /dev/null +++ b/package/refpolicy/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch @@ -0,0 +1,44 @@ +From c6d1345732c463cb45d8ba490081ad92936bfd69 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 28 Nov 2023 22:30:01 +0100 +Subject: [PATCH] policy/modules/services/smartmon.te: make fstools optional + +Make fstools optional to avoid the following build failure raised since +version 2.20231002 and +https://github.com/SELinuxProject/refpolicy/commit/cb068f09d224f90a97fa63a574fb423bbe1ceeda: + + Compiling targeted policy.33 + env LD_LIBRARY_PATH="/home/thomas/autobuild/instance-2/output-1/host/lib:/home/thomas/autobuild/instance-2/output-1/host/usr/lib" /home/thomas/autobuild/instance-2/output-1/host/usr/bin/checkpolicy -c 33 -U deny -S -O -E policy.conf -o policy.33 + policy/modules/services/smartmon.te:146:ERROR 'type fsadm_exec_t is not within scope' at token ';' on line 237472: + allow smartmon_update_drivedb_t fsadm_exec_t:file { { getattr open map read execute ioctl } ioctl lock execute_no_trans }; + #line 146 + checkpolicy: error(s) encountered while parsing configuration + make[1]: *** [Rules.monolithic:80: policy.33] Error 1 + +Fixes: + - http://autobuild.buildroot.org/results/a01123de9a8c1927060e7e4748666bebfc82ea44 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/SELinuxProject/refpolicy/pull/738 +--- + policy/modules/services/smartmon.te | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/policy/modules/services/smartmon.te b/policy/modules/services/smartmon.te +index 32c80f712..761280c11 100644 +--- a/policy/modules/services/smartmon.te ++++ b/policy/modules/services/smartmon.te +@@ -143,7 +143,9 @@ corenet_tcp_connect_http_port(smartmon_update_drivedb_t) + + files_read_etc_files(smartmon_update_drivedb_t) + +-fstools_exec(smartmon_update_drivedb_t) ++optional_policy(` ++ fstools_exec(smartmon_update_drivedb_t) ++') + + kernel_dontaudit_read_system_state(smartmon_update_drivedb_t) + +-- +2.42.0 + From 273b634f24ecce9a3d4be3ab4dbd0371f7d26e73 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 29 Nov 2023 08:46:35 +0100 Subject: [PATCH 2856/2890] package/openrc: fix uclibc handling Fix issues spotted by Yann E. Morin in commit ca169d1d0a5df92e6a1f0850e6969cc525849e6f: - BR2_TOOLCHAIN_BUILDROOT_UCLIBC -> BR2_TOOLCHAIN_USES_UCLIBC - Add dependency to openrc package and not only to init system Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openrc/Config.in | 5 +++-- system/Config.in | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/openrc/Config.in b/package/openrc/Config.in index 4691be63a286..adc61d2546fb 100644 --- a/package/openrc/Config.in +++ b/package/openrc/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_OPENRC bool "openrc" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_INIT_OPENRC select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod tools select BR2_PACKAGE_KMOD # runtime @@ -23,7 +24,7 @@ config BR2_PACKAGE_OPENRC https://github.com/OpenRC/openrc -comment "openrc needs a toolchain w/ dynamic library" +comment "openrc needs a glibc or musl toolchain w/ dynamic library" depends on BR2_USE_MMU depends on BR2_INIT_OPENRC - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS && BR2_TOOLCHAIN_USES_UCLIBC diff --git a/system/Config.in b/system/Config.in index b90e40e415f2..33ca69b9339e 100644 --- a/system/Config.in +++ b/system/Config.in @@ -105,13 +105,13 @@ config BR2_INIT_OPENRC bool "OpenRC" depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_BUILDROOT_UCLIBC + depends on !BR2_TOOLCHAIN_USES_UCLIBC # openrc select BR2_PACKAGE_OPENRC select BR2_PACKAGE_SKELETON_INIT_OPENRC if BR2_ROOTFS_SKELETON_DEFAULT comment "openrc needs a glibc or musl toolchain w/ dynamic library" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS && BR2_TOOLCHAIN_BUILDROOT_UCLIBC + depends on BR2_STATIC_LIBS && BR2_TOOLCHAIN_USES_UCLIBC # In Buildroot, we decided not to support a split-usr when systemd is # used as an init system. This is a design decision, not a systemd From 02e80e06c54af2863b622f1ecaa076656f1c16cf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 27 Nov 2023 23:11:19 +0100 Subject: [PATCH 2857/2890] package/gsl: fix musl build on m68k Update patch to fix the following musl build failure with m68k which is only raised (for an unknown reason) since bump to version 2.7.1 in commit 3e48f8358e519f9c24262a6549d8f6c78ee01add: In file included from fp.c:6: fp-gnum68k.c:21:10: fatal error: fpu_control.h: No such file or directory 21 | #include | ^~~~~~~~~~~~~~~ Add also upstream link to first patch iteration which was sent in November 2022 but didn't get it any reply (like most of the other emails sent to bug-gsl@gnu.org ...) Fixes: - http://autobuild.buildroot.org/results/e59636f6ac148807c1c67f09eef0e0a9f5d52303 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - package/gsl/0001-configure.ac-fix-build-on-powerpc.patch | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0663149d01cb..c172750ba734 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -529,7 +529,6 @@ package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch Up package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch Upstream package/grpc/0003-host-grpc-only-cpp-plugin.patch Upstream package/grpc/0004-disable-unconditionally-downloading-api-repos.patch Upstream -package/gsl/0001-configure.ac-fix-build-on-powerpc.patch Upstream package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch Upstream package/guile/0001-calculate-csqrt_manually.patch Upstream package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch Upstream diff --git a/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch b/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch index 13f6da4588c0..96ab78046793 100644 --- a/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch +++ b/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch @@ -1,9 +1,9 @@ From 84e62d57b90b41a0c96bb9fb6ec61ecaac76a1ab Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 5 Nov 2022 21:31:36 +0100 -Subject: [PATCH] configure.ac: fix build on powerpc +Subject: [PATCH] configure.ac: fix build on powerpc and m68k -Fix the following powerpc build failures on: +Fix the following powerpc and m68k build failures on: - musl raised because fpu_control.h is not available: In file included from fp.c:8: @@ -25,6 +25,7 @@ Fixes: - http://autobuild.buildroot.org/results/48403946bb4cda9013e51db59c1b2ffdcf4e2854 Signed-off-by: Fabrice Fontaine +Upstream: https://lists.gnu.org/archive/html/bug-gsl/2022-11/msg00000.html --- configure.ac | 8 ++++++++ 1 file changed, 8 insertions(+) @@ -37,7 +38,7 @@ index bfd9ca30..1ee6dca0 100644 fi fi -+if test "$ac_cv_c_ieee_interface" = "gnuppc" ; then ++if test "$ac_cv_c_ieee_interface" = "gnuppc" -o "$ac_cv_c_ieee_interface" = "gnum68k" ; then + AC_CACHE_CHECK([for _FPU_RC_NEAREST], ac_cv_c__fpu_rc_nearest, + [ac_cv_c__fpu_rc_nearest=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include From cb924944051be8f121feff2f510d04d135e0f4aa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 29 Nov 2023 21:08:32 +0100 Subject: [PATCH 2858/2890] package/libgdiplus: needs C++ Unfortunately, libgdiplus unconditionally calls AC_PROG_CXX since version 6.1 for google-based tests resulting in the following build failure without C++ since commit 5b6dd17b864cfb9133d3e2d78b9a15fed877b15b and https://github.com/mono/libgdiplus/commit/4f9802230653ffe810ed2e535a572e42821fdf2d: checking whether the C++ compiler works... no configure: error: in `/home/thomas/autobuild/instance-3/output-1/build/libgdiplus-6.1': configure: error: C++ compiler cannot create executables Fixes: - http://autobuild.buildroot.org/results/3757921a2160ca209089a0b47414a445cc42e35e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libgdiplus/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libgdiplus/Config.in b/package/libgdiplus/Config.in index 6ddf44fd0c42..d26a997d4655 100644 --- a/package/libgdiplus/Config.in +++ b/package/libgdiplus/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBGDIPLUS depends on BR2_USE_WCHAR # libglib2 -> gettext depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_XLIB_LIBXFT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_CAIRO @@ -13,7 +14,8 @@ config BR2_PACKAGE_LIBGDIPLUS https://github.com/mono/libgdiplus -comment "libgdiplus needs a toolchain w/ wchar, threads" +comment "libgdiplus needs a toolchain w/ wchar, threads, C++" depends on BR2_USE_MMU depends on BR2_PACKAGE_XORG7 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP From d3eff1cd761c35c686dcd9d839bc5e0c85c6dfc0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 29 Nov 2023 22:07:25 +0100 Subject: [PATCH 2859/2890] package/samba4: security bump version to 4.19.3 Fixes CVE-2018-14628: https://www.samba.org/samba/security/CVE-2018-14628.html Release notes: https://www.samba.org/samba/history/samba-4.19.3.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 06b9cecddcd1..81e8a6f2e903 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.19.2.tar.asc -sha256 9e63f0505e1c631f1db0b7a9349a51e925c026ca03af3fd5d812228bb597d393 samba-4.19.2.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.3.tar.asc +sha256 280553b90f131b1940580df293653c9e9bd8906201f5def6e5e8c160f0bfac96 samba-4.19.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index b89f961d99f9..42bcd0a9280b 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.2 +SAMBA4_VERSION = 4.19.3 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 0ed48b952bf2b854315009234e8b8b5c55af3757 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 29 Nov 2023 22:57:14 +0100 Subject: [PATCH 2860/2890] Update for 2023.11-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 19 +++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index a045779c3153..c1b5651b740e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,22 @@ +2023.11-rc2, released November 29th, 2023 + + Fixes all over the tree. + + Defconfigs: Raspberry pi: Fix bluetooth autoprobing, + rockpro64: Fix U-Boot build, bump rootfs size, vim3: Use + device tree from Linux rather than from U-Boot. + + Updated/fixed packages: erlang, exfatprogs, flutter-engine, + flutter-sdk-bin, gcc, gsl, intel-microcode, janet, + kodi-pvr-hts, libgdiplus, libpam-tacplus, libxml2, + libzenoh-pico, memcached, motion, netsnmp, nodejs, oatpp, + openrc, opensc, perl, postgresql, python-msgpack, qemu, + refpolicy, samba4, squid, vim, vlc, xwayland, zfs + + Issues resolved (http://bugs.uclibc.org): + + #15856: Using BR2_CONFIG= on a different file-system... + 2023.11-rc1, released November 14th, 2023 Fixes all over the tree and new features. diff --git a/Makefile b/Makefile index 8e3e745b38b6..04d24b9a3558 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.11-rc1 +export BR2_VERSION := 2023.11-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1699946000 +BR2_VERSION_EPOCH = 1701295000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 23474159a344..7cc2ff7ccdc0 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@

                                    buildroot-2023.08.3.tar.xz

                                    -

                                    Latest release candidate: 2023.11-rc1

                                    +

                                    Latest release candidate: 2023.11-rc2

                                    - +
                                    - +
                                    -

                                    buildroot-2023.11-rc1.tar.gz

                                    -

                                    PGP signature

                                    +

                                    buildroot-2023.11-rc2.tar.gz

                                    +

                                    PGP signature

                                    - +
                                    - +
                                    -

                                    buildroot-2023.11-rc1.tar.xz

                                    -

                                    PGP signature

                                    +

                                    buildroot-2023.11-rc2.tar.xz

                                    +

                                    PGP signature

                                    diff --git a/docs/website/news.html b/docs/website/news.html index e8b10e3a6ef8..b3dda4c62995 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

                                    News

                                      +
                                    • +
                                      +
                                      +
                                      +

                                      2023.11-rc2 released

                                      +

                                      29 November 2023

                                      +
                                      +
                                      +

                                      2023.11-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

                                      + +

                                      Head to the downloads page to pick up the + 2023.11-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

                                      +
                                      +
                                      +
                                      • +
                                    • From 758d79faec0d95c57489296658517b1fd9fb5040 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 29 Nov 2023 22:43:08 +0100 Subject: [PATCH 2861/2890] package/imagemagick: security bump to version 7.1.1-21 Fix CVE-2023-1289, CVE-2023-2157, CVE-2023-34151, CVE-2023-34152, CVE-2023-34153, CVE-2023-3428, CVE-2023-34474 and CVE-2023-34475 https://github.com/ImageMagick/Website/blob/main/ChangeLog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/imagemagick/imagemagick.hash | 2 +- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 8988dad5da04..fd80316ec572 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4333ef2fe63f2510988af82b726f5b1919ebd54037ea6674566c69fcceb67e11 imagemagick-7.1.0-51.tar.gz +sha256 09402e5f17c6575ef9f010bb2e21ae1710f1f3426f115ad4317ee9129c32608e imagemagick-7.1.1-21.tar.gz sha256 8cceeb67d4e783cb63075c7311fdb990fa0369ee80fbd0f481064cd02386ca2d LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 91dd208b0da1..719c6768af1a 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.1.0-51 +IMAGEMAGICK_VERSION = 7.1.1-21 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE From 5fcd48aff97866df5488eb47589f6f45064f0228 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 29 Nov 2023 23:08:43 +0100 Subject: [PATCH 2862/2890] package/openfpgaloader: bump to version 0.11.0 This bump will fix the following build failure thanks to https://github.com/trabucayre/openFPGALoader/commit/933ed793e85dea7e16ddd6540791097fd3a299f5: In file included from /home/buildroot/autobuild/instance-3/output-1/build/openfpgaloader-0.10.0/src/jtag.hpp:13, from /home/buildroot/autobuild/instance-3/output-1/build/openfpgaloader-0.10.0/src/device.hpp:13, from /home/buildroot/autobuild/instance-3/output-1/build/openfpgaloader-0.10.0/src/efinix.hpp:11, from /home/buildroot/autobuild/instance-3/output-1/build/openfpgaloader-0.10.0/src/efinix.cpp:6: /home/buildroot/autobuild/instance-3/output-1/build/openfpgaloader-0.10.0/src/board.hpp:49:9: error: 'uint8_t' does not name a type 49 | uint8_t tms_pin; /*! TMS pin value */ | ^~~~~~~ /home/buildroot/autobuild/instance-3/output-1/build/openfpgaloader-0.10.0/src/board.hpp:12:1: note: 'uint8_t' is defined in header ''; did you forget to '#include '? 11 | #include "cable.hpp" +++ |+#include 12 | https://github.com/trabucayre/openFPGALoader/releases/tag/v0.11.0 Fixes: - http://autobuild.buildroot.org/results/ee89dcc7430079195e2e9ff300e1320de848d3e3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openfpgaloader/openfpgaloader.hash | 2 +- package/openfpgaloader/openfpgaloader.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash index a8b537782cc1..6fa81a98a22b 100644 --- a/package/openfpgaloader/openfpgaloader.hash +++ b/package/openfpgaloader/openfpgaloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 966b4629df86b1d520ddd8a4e0a3fc00060b26b5ab4e172b596bd9d4659a196e openfpgaloader-0.10.0.tar.gz +sha256 a463690358d2510919472c2f460039a304d016a08a45970821e667eea1c48cc8 openfpgaloader-0.11.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index 6d7fbd985076..0fd172b5326d 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENFPGALOADER_VERSION = 0.10.0 +OPENFPGALOADER_VERSION = 0.11.0 OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,v$(OPENFPGALOADER_VERSION)) OPENFPGALOADER_LICENSE = Apache-2.0 OPENFPGALOADER_LICENSE_FILES = LICENSE From d590c2c9398bce36efe042233054a2c6b75fcad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Thu, 30 Nov 2023 09:33:40 +0100 Subject: [PATCH 2863/2890] package/libusb-compat: fix hash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream re-released the v0.1.8 tarballs with autotools related stuff. [1] That makes the hash test to fail: ERROR: while checking hashes from package/libusb-compat//libusb-compat.hash ERROR: libusb-compat-0.1.8.tar.bz2 has wrong sha256 hash: ERROR: expected: 698c76484f3dec1e0175067cbd1556c3021e94e7f2313ae3ea6a66d900e00827 ERROR: got : b692dcf674c070c8c0bee3c8230ce4ee5903f926d77dc8b968a4dd1b70f9b05c ERROR: Incomplete download, or man-in-the-middle (MITM) attack Update the hash and drop LIBUSB_COMPAT_AUTORECONF. [1] https://github.com/libusb/libusb-compat-0.1/issues/28#issuecomment-1759400548 [Peter: use .tar.gz to not conflict with s.b.o] Signed-off-by: Sébastien Szymanski Signed-off-by: Peter Korsgaard --- package/libusb-compat/libusb-compat.hash | 2 +- package/libusb-compat/libusb-compat.mk | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/libusb-compat/libusb-compat.hash b/package/libusb-compat/libusb-compat.hash index a198e76058b9..b22fa5434d72 100644 --- a/package/libusb-compat/libusb-compat.hash +++ b/package/libusb-compat/libusb-compat.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 698c76484f3dec1e0175067cbd1556c3021e94e7f2313ae3ea6a66d900e00827 libusb-compat-0.1.8.tar.bz2 +sha256 d199c173fd3cd9d27c7f4bb6608befc7eb761984e6664da7d9d4386ff66fe6fc libusb-compat-0.1.8.tar.gz sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk index d49b75367036..b54dbded27cc 100644 --- a/package/libusb-compat/libusb-compat.mk +++ b/package/libusb-compat/libusb-compat.mk @@ -6,7 +6,6 @@ LIBUSB_COMPAT_VERSION_MAJOR = 0.1 LIBUSB_COMPAT_VERSION = $(LIBUSB_COMPAT_VERSION_MAJOR).8 -LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2 LIBUSB_COMPAT_SITE = https://github.com/libusb/libusb-compat-0.1/releases/download/v$(LIBUSB_COMPAT_VERSION) LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb HOST_LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf host-libusb @@ -14,9 +13,6 @@ LIBUSB_COMPAT_INSTALL_STAGING = YES LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config LIBUSB_COMPAT_LICENSE = LGPL-2.1+ LIBUSB_COMPAT_LICENSE_FILES = COPYING -# 0.1.8 tarball was released without configure script by upstream -# discussed here: https://github.com/libusb/libusb-compat-0.1/issues/28 -LIBUSB_COMPAT_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),) LIBUSB_COMPAT_CONF_ENV += \ From 9152ef591b8b140cf820d313a7aab97a317aa856 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 30 Nov 2023 15:33:29 +0200 Subject: [PATCH 2864/2890] package/cog: bump to version 0.18.1 This is a small bugfix release which solves a build issue, a memory leak, and fixes touch input on rotated screens with the DRM/KMS module. Release notes: https://wpewebkit.org/release/cog-0.18.1.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 9fb386dfa00e..177113bb42e9 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.18.0.tar.xz.sums -md5 9521458c72322e1b2e39e8b1cca93d24 cog-0.18.0.tar.xz -sha1 73ec1684c31de7247ecbd5e852c16cf88416bedd cog-0.18.0.tar.xz -sha256 410bf70f9aa3812db72d75c25cefee421efa0391ab03dc3c37299dfaa388f4fd cog-0.18.0.tar.xz +# From https://wpewebkit.org/releases/cog-0.18.1.tar.xz.sums +md5 204ae9353ed828e4ac39b1dd4c5c35dd cog-0.18.1.tar.xz +sha1 f0f0ebcd279170f427be0ad57fd356faff1a2732 cog-0.18.1.tar.xz +sha256 72e3a84052b459e2d53d0e8b947f20e27bf5d8049766c4c1594eb9c6b6cf7ab3 cog-0.18.1.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index f41c114fa5cc..bd34f124c536 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.18.0 +COG_VERSION = 0.18.1 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES From e81dc9df53c406d0f65f5cb5e0fd6c5b0de32fd3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 29 Nov 2023 18:39:00 +0100 Subject: [PATCH 2865/2890] package/xtables-addons: drop unrecognized option --with-xtables is an unrecognized option since the addition of the package in commit 490917387a0ff6969f8130be38993eed5f06f73e: https://github.com/nawawi/xtables-addons/blob/a576f4d43e80f9f91705c9e6a86f2d58c283df14/configure.ac configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --disable-nls, --with-xtables Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/xtables-addons/xtables-addons.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index e794538956c1..adfedbc874d2 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -13,7 +13,6 @@ XTABLES_ADDONS_LICENSE_FILES = LICENSE XTABLES_ADDONS_CONF_OPTS = \ --with-kbuild="$(LINUX_DIR)" \ - --with-xtables="$(STAGING_DIR)/usr" \ --with-xtlibdir="/usr/lib/xtables" define XTABLES_ADDONS_BUILD_CMDS From 84b721c2bf88c3ae8f519680a64b1829427176c2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 29 Nov 2023 18:39:01 +0100 Subject: [PATCH 2866/2890] package/xtables-addons: bump to version 3.24 This bump will fix the following build failure with kernel >= 6.2 thanks to https://codeberg.org/jengelh/xtables-addons/commit/51761c3fe2454e0b4bc25274dd55d4ab72c54bf0: /home/buildroot/autobuild/instance-1/output-1/build/xtables-addons-3.22/extensions/xt_TARPIT.c: In function 'xttarpit_honeypot': /home/buildroot/autobuild/instance-1/output-1/build/xtables-addons-3.22/extensions/xt_TARPIT.c:110:26: error: implicit declaration of function 'prandom_u32_max'; did you mean 'prandom_u32_state'? [-Werror=implicit-function-declaration] 110 | (prandom_u32_max(0x20) - 0xf); | ^~~~~~~~~~~~~~~ | prandom_u32_state Fixes: - http://autobuild.buildroot.org/results/e8f2a0cb5b38ff98da97268c4b642554a0a732e1 - http://autobuild.buildroot.org/results/0191ee0590c08b73f17b35a5c8521796693772b5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/xtables-addons/xtables-addons.hash | 2 +- package/xtables-addons/xtables-addons.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xtables-addons/xtables-addons.hash b/package/xtables-addons/xtables-addons.hash index 840a31f9478f..7bdbbb85784f 100644 --- a/package/xtables-addons/xtables-addons.hash +++ b/package/xtables-addons/xtables-addons.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 faa16a27166275afbfe8df605f55c3a81ac693bf19da674d45ceded4137ae217 xtables-addons-3.22.tar.xz +sha256 3e823f71720519ced31c4c7d2bfaf7120d9c01c59a0843dfcbe93c95c64d81c1 xtables-addons-3.24.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index adfedbc874d2..efd8bd98cecd 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTABLES_ADDONS_VERSION = 3.22 +XTABLES_ADDONS_VERSION = 3.24 XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz XTABLES_ADDONS_SITE = https://inai.de/files/xtables-addons XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf From a44d1a1252572bcb7638e5b832c24841303f4800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Mon, 13 Nov 2023 01:58:34 +0100 Subject: [PATCH 2867/2890] package/zfs: bump version to 2.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed backported patch: - https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch Updated ZFS test to pass this new version; drop the explicit /pool mountpoint option to rely on the default location (which happens to be /pool already). Signed-off-by: José Luis Salvador Rufo Signed-off-by: Yann E. MORIN [yann.morin.1998@free.fr: - needed on master to further bump to a data-corruption fix ] (cherry picked from commit d153e58d13f262f96c6c7c9a2bc0d31b76c8973d) Signed-off-by: Yann E. MORIN --- .../0001-config-user-check-for-aio.h.patch | 94 ------------------- package/zfs/zfs.hash | 4 +- package/zfs/zfs.mk | 2 +- support/testing/tests/package/test_zfs.py | 4 +- 4 files changed, 5 insertions(+), 99 deletions(-) delete mode 100644 package/zfs/0001-config-user-check-for-aio.h.patch diff --git a/package/zfs/0001-config-user-check-for-aio.h.patch b/package/zfs/0001-config-user-check-for-aio.h.patch deleted file mode 100644 index 55321ee2fca8..000000000000 --- a/package/zfs/0001-config-user-check-for-aio.h.patch +++ /dev/null @@ -1,94 +0,0 @@ -From bc3f12bfac152a0c28951cec92340ba14f9ccee9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= -Date: Mon, 28 Mar 2022 19:24:22 +0200 -Subject: [PATCH] config: user: check for -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -And always zpool_read_label_slow() on non-conformant libcs - -Reviewed-by: Brian Behlendorf -Co-authored-by: José Luis Salvador Rufo -Signed-off-by: Ahelenia Ziemiańska -Closes #13207 -Closes #13254 -Upstream: https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9 -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: Yann E. MORIN ---- - config/user-aio.h.m4 | 7 +++++++ - config/user-libaio.m4 | 2 +- - config/user.m4 | 1 + - lib/libzutil/zutil_import.c | 6 ++++++ - 4 files changed, 15 insertions(+), 1 deletion(-) - create mode 100644 config/user-aio.h.m4 - -diff --git a/config/user-aio.h.m4 b/config/user-aio.h.m4 -new file mode 100644 -index 00000000000..152c0946722 ---- /dev/null -+++ b/config/user-aio.h.m4 -@@ -0,0 +1,7 @@ -+dnl # -+dnl # POSIX specifies as part of realtime extensions, -+dnl # and is missing from at least uClibc – force fallbacks there -+dnl # -+AC_DEFUN([ZFS_AC_CONFIG_USER_AIO_H], [ -+ ZFS_AC_FIND_SYSTEM_LIBRARY(AIO_H, [], [aio.h], [], [rt], [lio_listio]) -+]) -diff --git a/config/user-libaio.m4 b/config/user-libaio.m4 -index 95c144d76b4..8009bd11b3e 100644 ---- a/config/user-libaio.m4 -+++ b/config/user-libaio.m4 -@@ -1,5 +1,5 @@ - dnl # --dnl # Check for libaio - only used for libaiot test cases. -+dnl # Check for libaio - only used for mmap_libaio test cases. - dnl # - AC_DEFUN([ZFS_AC_CONFIG_USER_LIBAIO], [ - ZFS_AC_FIND_SYSTEM_LIBRARY(LIBAIO, [], [libaio.h], [], [aio], [], [user_libaio=yes], [user_libaio=no]) -diff --git a/config/user.m4 b/config/user.m4 -index 670820b3771..f450af47e04 100644 ---- a/config/user.m4 -+++ b/config/user.m4 -@@ -23,6 +23,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ - ZFS_AC_CONFIG_USER_LIBAIO - ZFS_AC_CONFIG_USER_LIBATOMIC - ZFS_AC_CONFIG_USER_LIBFETCH -+ ZFS_AC_CONFIG_USER_AIO_H - ZFS_AC_CONFIG_USER_CLOCK_GETTIME - ZFS_AC_CONFIG_USER_PAM - ZFS_AC_CONFIG_USER_RUNSTATEDIR -diff --git a/lib/libzutil/zutil_import.c b/lib/libzutil/zutil_import.c -index d7547c4249e..3744a1c3474 100644 ---- a/lib/libzutil/zutil_import.c -+++ b/lib/libzutil/zutil_import.c -@@ -47,7 +47,9 @@ - * using our derived config, and record the results. - */ - -+#ifdef HAVE_AIO_H - #include -+#endif - #include - #include - #include -@@ -982,6 +984,9 @@ zpool_read_label_slow(int fd, nvlist_t **config, int *num_labels) - int - zpool_read_label(int fd, nvlist_t **config, int *num_labels) - { -+#ifndef HAVE_AIO_H -+ return (zpool_read_label_slow(fd, config, num_labels)); -+#else - struct stat64 statbuf; - struct aiocb aiocbs[VDEV_LABELS]; - struct aiocb *aiocbps[VDEV_LABELS]; -@@ -1104,6 +1109,7 @@ zpool_read_label(int fd, nvlist_t **config, int *num_labels) - *config = expected_config; - - return (0); -+#endif - } - - /* diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index f0327ce8ccc3..b02c49234a6d 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.1.12/zfs-2.1.12.sha256.asc -sha256 64daa26aed3e12c931f6f4413d7527c4ebdb8da35416b356152b5f9fdd4c6e6d zfs-2.1.12.tar.gz +# Locally computed +sha256 42035fd059faa25a09cd511b24a57b8ad1285cb69127f2a0043b98562c5ec690 zfs-2.2.0.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index c7b0ed040715..b35967a3b52e 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.1.12 +ZFS_VERSION = 2.2.0 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL diff --git a/support/testing/tests/package/test_zfs.py b/support/testing/tests/package/test_zfs.py index 1f01ddd76835..27dbc2869bc9 100644 --- a/support/testing/tests/package/test_zfs.py +++ b/support/testing/tests/package/test_zfs.py @@ -40,11 +40,11 @@ def base_test_run(self): cmds = [ # Init - "modprobe zfs", + "modprobe zfs && sleep 2", "mount -o remount,size=132M /tmp", "fallocate -l 64M /tmp/container1.raw", "fallocate -l 64M /tmp/container2.raw", - "zpool create -m /pool pool raidz /tmp/container1.raw /tmp/container2.raw", + "zpool create pool raidz /tmp/container1.raw /tmp/container2.raw", "dd if=/dev/urandom bs=1M count=8 of=/pool/urandom", "sha256sum /pool/urandom > /tmp/urandom.sha256", # Check ZFS From c068fc4fa08051653229455dde0034427113a577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Fri, 1 Dec 2023 08:33:05 +0100 Subject: [PATCH 2868/2890] package/zfs: bump version to 2.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This release contains an important fix for a data corruption bug. Full details are in the issue [1] and bug fix [2]. 1. https://github.com/openzfs/zfs/issues/15526 2. https://github.com/openzfs/zfs/pull/15571 Signed-off-by: José Luis Salvador Rufo Signed-off-by: Yann E. MORIN --- package/zfs/zfs.hash | 4 ++-- package/zfs/zfs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index b02c49234a6d..01c86f2bd69c 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,5 @@ -# Locally computed -sha256 42035fd059faa25a09cd511b24a57b8ad1285cb69127f2a0043b98562c5ec690 zfs-2.2.0.tar.gz +# From https://github.com/openzfs/zfs/releases/download/zfs-2.2.2/zfs-2.2.2.sha256.asc +sha256 76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9 zfs-2.2.2.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index b35967a3b52e..59cdd31942d1 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.2.0 +ZFS_VERSION = 2.2.2 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL From 67cb7d8d093f57339e622e1f1f5a40d5013194f1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 30 Nov 2023 23:49:04 +0100 Subject: [PATCH 2869/2890] package/rtty: fix wolfssl build Fix the following wolfssl build failure raised at least since bump to version 7.4.0 in commit 6b5907bf65d27ed98532e9783f92f5575f38b3d2: /home/autobuild/autobuild/instance-4/output-1/build/rtty-8.1.0/src/ssl/openssl.c: In function 'ssl_last_error_string': /home/autobuild/autobuild/instance-4/output-1/build/rtty-8.1.0/src/ssl/openssl.c:143:24: error: implicit declaration of function 'ERR_peek_error_line_data'; did you mean 'wolfSSL_ERR_get_error_line_data'? [-Werror=implicit-function-declaration] 143 | ssl_err_code = ERR_peek_error_line_data(&file, &line, &data, &flags); | ^~~~~~~~~~~~~~~~~~~~~~~~ | wolfSSL_ERR_get_error_line_data Fixes: - http://autobuild.buildroot.org/results/9db9f1dcc6760de4b78771bb79f109c4efd06c36 - http://autobuild.buildroot.org/results/16422af9469de114e552124542508c3b18ea8f19 Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: don't force wolfssl-all] Signed-off-by: Yann E. MORIN --- package/rtty/rtty.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index 964ec04ec4b9..8a40f584def2 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -24,7 +24,7 @@ RTTY_CONF_OPTS += \ -DUSE_MBEDTLS=OFF \ -DUSE_OPENSSL=ON \ -DUSE_WOLFSSL=OFF -else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) RTTY_DEPENDENCIES += wolfssl RTTY_CONF_OPTS += \ -DSSL_SUPPORT=ON \ From 89e6b474ea00a62ce95754058eafd390d31b39fa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Nov 2023 23:16:37 +0100 Subject: [PATCH 2870/2890] package/libzenoh-pico: add threads comment Commit 3e76df02b324b0442eec7bfd2451ee2fbb3709e9 forgot to add a comment about threads dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libzenoh-pico/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libzenoh-pico/Config.in b/package/libzenoh-pico/Config.in index cb61b0de5593..5f7e91c9f67c 100644 --- a/package/libzenoh-pico/Config.in +++ b/package/libzenoh-pico/Config.in @@ -9,3 +9,6 @@ config BR2_PACKAGE_LIBZENOH_PICO functionalities. https://github.com/eclipse-zenoh/zenoh-pico + +comment "libzenoh-pico needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS From 8b3993178d0ffae312d7dd0df70d30d1d3d88873 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 Nov 2023 23:12:06 +0100 Subject: [PATCH 2871/2890] package/python-numpy: needs gcc >= 9 python-numpy needs gcc >= 8.4 since bump to version 1.25.0 in commit ca63464e3777ca2596b4d396accb6a384ccf8514 and https://github.com/numpy/numpy/commit/4002a7d421ff10780c28a3643683af7a9754f87f: ../output-1/build/host-python-numpy-1.25.0/meson.build:30:4: ERROR: Problem encountered: NumPy requires GCC >= 8.4 Fixes: - http://autobuild.buildroot.org/results/9ec82be71c908873112064792ace283049355031 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gnuradio/Config.in | 6 ++++-- package/ola/Config.in | 6 ++++-- package/opencv3/Config.in | 6 ++++-- package/opencv4/Config.in | 6 ++++-- package/piglit/Config.in | 6 +++++- package/python-crossbar/Config.in | 5 +++-- package/python-matplotlib/Config.in | 7 +++++-- package/python-numpy/Config.in | 4 +++- package/python-scipy/Config.in | 7 +++++-- package/python-zlmdb/Config.in | 4 +++- package/uhd/Config.in | 8 ++++++-- 11 files changed, 46 insertions(+), 19 deletions(-) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 51237e62b9a7..be997e91e27b 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -79,6 +79,7 @@ config BR2_PACKAGE_GNURADIO_PYTHON depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy select BR2_PACKAGE_BOOST_PYTHON select BR2_PACKAGE_PYTHON_NUMPY # runtime select BR2_PACKAGE_PYTHON_PYBIND @@ -86,8 +87,9 @@ config BR2_PACKAGE_GNURADIO_PYTHON help Enable python component -comment "python support needs glibc or musl" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) +comment "python support needs a glibc or musl toolchain w/ host gcc >= 9" + depends on !BR2_HOST_GCC_AT_LEAST_9 || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) config BR2_PACKAGE_GNURADIO_UTILS bool "gr-utils support" diff --git a/package/ola/Config.in b/package/ola/Config.in index 701083b5d3bf..dd0be6f35ee1 100644 --- a/package/ola/Config.in +++ b/package/ola/Config.in @@ -53,14 +53,16 @@ config BR2_PACKAGE_OLA_RDM_TESTS depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy select BR2_PACKAGE_PYTHON_NUMPY help Build OLA RDM tests. -comment "rdm tests needs a toolchain w/ glibc or musl" +comment "rdm tests needs a glibc or musl toolchain w/ gcc >= 9" depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ + !BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL comment "plugin selections" diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in index b9ea033f1330..be0680084b22 100644 --- a/package/opencv3/Config.in +++ b/package/opencv3/Config.in @@ -157,15 +157,17 @@ config BR2_PACKAGE_OPENCV3_LIB_PYTHON depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy select BR2_PACKAGE_PYTHON_NUMPY help Include opencv_python module into the OpenCV build. No python example is installed. -comment "python support needs glibc or musl" +comment "python support needs a glibc or musl toolchain w/ gcc >= 9" depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) config BR2_PACKAGE_OPENCV3_LIB_SHAPE bool "shape" diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in index 286a7ebf9d97..78ec7c2e41da 100644 --- a/package/opencv4/Config.in +++ b/package/opencv4/Config.in @@ -180,15 +180,17 @@ config BR2_PACKAGE_OPENCV4_LIB_PYTHON depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy select BR2_PACKAGE_PYTHON_NUMPY help Include opencv_python module into the OpenCV build. No python example is installed. -comment "python support needs glibc or musl" +comment "python support needs a glibc or musl toolchain w/ gcc >= 9" depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_9 ||\ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) config BR2_PACKAGE_OPENCV4_LIB_SHAPE bool "shape" diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 22d1c7c28e7d..48b7641909b5 100644 --- a/package/piglit/Config.in +++ b/package/piglit/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_PIGLIT BR2_PACKAGE_WAFFLE_SUPPORTS_GBM depends on BR2_INSTALL_LIBSTDCPP # mesa3d-demos, python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy + depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND @@ -32,6 +34,8 @@ config BR2_PACKAGE_PIGLIT https://piglit.freedesktop.org -comment "piglit needs a glibc or musl toolchain w/ C++" +comment "piglit needs a glibc or musl toolchain w/ C++, gcc >= 9, host gcc >= 9" depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ + !BR2_HOST_GCC_AT_LEAST_9 || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in index aadcb2c3609f..357be4803c1b 100644 --- a/package/python-crossbar/Config.in +++ b/package/python-crossbar/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_PYTHON_CROSSBAR depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy depends on BR2_INSTALL_LIBSTDCPP # python-autobahn's compress and serialization # All the following dependencies are runtime dependencies. It # matches almost 1:1 the requirements-min.txt from crossbar @@ -64,8 +65,8 @@ config BR2_PACKAGE_PYTHON_CROSSBAR https://pypi.python.org/pypi/crossbar -comment "python-crossbar needs a glibc or musl toolchain w/ C++" +comment "python-crossbar needs a glibc or musl toolchain w/ C++, gcc >= 9" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ - !BR2_INSTALL_LIBSTDCPP + !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index 8a9281b8e7fa..cc0d830f4f5d 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy + depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy select BR2_PACKAGE_FREETYPE # runtime select BR2_PACKAGE_LIBPNG # runtime select BR2_PACKAGE_PYTHON_CERTIFI # runtime @@ -36,6 +38,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB_QT endif -comment "python-matplotlib needs a glibc or musl toolchain w/ C++" +comment "python-matplotlib needs a glibc or musl toolchain w/ C++, gcc >= 9, host gcc >= 9" depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ - !BR2_INSTALL_LIBSTDCPP + !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index 132c3f7a82e4..c27baec3b340 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -19,6 +19,7 @@ config BR2_PACKAGE_PYTHON_NUMPY depends on BR2_INSTALL_LIBSTDCPP # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 help NumPy is the fundamental package for scientific computing with Python. @@ -28,7 +29,8 @@ config BR2_PACKAGE_PYTHON_NUMPY http://www.numpy.org/ -comment "python-numpy needs a glibc or musl toolchain w/ C++" +comment "python-numpy needs a glibc or musl toolchain w/ C++, gcc >= 9" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-scipy/Config.in b/package/python-scipy/Config.in index 0a4acb9699ad..aa7eefd44d56 100644 --- a/package/python-scipy/Config.in +++ b/package/python-scipy/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_PYTHON_SCIPY depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS # lapack depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS # openblas depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy + depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy depends on BR2_TOOLCHAIN_HAS_FORTRAN # lapack depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LAPACK @@ -19,10 +21,11 @@ config BR2_PACKAGE_PYTHON_SCIPY https://www.scipy.org/scipylib/ -comment "python-scipy needs toolchain w/ fortran and c++ and glibc or musl" +comment "python-scipy needs glibc or musl toolchain w/ fortran, c++, gcc >= 9, host gcc >= 9" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_FORTRAN || \ - !BR2_INSTALL_LIBSTDCPP || \ + !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ (!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-zlmdb/Config.in b/package/python-zlmdb/Config.in index 8eba2d794608..007ca7272350 100644 --- a/package/python-zlmdb/Config.in +++ b/package/python-zlmdb/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy depends on BR2_INSTALL_LIBSTDCPP # python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy select BR2_PACKAGE_PYTHON_CBOR2 # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CLICK # runtime @@ -18,7 +19,8 @@ config BR2_PACKAGE_PYTHON_ZLMDB https://github.com/crossbario/zlmdb -comment "python-zlmdb needs a glibc or musl toolchain w/ C++" +comment "python-zlmdb needs a glibc or musl toolchain w/ C++, gcc >= 9" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/uhd/Config.in b/package/uhd/Config.in index 4316a2c18573..2ccfe3ccb883 100644 --- a/package/uhd/Config.in +++ b/package/uhd/Config.in @@ -94,16 +94,20 @@ config BR2_PACKAGE_UHD_OCTOCLOCK help enable OctoClock support -comment "uhd python API needs python3 and a toolchain w/ glibc or musl" +comment "uhd python API needs python3 and a glibc or musl toolchain w/ gcc >= 9, host gcc >= 9" depends on !BR2_PACKAGE_PYTHON3 depends on !BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_TOOLCHAIN_USES_MUSL) # python-numpy + depends on !BR2_HOST_GCC_AT_LEAST_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ + !(BR2_TOOLCHAIN_USES_GLIBC && BR2_TOOLCHAIN_USES_MUSL) # python-numpy config BR2_PACKAGE_UHD_PYTHON bool "python API support" depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy + depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy select BR2_PACKAGE_PYTHON_NUMPY select BR2_PACKAGE_PYTHON_REQUESTS help From 3d8e0a263f277ca113b78b1f283292c418528c11 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Dec 2023 21:38:22 +0100 Subject: [PATCH 2872/2890] package/putty: fix static build Fix the following static build failure raised since bump to version 0.78 in commit 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4: In file included from /home/buildroot/autobuild/instance-0/output-1/build/putty-0.78/putty.h:8, from /home/buildroot/autobuild/instance-0/output-1/build/putty-0.78/callback.c:8: /home/buildroot/autobuild/instance-0/output-1/build/putty-0.78/unix/platform.h:11:10: fatal error: dlfcn.h: No such file or directory 11 | #include /* Dynamic library loading */ | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/06f0b14bd0414f97b06070198e290fb3253348c5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/putty/putty.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/putty/putty.mk b/package/putty/putty.mk index d3c8d923f019..529edd51c869 100644 --- a/package/putty/putty.mk +++ b/package/putty/putty.mk @@ -17,4 +17,8 @@ else ifeq ($(BR2_PACKAGE_LIBGTK2),y) PUTTY_DEPENDENCIES += libgtk2 endif +ifeq ($(BR2_STATIC_LIBS),y) +PUTTY_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -DNO_LIBDL" +endif + $(eval $(cmake-package)) From 38c4aa2826ce31bd77140a55b5dca78eb28e53a5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Dec 2023 22:23:18 +0100 Subject: [PATCH 2873/2890] package/libpjsip: security bump to version 2.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix CVE-2023-38703: PJSIP is a free and open source multimedia communication library written in C with high level API in C, C++, Java, C#, and Python languages. SRTP is a higher level media transport which is stacked upon a lower level media transport such as UDP and ICE. Currently a higher level transport is not synchronized with its lower level transport that may introduce use-after-free issue. This vulnerability affects applications that have SRTP capability (`PJMEDIA_HAS_SRTP` is set) and use underlying media transport other than UDP. This vulnerability’s impact may range from unexpected application termination to control flow hijack/memory corruption. The patch is available as a commit in the master branch. https://github.com/pjsip/pjproject/security/advisories/GHSA-f76w-fh7c-pc66 https://github.com/pjsip/pjproject/releases/tag/2.14 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 2edd97bed4c8..d72e1090e3a2 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 32a5ab5bfbb9752cb6a46627e4c410e61939c8dbbd833ac858473cfbd9fb9d7d pjproject-2.13.1.tar.gz +sha256 5805c1171acab4af9684d7ad096dcb92f71fc42809852144e97e1413468c9981 pjproject-2.14.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index f97d547fd7bf..8169e0dceec4 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.13.1 +LIBPJSIP_VERSION = 2.14 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) From bc7b0e1002ed393c6ffb784aa245cbaa40569106 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 3 Dec 2023 09:42:51 +0100 Subject: [PATCH 2874/2890] package/perl: security bump to version 5.36.3 fix CVE-2023-47038 - Write past buffer end via illegal user-defined Unicode property note: 5.36.2 was a broken release Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/perl/perl.hash | 12 ++++++------ package/perl/perl.mk | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 667b09221d7c..983b921e2798 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,10 +1,10 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.36.2.tar.xz.{md5,sha1,sha256}.txt -md5 698ae4946b28e38a729916f04cc389a3 perl-5.36.2.tar.xz -sha1 9bd6e3f7c333e2e5f14c8650333fc29da3df2d90 perl-5.36.2.tar.xz -sha256 19445f09ea9f6ada33297010d5b76ac46be565568d1a4377a6bc736cd795a128 perl-5.36.2.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz.{md5,sha1,sha256}.txt +md5 17946060e6279cf32d08edc92c40efc3 perl-5.36.3.tar.xz +sha1 9949e79c92171b39f4fb2b19ffd4ea293b8dd589 perl-5.36.3.tar.xz +sha256 45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd perl-5.36.3.tar.xz -# Hash from: https://github.com/arsv/perl-cross/releases/download/1.5.1/perl-cross-1.5.1.hash -sha256 35d859b49bab274021d8a61511fd39a70a58cb727223de5b54342898155cf5e0 perl-cross-1.5.1.tar.gz +# Hash from: https://github.com/arsv/perl-cross/releases/download/1.5.2/perl-cross-1.5.2.hash +sha256 584dc54c48dca25e032b676a15bef377c1fed9de318b4fc140292a5dbf326e90 perl-cross-1.5.2.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 735adea01a5a..71aef9997b0e 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -6,7 +6,7 @@ # When updating the version here, also update utils/scancpan PERL_VERSION_MAJOR = 36 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).3 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.5.1 +PERL_CROSS_VERSION = 1.5.2 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz From 499b4d6d22a704adf65d1db0808952ad386ee1a0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Dec 2023 22:45:29 +0100 Subject: [PATCH 2875/2890] package/putty: disable gssapi PUTTY_GSSAPI is enabled by default resulting in the following build failure since bump to version 0.78 in commit 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4: /home/fabrice/buildroot/output/build/putty-0.79/unix/gss.c:133:10: fatal error: gssapi/gssapi.h: No such file or directory 133 | #include | ^~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/d6d06b5aa0df070c3880399e044fb3cd3a830aec Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/putty/putty.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/putty/putty.mk b/package/putty/putty.mk index 529edd51c869..4c9164d05e77 100644 --- a/package/putty/putty.mk +++ b/package/putty/putty.mk @@ -10,6 +10,7 @@ PUTTY_LICENSE = MIT PUTTY_LICENSE_FILES = LICENCE PUTTY_CPE_ID_VENDOR = putty PUTTY_DEPENDENCIES = host-pkgconf +PUTTY_CONF_OPTS = -DPUTTY_GSSAPI=OFF ifeq ($(BR2_PACKAGE_LIBGTK3),y) PUTTY_DEPENDENCIES += libgtk3 From b957a02143ce17df7f4ff6f6e33198d9c39757df Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Dec 2023 23:26:44 +0100 Subject: [PATCH 2876/2890] package/linux-tools: fix selftests with kernel >= 6.5 Fix the following selftests build failure raised since kernel >= 6.5 and https://github.com/torvalds/linux/commit/9fc96c7c19dfab67bf81b25fbc4f49b7752d5060: make[1]: Entering directory '/home/autobuild/autobuild/instance-4/output-1/build/linux-6.6.3/tools/testing/selftests' error: missing kernel header files. Please run this and try again: cd ../../.. make headers make[1]: *** [Makefile:186: kernel_header_files] Error 1 Fixes: - http://autobuild.buildroot.org/results/7674abb454b46ca768e44b6838a0d8724c772dd6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/linux-tools/linux-tool-selftests.mk.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in index e29c7f59debd..0bcc47af0a3e 100644 --- a/package/linux-tools/linux-tool-selftests.mk.in +++ b/package/linux-tools/linux-tool-selftests.mk.in @@ -23,7 +23,8 @@ SELFTESTS_DEPENDENCIES = \ SELFTESTS_MAKE_FLAGS = \ $(LINUX_MAKE_FLAGS) \ - ARCH=$(SELFTESTS_ARCH) + ARCH=$(SELFTESTS_ARCH) \ + KHDR_DIR=$(LINUX_DIR)/usr/include # O must be redefined here to overwrite the one used by Buildroot for # out of tree build. We build the selftests in $(LINUX_DIR)/tools/selftests and From a73cbe68b2548308ff7590c4720ebf56f275a6ee Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 09:02:14 +0100 Subject: [PATCH 2877/2890] package/libmemcached: link with -latomic when needed Fix the following build failure raised since bump to version 1.1.4 in commit 7205df8a4f3c729b11a5f0c34885e6cf592f24b9: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/11.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: CMakeFiles/aslap.dir/ms_conn.c.o: undefined reference to symbol '__atomic_fetch_add_4@@LIBATOMIC_1.0' Fixes: - http://autobuild.buildroot.org/results/c8e4e1f9609d1339fe070afe440c63660892600e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libmemcached/libmemcached.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libmemcached/libmemcached.mk b/package/libmemcached/libmemcached.mk index f64ab5ec4834..f86cdd3bbf8a 100644 --- a/package/libmemcached/libmemcached.mk +++ b/package/libmemcached/libmemcached.mk @@ -32,4 +32,8 @@ else LIBMEMCACHED_CONF_OPTS += -DENABLE_OPENSSL_CRYPTO=OFF endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBMEMCACHED_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + $(eval $(cmake-package)) From 35059ebc37283d2fee5cdd9264a9d5c640271359 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 2 Dec 2023 15:36:06 +0300 Subject: [PATCH 2878/2890] DEVELOPERS: remove Synopsys email address for S.Matyukevich I am no longer work at Synopsys, so remove this email address. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1f26e9bc81e2..904c7ebf2d6c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2713,10 +2713,6 @@ F: package/rtl8189fs/ F: package/wpa_supplicant/ F: package/xr819-xradio/ -N: Sergey Matyukevich -F: board/synopsys/nsim/ -F: configs/snps_arc700_nsim_defconfig - N: Sergio Prado F: board/toradex/apalis-imx6/ F: configs/toradex_apalis_imx6_defconfig From 4cf5d91d8bf1dc48af612e785bde869e47048ec3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 15:20:11 +0100 Subject: [PATCH 2879/2890] package/libde265: security bump to version 1.0.14 Fix CVE-2023-43887: Libde265 v1.0.12 was discovered to contain multiple buffer overflows via the num_tile_columns and num_tile_row parameters in the function pic_parameter_set::dump. Fix CVE-2023-47471: Buffer Overflow vulnerability in strukturag libde265 v1.10.12 allows a local attacker to cause a denial of service via the slice_segment_header function in the slice.cc component. https://github.com/strukturag/libde265/releases/tag/v1.0.14 https://github.com/strukturag/libde265/releases/tag/v1.0.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libde265/libde265.hash | 2 +- package/libde265/libde265.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libde265/libde265.hash b/package/libde265/libde265.hash index 168b5db39576..9bb3f20a71cf 100644 --- a/package/libde265/libde265.hash +++ b/package/libde265/libde265.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 62185ea2182e68cf68bba20cc6eb4c287407b509cf0a827d7ddb75614db77b5c libde265-1.0.12.tar.gz +sha256 99f46ef77a438be639aa3c5d9632c0670541c5ed5d386524d4199da2d30df28f libde265-1.0.14.tar.gz sha256 02cc1585a20677992e0ba578fa692635dc193735f2691dc81de924b51c4e8020 COPYING diff --git a/package/libde265/libde265.mk b/package/libde265/libde265.mk index 208fa24e270a..8624d2f949c3 100644 --- a/package/libde265/libde265.mk +++ b/package/libde265/libde265.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDE265_VERSION = 1.0.12 +LIBDE265_VERSION = 1.0.14 LIBDE265_SITE = https://github.com/strukturag/libde265/releases/download/v$(LIBDE265_VERSION) LIBDE265_LICENSE = LGPL-3.0+ LIBDE265_LICENSE_FILES = COPYING From 5eb79ff3b951fb756e17d8a06b5608b179ddbd60 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 09:44:45 +0100 Subject: [PATCH 2880/2890] package/libmemcached: fix build with gcc 4.8 Fix the following build failure with gcc 4.8 raised since bump to version 1.1.4 in commit 7205df8a4f3c729b11a5f0c34885e6cf592f24b9: /home/buildroot/autobuild/run/instance-0/output-1/build/libmemcached-1.1.4/src/libmemcachedprotocol/ascii_handler.c: In function 'ascii_get_response_handler': /home/buildroot/autobuild/run/instance-0/output-1/build/libmemcached-1.1.4/src/libmemcachedprotocol/ascii_handler.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode for (int x = 0; x < keylen; ++x) { ^ Fixes: - http://autobuild.buildroot.org/results/202aeec4dda822ac341d8882f84f968a303697c3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libmemcached/libmemcached.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/libmemcached/libmemcached.mk b/package/libmemcached/libmemcached.mk index f86cdd3bbf8a..63df8f5c20a0 100644 --- a/package/libmemcached/libmemcached.mk +++ b/package/libmemcached/libmemcached.mk @@ -16,7 +16,9 @@ LIBMEMCACHED_CPE_ID_VENDOR = awesome # Force Release otherwise libraries will be suffixed by -dbg which will raise # unexpected build failures with packages that use libmemcached (e.g. c-icap) -LIBMEMCACHED_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release +LIBMEMCACHED_CONF_OPTS += \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" ifeq ($(BR2_PACKAGE_LIBEVENT),y) LIBMEMCACHED_DEPENDENCIES += libevent From f6a7050d7191b9a534d1d2789ceb72d69f25da83 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 15:15:18 +0100 Subject: [PATCH 2881/2890] package/speechd: fix NLS build Fix the following NLS build failure raised since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: /home/buildroot/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/12.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: ../../src/common/.libs/libcommon.a(libcommon_la-i18n.o): undefined reference to symbol 'libintl_bindtextdomain' Fixes: - http://autobuild.buildroot.org/results/8ab13cf474d732c95a1da65592d950b24b3d474b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/speechd/speechd.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index c68d46611609..7d50f88c1db6 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,8 +12,11 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_AUTOPOINT = YES -SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile -SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" +SPEECHD_DEPENDENCIES = \ + host-pkgconf dotconf libglib2 libsndfile $(TARGET_NLS_DEPENDENCIES) +SPEECHD_CONF_ENV = \ + ac_cv_prog_HELP2MAN="" \ + LIBS=$(TARGET_NLS_LIBS) SPEECHD_CONF_OPTS = \ --disable-python \ --without-espeak \ From a3db1dd1b7b4fca95eefb1f42a25881f89d881f7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 15:54:18 +0100 Subject: [PATCH 2882/2890] package/xenomai: fix build with gcc >= 12 Fix the following build failure with gcc >= 12: task.c: In function 't_start': task.c:398:16: error: 'ret' may be used uninitialized [-Werror=maybe-uninitialized] 398 | return ret; | ^~~ task.c:364:13: note: 'ret' was declared here 364 | int ret; | ^~~ task.c: In function 't_resume': task.c:444:16: error: 'ret' may be used uninitialized [-Werror=maybe-uninitialized] 444 | return ret; | ^~~ task.c:428:13: note: 'ret' was declared here 428 | int ret; | ^~~ Fixes: - http://autobuild.buildroot.org/results/bc1b40de22e563b704ad7f20b6bf4d1f73a6ed8a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ib-psos-task.c-fix-build-with-gcc-12.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/xenomai/3.0.10/0004-lib-psos-task.c-fix-build-with-gcc-12.patch diff --git a/package/xenomai/3.0.10/0004-lib-psos-task.c-fix-build-with-gcc-12.patch b/package/xenomai/3.0.10/0004-lib-psos-task.c-fix-build-with-gcc-12.patch new file mode 100644 index 000000000000..fcc1f1e6730d --- /dev/null +++ b/package/xenomai/3.0.10/0004-lib-psos-task.c-fix-build-with-gcc-12.patch @@ -0,0 +1,56 @@ +From 6c6da9e6d75ccfaa83c1efe14211f080c14181c6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 3 Dec 2023 15:28:50 +0100 +Subject: [PATCH] lib/psos/task.c: fix build with gcc >= 12 + +Fix the following build failure with gcc >= 12: + +task.c: In function 't_start': +task.c:398:16: error: 'ret' may be used uninitialized [-Werror=maybe-uninitialized] + 398 | return ret; + | ^~~ +task.c:364:13: note: 'ret' was declared here + 364 | int ret; + | ^~~ +task.c: In function 't_resume': +task.c:444:16: error: 'ret' may be used uninitialized [-Werror=maybe-uninitialized] + 444 | return ret; + | ^~~ +task.c:428:13: note: 'ret' was declared here + 428 | int ret; + | ^~~ + +Fixes: + - http://autobuild.buildroot.org/results/bc1b40de22e563b704ad7f20b6bf4d1f73a6ed8a + +Signed-off-by: Fabrice Fontaine +Upstream: https://lore.kernel.org/xenomai/20231203144307.1940139-1-fontaine.fabrice@gmail.com/T/#u +--- + lib/psos/task.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/psos/task.c b/lib/psos/task.c +index f678be61d..27bcc28a9 100644 +--- a/lib/psos/task.c ++++ b/lib/psos/task.c +@@ -362,7 +362,7 @@ u_long t_start(u_long tid, + { + struct psos_task *task; + struct service svc; +- int ret; ++ int ret = SUCCESS; + + CANCEL_DEFER(svc); + +@@ -426,7 +426,7 @@ u_long t_resume(u_long tid) + { + struct psos_task *task; + struct service svc; +- int ret; ++ int ret = SUCCESS; + + CANCEL_DEFER(svc); + +-- +2.42.0 + From cdc9b8a3a75c4c39f23feb4e3b0e296786e0132c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Dec 2023 22:14:01 +0100 Subject: [PATCH 2883/2890] toradx_apalis_imx6_defconfig: add download hashes for linux/uboot The defconfig fetches Linux and U-Boot from a git repo using the unauthenticated git:// protocol, so add download hashes for them to ensure we get the right sources by adding a global patch dir and running utils/add-custom-hashes. The defconfig uses the Linux sources for the kernel headers, so make linux-headers/linux-headers.hash a symlink to linux/linux.hash so the same hash file is used. Signed-off-by: Peter Korsgaard --- .../apalis-imx6/patches/linux-headers/linux-headers.hash | 1 + board/toradex/apalis-imx6/patches/linux/linux.hash | 2 ++ board/toradex/apalis-imx6/patches/uboot/uboot.hash | 2 ++ configs/toradex_apalis_imx6_defconfig | 1 + 4 files changed, 6 insertions(+) create mode 120000 board/toradex/apalis-imx6/patches/linux-headers/linux-headers.hash create mode 100644 board/toradex/apalis-imx6/patches/linux/linux.hash create mode 100644 board/toradex/apalis-imx6/patches/uboot/uboot.hash diff --git a/board/toradex/apalis-imx6/patches/linux-headers/linux-headers.hash b/board/toradex/apalis-imx6/patches/linux-headers/linux-headers.hash new file mode 120000 index 000000000000..5808d92afe89 --- /dev/null +++ b/board/toradex/apalis-imx6/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/toradex/apalis-imx6/patches/linux/linux.hash b/board/toradex/apalis-imx6/patches/linux/linux.hash new file mode 100644 index 000000000000..1138ec3b9349 --- /dev/null +++ b/board/toradex/apalis-imx6/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9c69a1c283db6ee8042cc6f013a159473f257e71751887312c7dd2902f01bec8 linux-d899927728beca8357a5b4120b690cb3c1d80844-br1.tar.gz diff --git a/board/toradex/apalis-imx6/patches/uboot/uboot.hash b/board/toradex/apalis-imx6/patches/uboot/uboot.hash new file mode 100644 index 000000000000..a81a7d8d4abb --- /dev/null +++ b/board/toradex/apalis-imx6/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9a540b08ccb7e8a0252f86d0bad5d676d0964725a7f2a06d798225c2a3024878 uboot-30a1208727729dae22cb42f9ba9ba17efe5e6f77-br1.tar.gz diff --git a/configs/toradex_apalis_imx6_defconfig b/configs/toradex_apalis_imx6_defconfig index 40a2d2d520d9..e447190e0cee 100644 --- a/configs/toradex_apalis_imx6_defconfig +++ b/configs/toradex_apalis_imx6_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a9=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_GLOBAL_PATCH_DIR="board/toradex/apalis-imx6/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/toradex/apalis-imx6/post-image.sh" BR2_LINUX_KERNEL=y From 51cf6a8aa6132385f81c34bbd088924b653b93b8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Dec 2023 22:06:45 +0100 Subject: [PATCH 2884/2890] package/monit: fix openssl static build --with-ssl-dir will exclusively search for dynamic library so use --with-ssl-static to fix the following openssl static build failure raised since bump to version 5.33.0 in commit 8cedb39764f70f9d467bf0cc1acc99a8bbb963d6: checking for static SSL support... disabled checking for SSL support... enabled checking for SSL include directory... /home/buildroot/autobuild/instance-2/output-1/host/mipsel-buildroot-linux-uclibc/sysroot/usr/include checking for SSL library directory... /lib64 [...] mipsel-buildroot-linux-uclibc-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/lib64' Fixes: - http://autobuild.buildroot.org/results/4189decbafb5d28c11d89ddac792b4610abeaff1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/monit/monit.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/monit/monit.mk b/package/monit/monit.mk index 4766ce3d9e71..c709f903e693 100644 --- a/package/monit/monit.mk +++ b/package/monit/monit.mk @@ -27,7 +27,11 @@ MONIT_CONF_OPTS += \ ifeq ($(BR2_PACKAGE_OPENSSL),y) MONIT_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` +ifeq ($(BR2_STATIC_LIBS),y) +MONIT_CONF_OPTS += --with-ssl-static=$(STAGING_DIR)/usr +else MONIT_CONF_OPTS += --with-ssl --with-ssl-dir=$(STAGING_DIR)/usr +endif MONIT_DEPENDENCIES += host-pkgconf openssl else MONIT_CONF_OPTS += --without-ssl From a7898055d34950a872b7cb0fe2fff2895b1a9289 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 2 Dec 2023 02:49:59 +0100 Subject: [PATCH 2885/2890] package/freescale-imx: append /imx6ulz to BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL imx6ulz supports freescale-imx too so let's add it to the bool name for completeness. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/freescale-imx/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index fe3f265941a8..1c26b3cc6f4c 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -35,7 +35,7 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S bool "imx6sl/imx6sx" config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL - bool "imx6ul/imx6ull" + bool "imx6ul/imx6ull/imx6ulz" config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 bool "imx7d/imx7ulp" From b47b2065b249b3f50f3164d8a8114b108f596559 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 18:42:04 +0100 Subject: [PATCH 2886/2890] package/libmemcached: fix static build Fix the following static build failure raised since bump to version 1.1.4 in commit 7205df8a4f3c729b11a5f0c34885e6cf592f24b9: CMake Error at /home/autobuild/autobuild/instance-13/output-1/build/libmemcached-1.1.4/src/bin/cmake_install.cmake:60 (file): file RPATH_CHANGE could not write new RPATH: $ORIGIN/../lib to the file: /home/autobuild/autobuild/instance-13/output-1/host/arc-buildroot-linux-uclibc/sysroot/usr/bin/memcapable No valid ELF RPATH or RUNPATH entry exists in the file; Call Stack (most recent call first): /home/autobuild/autobuild/instance-13/output-1/build/libmemcached-1.1.4/src/cmake_install.cmake:52 (include) /home/autobuild/autobuild/instance-13/output-1/build/libmemcached-1.1.4/cmake_install.cmake:52 (include) Fixes: - http://autobuild.buildroot.org/results/778ff517d465896f54a3cd5316a66c54f66fd4cb Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libmemcached/libmemcached.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libmemcached/libmemcached.mk b/package/libmemcached/libmemcached.mk index 63df8f5c20a0..b72f127a1d7f 100644 --- a/package/libmemcached/libmemcached.mk +++ b/package/libmemcached/libmemcached.mk @@ -18,7 +18,8 @@ LIBMEMCACHED_CPE_ID_VENDOR = awesome # unexpected build failures with packages that use libmemcached (e.g. c-icap) LIBMEMCACHED_CONF_OPTS += \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ + -DCMAKE_SKIP_RPATH=ON ifeq ($(BR2_PACKAGE_LIBEVENT),y) LIBMEMCACHED_DEPENDENCIES += libevent From d20329ed76082553368241aa4b38f4dabf45bc76 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 19:44:00 +0100 Subject: [PATCH 2887/2890] package/mariadb: security bump to version 10.11.6 This bump will fix the following build failure raised since bump of fmt to version 10.1.0 in commit 619b5585d92c8f701cd92e0e26c0883a753125ad thanks to https://github.com/MariaDB/server/commit/f4cec369a392c8a6056207012992ad4a5639965a: -- Performing Test HAVE_SYSTEM_LIBFMT -- Performing Test HAVE_SYSTEM_LIBFMT - Failed [...] -- Downloading... dst='/home/buildroot/autobuild/instance-3/output-1/build/mariadb-10.11.4/extra/libfmt/src/8.0.1.zip' timeout='none' inactivity timeout='none' -- Using src='https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.zip' CMake Error at libfmt-stamp/download-libfmt.cmake:170 (message): Each download failed! error: downloading 'https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.zip' failed status_code: 1 status_string: "Unsupported protocol" log: --- LOG BEGIN --- Protocol "https" not supported or disabled in libcurl This bump will also fix CVE-2023-22084 https://mariadb.com/kb/en/mariadb-10-11-5-release-notes/ https://mariadb.com/kb/en/mariadb-10-11-6-release-notes/ Fixes: - http://autobuild.buildroot.org/results/9cb577195aa939289102116df5a2eac03f0d5017 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 4 ++-- package/mariadb/mariadb.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 03ce5a968a9c..fd73cca4f3bb 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,5 +1,5 @@ -# From https://downloads.mariadb.org/mariadb/10.11.4 -sha512 62fc05395857dd036ebeed53b1ff0ecd9abd95ce8e5316194286521caae0f9452cf96a93613adec809e39e1d8ef20c330b24fee82b3bb90ee27a84f2bbd0d8d2 mariadb-10.11.4.tar.gz +# From https://downloads.mariadb.org/mariadb/10.11.6 +sha512 3d77f7be4a26d5a36af56150a5f8ed5e21adeed9bc8ea1bd694e47a25a571bd73468eada7c96e0dfe5a6c81bef625abf71a56d228cf43a738e555e3c0d824a6a mariadb-10.11.6.tar.gz # Hash for license files sha256 2b278a3a2f20696113a7c57c4f3e6a5cdb9a25f2a827e72e0c089a2f805ff91a README.md diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 78e4703eee85..7f3755892aaa 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.11.4 +MARIADB_VERSION = 10.11.6 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text From df812ace329b2ba78df11b42be33f618dc61f5c8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 23:23:56 +0100 Subject: [PATCH 2888/2890] package/wireshark: security bump to version 4.0.11 Fix CVE-2023-6174: SSH dissector crash in Wireshark 4.0.0 to 4.0.10 allows denial of service via packet injection or crafted capture file https://www.wireshark.org/security/wnpa-sec-2023-28 https://www.wireshark.org/security/wnpa-sec-2023-29 https://www.wireshark.org/docs/relnotes/wireshark-4.0.11.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index c9b693c9cb61..a6ef69b1af82 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.10.txt -sha1 830ba7ff602da90323bbc5ec15941c0878d9ee4a wireshark-4.0.10.tar.xz -sha256 b2e3ff03fa2be9058a9ffbedd12b0a670433bd16c8cc6c432ab48dabc2df1898 wireshark-4.0.10.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.11.txt +sha1 4af3140d69f9d41e1c4e161fad66304a6920ddce wireshark-4.0.11.tar.xz +sha256 4c341cc33a6c512d983f4126e6f3e5c249f604e14ab7f337d38b1cbe58199e3d wireshark-4.0.11.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 2f563950b2c8..6fb4b60f2b92 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.10 +WIRESHARK_VERSION = 4.0.11 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 6517a7f4bcccab6f75e0df4e0e1bec03ffc273c4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 23:21:45 +0100 Subject: [PATCH 2889/2890] package/lttng-modules: bump to version 2.13.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This bump will fix the following build failures with kernel >= 6.3.0 thanks to https://github.com/lttng/lttng-modules/commit/f3559e5b06b24ad0336211950792fa97398c5e9a and https://github.com/lttng/lttng-modules/commit/939200ef160c95c8a9d71fd80c99f42a1de0a9f0: In file included from /home/buildroot/autobuild/instance-1/output-1/build/lttng-modules-2.13.7/./src/lttng-ring-buffer-client.h:16, from /home/buildroot/autobuild/instance-1/output-1/build/lttng-modules-2.13.7/./src/lttng-ring-buffer-client-discard.c:16: /home/buildroot/autobuild/instance-1/output-1/build/lttng-modules-2.13.7/./src/../include/lttng/events-internal.h:292:9: error: unknown type name ‘uuid_le’ 292 | uuid_le uuid; /* Trace session unique ID (copy) */ | ^~~~~~~ [...] /home/thomas/autobuild/instance-3/output-1/build/lttng-modules-2.13.7/./src/lib/ringbuffer/ring_buffer_mmap.c: In function ‘lib_ring_buffer_mmap_buf’: /home/thomas/autobuild/instance-3/output-1/build/lttng-modules-2.13.7/./src/lib/ringbuffer/ring_buffer_mmap.c:116:23: error: assignment of read-only member ‘vm_flags’ 116 | vma->vm_flags |= VM_DONTEXPAND; | ^~ https://github.com/lttng/lttng-modules/blob/v2.13.10/ChangeLog Fixes: - http://autobuild.buildroot.org/results/7b8f57262a02cd9aaa953a9d8666646bae1cc655 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lttng-modules/lttng-modules.hash | 4 ++-- package/lttng-modules/lttng-modules.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash index e685cc33679e..b14b488837c9 100644 --- a/package/lttng-modules/lttng-modules.hash +++ b/package/lttng-modules/lttng-modules.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-modules/lttng-modules-2.13.7.tar.bz2.sha256 -sha256 5a99679df7903160cbde3918fee5af90ffafc90fc96ccdefaa57cf230492b234 lttng-modules-2.13.7.tar.bz2 +# From https://lttng.org/files/lttng-modules/lttng-modules-2.13.10.tar.bz2.sha256 +sha256 13abfb1ac870711f0d0adfa88e53b17deb2e3052173715a260a6ef14aa45b0a7 lttng-modules-2.13.10.tar.bz2 # Hash for license files sha256 d72921266bc8452a8789f8a04a82755373990d00b7e0b0f1a8edb8f854e94d1c LICENSES/LGPL-2.1 diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index 416833f4ef5a..d6f1e4114d0e 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.13.7 +LTTNG_MODULES_VERSION = 2.13.10 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*) From 954aeb7c721bf7edd56832650e8ebfb3b5c6fbd3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 4 Dec 2023 09:04:44 +0100 Subject: [PATCH 2890/2890] Update for 2023.11 Signed-off-by: Peter Korsgaard --- CHANGES | 13 +++++++++++++ Makefile | 4 ++-- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 18 ++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 45 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index c1b5651b740e..f927b7df659b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,16 @@ +2023.11, released December 4th, 2023 + + Various fixes. + + Defconfigs: Toradex apalis i.mx6: Add download hashes for + Linux and U-Boot. + + Updated/fixed packages: cog, freescale-imx, imagemagick, + libde265, libmemcached, libpjsip, libusb-compat, + libzenoh-pico, linux-tools, lttng-modules, mariadb, monit, + openfpgaloader, perl, putty, python-numpy, rtty, speechd, + wireshark, xenomai, xtables-addons, zfs + 2023.11-rc2, released November 29th, 2023 Fixes all over the tree. diff --git a/Makefile b/Makefile index 04d24b9a3558..e422e97214ab 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.11-rc2 +export BR2_VERSION := 2023.11 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1701295000 +BR2_VERSION_EPOCH = 1701677000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 7cc2ff7ccdc0..e673fa655bbc 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,40 +42,40 @@

                                      buildroot-2023.02.7.tar.xz

                                      -

                                      Latest stable release: 2023.08.3

                                      +

                                      Latest stable release: 2023.11

                                      - +
                                      - +
                                      -

                                      buildroot-2023.08.3.tar.gz

                                      -

                                      PGP signature

                                      +

                                      buildroot-2023.11.tar.gz

                                      +

                                      PGP signature

                                      - +
                                      - +
                                      -

                                      buildroot-2023.08.3.tar.xz

                                      -

                                      PGP signature

                                      +

                                      buildroot-2023.11.tar.xz

                                      +

                                      PGP signature

                                      - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
                                  diff --git a/docs/website/news.html b/docs/website/news.html index b3dda4c62995..6db4712d19c8 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,24 @@

                                  News

                                    +
                                  • +
                                    +
                                    +
                                    +

                                    2023.11 released

                                    +

                                    4 December 2023

                                    +
                                    +
                                    +

                                    The stable 2023.11 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2023.11 release.

                                    +
                                    +
                                    +
                                    • +
                                  • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 250a8810e52a..61eb74365963 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.08.3' +RELEASE='2023.11' ### Change here for more memory/cores ### VM_MEMORY=2048